From mboxrd@z Thu Jan  1 00:00:00 1970
From: Chris Wilson <chris@chris-wilson.co.uk>
Subject: [PATCH 62/62] Revert "drm/i915: Clean up associated
	VMAs on context destruction"
Date: Fri,  3 Jun 2016 17:37:27 +0100
Message-ID: <1464971847-15809-63-git-send-email-chris@chris-wilson.co.uk>
References: <1464971847-15809-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-x242.google.com (mail-wm0-x242.google.com
 [IPv6:2a00:1450:400c:c09::242])
 by gabe.freedesktop.org (Postfix) with ESMTPS id 91FDC6EE42
 for <intel-gfx@lists.freedesktop.org>; Fri,  3 Jun 2016 16:38:33 +0000 (UTC)
Received: by mail-wm0-x242.google.com with SMTP id a20so603293wma.3
 for <intel-gfx@lists.freedesktop.org>; Fri, 03 Jun 2016 09:38:33 -0700 (PDT)
In-Reply-To: <1464971847-15809-1-git-send-email-chris@chris-wilson.co.uk>
List-Unsubscribe: <https://lists.freedesktop.org/mailman/options/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <https://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: <https://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
ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCmluZGV4IDQ5MmU1ZTczYzFjYS4uMDk5OTllYmYx
YTcwIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCisrKyBiL2Ry
aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKQEAgLTI5NTcsMTEgKzI5NTcsNiBAQCBpbnQg
aTkxNV92bWFfYmluZChzdHJ1Y3QgaTkxNV92bWEgKnZtYSwgZW51bSBpOTE1X2NhY2hlX2xldmVs
IGNhY2hlX2xldmVsLAogCQkgIHUzMiBmbGFncyk7CiB2b2lkIF9faTkxNV92bWFfc2V0X21hcF9h
bmRfZmVuY2VhYmxlKHN0cnVjdCBpOTE1X3ZtYSAqdm1hKTsKIGludCBfX211c3RfY2hlY2sgaTkx
NV92bWFfdW5iaW5kKHN0cnVjdCBpOTE1X3ZtYSAqdm1hKTsKLS8qCi0gKiBCRVdBUkU6IERvIG5v
dCB1c2UgdGhlIGZ1bmN0aW9uIGJlbG93IHVubGVzcyB5b3UgY2FuIF9hYnNvbHV0ZWx5XwotICog
X2d1YXJhbnRlZV8gVk1BIGluIHF1ZXN0aW9uIGlzIF9ub3QgaW4gdXNlXyBhbnl3aGVyZS4KLSAq
LwotaW50IF9fbXVzdF9jaGVjayBfX2k5MTVfdm1hX3VuYmluZF9ub193YWl0KHN0cnVjdCBpOTE1
X3ZtYSAqdm1hKTsKIHZvaWQgaTkxNV92bWFfY2xvc2Uoc3RydWN0IGk5MTVfdm1hICp2bWEpOwog
dm9pZCBpOTE1X3ZtYV9kZXN0cm95KHN0cnVjdCBpOTE1X3ZtYSAqdm1hKTsKIApkaWZmIC0tZ2l0
IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1
L2k5MTVfZ2VtLmMKaW5kZXggM2UxMjEyMmYwZjFmLi5lNmM0NmYyZDA4ZTcgMTAwNjQ0Ci0tLSBh
L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5
MTUvaTkxNV9nZW0uYwpAQCAtMjUyNCw3ICsyNTI0LDcgQEAgc3RhdGljIHZvaWQgX19pOTE1X3Zt
YV9pb3VubWFwKHN0cnVjdCBpOTE1X3ZtYSAqdm1hKQogCXZtYS0+aW9tYXAgPSBOVUxMOwogfQog
Ci1zdGF0aWMgaW50IF9faTkxNV92bWFfdW5iaW5kKHN0cnVjdCBpOTE1X3ZtYSAqdm1hLCBib29s
IHdhaXQpCitpbnQgaTkxNV92bWFfdW5iaW5kKHN0cnVjdCBpOTE1X3ZtYSAqdm1hKQogewogCXN0
cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmogPSB2bWEtPm9iajsKIAl1bnNpZ25lZCBsb25n
IGFjdGl2ZTsKQEAgLTI1MzQsNyArMjUzNCw3IEBAIHN0YXRpYyBpbnQgX19pOTE1X3ZtYV91bmJp
bmQoc3RydWN0IGk5MTVfdm1hICp2bWEsIGJvb2wgd2FpdCkKIAkgKiBoYXZlIHNpZGUtZWZmZWN0
cyBzdWNoIGFzIHVucGlubmluZyBvciBldmVuIHVuYmluZGluZyB0aGlzIHZtYS4KIAkgKi8KIAlh
Y3RpdmUgPSB2bWEtPmFjdGl2ZTsKLQlpZiAoYWN0aXZlICYmIHdhaXQpIHsKKwlpZiAoYWN0aXZl
KSB7CiAJCWludCBpZHg7CiAKIAkJLyogV2hlbiBhIGNsb3NlZCBWTUEgaXMgcmV0aXJlZCwgaXQg
aXMgdW5ib3VuZCAtIGVlay4KQEAgLTI2MTYsMTYgKzI2MTYsNiBAQCBkZXN0cm95OgogCXJldHVy
biAwOwogfQogCi1pbnQgaTkxNV92bWFfdW5iaW5kKHN0cnVjdCBpOTE1X3ZtYSAqdm1hKQotewot
CXJldHVybiBfX2k5MTVfdm1hX3VuYmluZCh2bWEsIHRydWUpOwotfQotCi1pbnQgX19pOTE1X3Zt
YV91bmJpbmRfbm9fd2FpdChzdHJ1Y3QgaTkxNV92bWEgKnZtYSkKLXsKLQlyZXR1cm4gX19pOTE1
X3ZtYV91bmJpbmQodm1hLCBmYWxzZSk7Ci19Ci0KIGludCBpOTE1X2dlbV93YWl0X2Zvcl9pZGxl
KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIHsKIAlzdHJ1Y3QgaW50ZWxfZW5n
aW5lX2NzICplbmdpbmU7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dl
bV9jb250ZXh0LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9jb250ZXh0LmMKaW5k
ZXggZjA0MDczNDY5ODUzLi41ZWQ5MTQwNmQ0ZTkgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2Ry
bS9pOTE1L2k5MTVfZ2VtX2NvbnRleHQuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1
X2dlbV9jb250ZXh0LmMKQEAgLTEzNCwyMSArMTM0LDYgQEAgc3RhdGljIGludCBnZXRfY29udGV4
dF9zaXplKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAlyZXR1cm4gcmV0Owog
fQogCi1zdGF0aWMgdm9pZCBpOTE1X2dlbV9jb250ZXh0X2NsZWFuKHN0cnVjdCBpOTE1X2dlbV9j
b250ZXh0ICpjdHgpCi17Ci0Jc3RydWN0IGk5MTVfaHdfcHBndHQgKnBwZ3R0ID0gY3R4LT5wcGd0
dDsKLQlzdHJ1Y3QgaTkxNV92bWEgKnZtYSwgKm5leHQ7Ci0KLQlpZiAoIXBwZ3R0KQotCQlyZXR1
cm47Ci0KLQlsaXN0X2Zvcl9lYWNoX2VudHJ5X3NhZmUodm1hLCBuZXh0LCAmcHBndHQtPmJhc2Uu
aW5hY3RpdmVfbGlzdCwKLQkJCQkgdm1fbGluaykgewotCQlpZiAoV0FSTl9PTihfX2k5MTVfdm1h
X3VuYmluZF9ub193YWl0KHZtYSkpKQotCQkJYnJlYWs7Ci0JfQotfQotCiB2b2lkIGk5MTVfZ2Vt
X2NvbnRleHRfZnJlZShzdHJ1Y3Qga3JlZiAqY3R4X3JlZikKIHsKIAlzdHJ1Y3QgaTkxNV9nZW1f
Y29udGV4dCAqY3R4ID0gY29udGFpbmVyX29mKGN0eF9yZWYsIHR5cGVvZigqY3R4KSwgcmVmKTsK
QEAgLTE1OCwxMyArMTQzLDYgQEAgdm9pZCBpOTE1X2dlbV9jb250ZXh0X2ZyZWUoc3RydWN0IGty
ZWYgKmN0eF9yZWYpCiAJdHJhY2VfaTkxNV9jb250ZXh0X2ZyZWUoY3R4KTsKIAlHRU1fQlVHX09O
KCFjdHgtPmNsb3NlZCk7CiAKLQkvKgotCSAqIFRoaXMgY29udGV4dCBpcyBnb2luZyBhd2F5IGFu
ZCB3ZSBuZWVkIHRvIHJlbW92ZSBhbGwgVk1BcyBzdGlsbAotCSAqIGFyb3VuZC4gVGhpcyBpcyB0
byBoYW5kbGUgaW1wb3J0ZWQgc2hhcmVkIG9iamVjdHMgZm9yIHdoaWNoCi0JICogZGVzdHJ1Y3Rv
ciBkaWQgbm90IHJ1biB3aGVuIHRoZWlyIGhhbmRsZXMgd2VyZSBjbG9zZWQuCi0JICovCi0JaTkx
NV9nZW1fY29udGV4dF9jbGVhbihjdHgpOwotCiAJaTkxNV9wcGd0dF9wdXQoY3R4LT5wcGd0dCk7
CiAKIAlmb3IgKGkgPSAwOyBpIDwgSTkxNV9OVU1fRU5HSU5FUzsgaSsrKSB7Ci0tIAoyLjguMQoK
X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4
IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlz
dHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==