From mboxrd@z Thu Jan  1 00:00:00 1970
From: Chris Wilson <chris@chris-wilson.co.uk>
Subject: [PATCH 087/190] Revert "drm/i915: Clean up associated
	VMAs on context destruction"
Date: Mon, 11 Jan 2016 10:44:31 +0000
Message-ID: <1452509174-16671-1-git-send-email-chris@chris-wilson.co.uk>
References: <1452503961-14837-1-git-send-email-chris@chris-wilson.co.uk>
Mime-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64
Return-path: <intel-gfx-bounces@lists.freedesktop.org>
Received: from mail-wm0-f68.google.com (mail-wm0-f68.google.com [74.125.82.68])
 by gabe.freedesktop.org (Postfix) with ESMTPS id 88DBC6E2CA
 for <intel-gfx@lists.freedesktop.org>; Mon, 11 Jan 2016 02:46:26 -0800 (PST)
Received: by mail-wm0-f68.google.com with SMTP id f206so25659800wmf.2
 for <intel-gfx@lists.freedesktop.org>; Mon, 11 Jan 2016 02:46:26 -0800 (PST)
In-Reply-To: <1452503961-14837-1-git-send-email-chris@chris-wilson.co.uk>
List-Unsubscribe: <http://lists.freedesktop.org/mailman/options/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <http://lists.freedesktop.org/archives/intel-gfx>
List-Post: <mailto:intel-gfx@lists.freedesktop.org>
List-Help: <mailto:intel-gfx-request@lists.freedesktop.org?subject=help>
List-Subscribe: <http://lists.freedesktop.org/mailman/listinfo/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=subscribe>
Errors-To: intel-gfx-bounces@lists.freedesktop.org
Sender: "Intel-gfx" <intel-gfx-bounces@lists.freedesktop.org>
To: intel-gfx@lists.freedesktop.org
List-Id: intel-gfx@lists.freedesktop.org

VGhpcyByZXZlcnRzIGNvbW1pdCBlOWYyNGQ1ZmI3Y2YzNjI4YjE5NWIxOGZmM2FjNGUzNzkzN2Nl
ZWFlLgoKVGhlIHBhdGNoIHdhcyBvbmx5IGEgc3RvcC1nYXAgbWVhc3VyZSB0aGF0IGZpeGVkIGhh
bGYgdGhlIHByb2JsZW0gLSB0aGUKbGVhayBvZiB0aGUgZmJjb24gd2hlbiByZXN0YXJ0aW5nIFgu
IEEgY29tcGxldGUgc29sdXRpb24gcmVxdWlyZWQKcmVsZWFzaW5nIHRoZSBWTUEgd2hlbiB0aGUg
b2JqZWN0IGl0c2VsZiB3YXMgY2xvc2VkIHJhdGhlciB0aGFuIHJlbHkgb24KZmlsZS9wcm9jZXNz
IGV4aXQuIFRoZSBwcmV2aW91cyBwYXRjaGVzIGFkZCB0aGUgVk1BIHRyYWNraW5nIG5lY2Vzc2Fy
eQp0byBkbyBjbG9zZSB0aGVtIGFsb25nIHdpdGggdGhlIG9iamVjdCwgY29udGV4dCBvciBmaWxl
LCBhbmQgc28gdGhlIHRpbWUKaGFzIGNvbWUgdG8gcmVtb3ZlIHRoZSBwYXJ0aWFsIGZpeC4KClNp
Z25lZC1vZmYtYnk6IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hyaXMtd2lsc29uLmNvLnVrPgotLS0K
IGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggICAgICAgICB8ICA1IC0tLS0tCiBkcml2
ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jICAgICAgICAgfCAxNCArKy0tLS0tLS0tLS0tLQog
ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fY29udGV4dC5jIHwgMjIgLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLQogMyBmaWxlcyBjaGFuZ2VkLCAyIGluc2VydGlvbnMoKyksIDM5IGRlbGV0aW9u
cygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggYi9kcml2
ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCmluZGV4IGZjMzVhOWI4ZDkxMC4uNGU5MTJmZDNi
OGM2IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCisrKyBiL2Ry
aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKQEAgLTI3MDQsMTEgKzI3MDQsNiBAQCBpbnQg
aTkxNV92bWFfYmluZChzdHJ1Y3QgaTkxNV92bWEgKnZtYSwgZW51bSBpOTE1X2NhY2hlX2xldmVs
IGNhY2hlX2xldmVsLAogCQkgIHUzMiBmbGFncyk7CiB2b2lkIF9faTkxNV92bWFfc2V0X21hcF9h
bmRfZmVuY2VhYmxlKHN0cnVjdCBpOTE1X3ZtYSAqdm1hKTsKIGludCBfX211c3RfY2hlY2sgaTkx
NV92bWFfdW5iaW5kKHN0cnVjdCBpOTE1X3ZtYSAqdm1hKTsKLS8qCi0gKiBCRVdBUkU6IERvIG5v
dCB1c2UgdGhlIGZ1bmN0aW9uIGJlbG93IHVubGVzcyB5b3UgY2FuIF9hYnNvbHV0ZWx5XwotICog
X2d1YXJhbnRlZV8gVk1BIGluIHF1ZXN0aW9uIGlzIF9ub3QgaW4gdXNlXyBhbnl3aGVyZS4KLSAq
LwotaW50IF9fbXVzdF9jaGVjayBfX2k5MTVfdm1hX3VuYmluZF9ub193YWl0KHN0cnVjdCBpOTE1
X3ZtYSAqdm1hKTsKIHZvaWQgaTkxNV92bWFfY2xvc2Uoc3RydWN0IGk5MTVfdm1hICp2bWEpOwog
CiBpbnQgaTkxNV9nZW1fb2JqZWN0X3VuYmluZChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAq
b2JqKTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMgYi9kcml2
ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCmluZGV4IDE2ZWUzYmQ3MDEwZS4uMzkxZjg0MGQy
OWI3IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCisrKyBiL2Ry
aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKQEAgLTI2MDgsNyArMjYwOCw3IEBAIHN0YXRp
YyB2b2lkIGk5MTVfdm1hX2Rlc3Ryb3koc3RydWN0IGk5MTVfdm1hICp2bWEpCiAJa21lbV9jYWNo
ZV9mcmVlKHRvX2k5MTUodm1hLT5vYmotPmJhc2UuZGV2KS0+dm1hcywgdm1hKTsKIH0KIAotc3Rh
dGljIGludCBfX2k5MTVfdm1hX3VuYmluZChzdHJ1Y3QgaTkxNV92bWEgKnZtYSwgYm9vbCB3YWl0
KQoraW50IGk5MTVfdm1hX3VuYmluZChzdHJ1Y3QgaTkxNV92bWEgKnZtYSkKIHsKIAlzdHJ1Y3Qg
ZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqID0gdm1hLT5vYmo7CiAJaW50IHJldCwgaTsKQEAgLTI2
MTYsNyArMjYxNiw3IEBAIHN0YXRpYyBpbnQgX19pOTE1X3ZtYV91bmJpbmQoc3RydWN0IGk5MTVf
dm1hICp2bWEsIGJvb2wgd2FpdCkKIAkvKiBGaXJzdCB3YWl0IHVwb24gYW55IGFjdGl2aXR5IGFz
IHJldGlyaW5nIHRoZSByZXF1ZXN0IG1heQogCSAqIGhhdmUgc2lkZS1lZmZlY3RzIHN1Y2ggYXMg
dW5waW5uaW5nIG9yIGV2ZW4gdW5iaW5kaW5nIHRoaXMgdm1hLgogCSAqLwotCWlmICh2bWEtPmFj
dGl2ZSAmJiB3YWl0KSB7CisJaWYgKHZtYS0+YWN0aXZlKSB7CiAJCWJvb2wgd2FzX2Nsb3NlZDsK
IAogCQkvKiBXaGVuIGEgY2xvc2VkIFZNQSBpcyByZXRpcmVkLCBpdCBpcyB1bmJvdW5kIC0gZWVr
LiAqLwpAQCAtMjY5MiwxNiArMjY5Miw2IEBAIGRlc3Ryb3k6CiAJcmV0dXJuIDA7CiB9CiAKLWlu
dCBpOTE1X3ZtYV91bmJpbmQoc3RydWN0IGk5MTVfdm1hICp2bWEpCi17Ci0JcmV0dXJuIF9faTkx
NV92bWFfdW5iaW5kKHZtYSwgdHJ1ZSk7Ci19Ci0KLWludCBfX2k5MTVfdm1hX3VuYmluZF9ub193
YWl0KHN0cnVjdCBpOTE1X3ZtYSAqdm1hKQotewotCXJldHVybiBfX2k5MTVfdm1hX3VuYmluZCh2
bWEsIGZhbHNlKTsKLX0KLQogaW50IGk5MTVfZ3B1X2lkbGUoc3RydWN0IGRybV9kZXZpY2UgKmRl
dikKIHsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2
YXRlOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fY29udGV4dC5j
IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fY29udGV4dC5jCmluZGV4IDQ1ODNkOGZl
MzU4NS4uZTBlY2ZkZmIwYzhjIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1
X2dlbV9jb250ZXh0LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fY29udGV4
dC5jCkBAIC0xMzMsMjEgKzEzMyw2IEBAIHN0YXRpYyBpbnQgZ2V0X2NvbnRleHRfc2l6ZShzdHJ1
Y3QgZHJtX2RldmljZSAqZGV2KQogCXJldHVybiByZXQ7CiB9CiAKLXN0YXRpYyB2b2lkIGk5MTVf
Z2VtX2NvbnRleHRfY2xlYW4oc3RydWN0IGludGVsX2NvbnRleHQgKmN0eCkKLXsKLQlzdHJ1Y3Qg
aTkxNV9od19wcGd0dCAqcHBndHQgPSBjdHgtPnBwZ3R0OwotCXN0cnVjdCBpOTE1X3ZtYSAqdm1h
LCAqbmV4dDsKLQotCWlmICghcHBndHQpCi0JCXJldHVybjsKLQotCWxpc3RfZm9yX2VhY2hfZW50
cnlfc2FmZSh2bWEsIG5leHQsICZwcGd0dC0+YmFzZS5pbmFjdGl2ZV9saXN0LAotCQkJCSB2bV9s
aW5rKSB7Ci0JCWlmIChXQVJOX09OKF9faTkxNV92bWFfdW5iaW5kX25vX3dhaXQodm1hKSkpCi0J
CQlicmVhazsKLQl9Ci19Ci0KIHZvaWQgaTkxNV9nZW1fY29udGV4dF9mcmVlKHN0cnVjdCBrcmVm
ICpjdHhfcmVmKQogewogCXN0cnVjdCBpbnRlbF9jb250ZXh0ICpjdHggPSBjb250YWluZXJfb2Yo
Y3R4X3JlZiwgdHlwZW9mKCpjdHgpLCByZWYpOwpAQCAtMTU4LDEzICsxNDMsNiBAQCB2b2lkIGk5
MTVfZ2VtX2NvbnRleHRfZnJlZShzdHJ1Y3Qga3JlZiAqY3R4X3JlZikKIAlpZiAoaTkxNS5lbmFi
bGVfZXhlY2xpc3RzKQogCQlpbnRlbF9scl9jb250ZXh0X2ZyZWUoY3R4KTsKIAotCS8qCi0JICog
VGhpcyBjb250ZXh0IGlzIGdvaW5nIGF3YXkgYW5kIHdlIG5lZWQgdG8gcmVtb3ZlIGFsbCBWTUFz
IHN0aWxsCi0JICogYXJvdW5kLiBUaGlzIGlzIHRvIGhhbmRsZSBpbXBvcnRlZCBzaGFyZWQgb2Jq
ZWN0cyBmb3Igd2hpY2gKLQkgKiBkZXN0cnVjdG9yIGRpZCBub3QgcnVuIHdoZW4gdGhlaXIgaGFu
ZGxlcyB3ZXJlIGNsb3NlZC4KLQkgKi8KLQlpOTE1X2dlbV9jb250ZXh0X2NsZWFuKGN0eCk7Ci0K
IAlpOTE1X3BwZ3R0X3B1dChjdHgtPnBwZ3R0KTsKIAogCWlmIChjdHgtPmxlZ2FjeV9od19jdHgu
cmNzX3N0YXRlKQotLSAKMi43LjAucmMzCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f
X19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5m
cmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3Rp
bmZvL2ludGVsLWdmeAo=