From mboxrd@z Thu Jan  1 00:00:00 1970
From: Nick Hoath <nicholas.hoath@intel.com>
Subject: [PATCH v2] drm/i915: Fix context/engine cleanup order
Date: Fri, 11 Dec 2015 14:59:09 +0000
Message-ID: <1449845949-4161-1-git-send-email-nicholas.hoath@intel.com>
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 mga11.intel.com (mga11.intel.com [192.55.52.93])
 by gabe.freedesktop.org (Postfix) with ESMTP id 451D16E54E
 for <intel-gfx@lists.freedesktop.org>; Fri, 11 Dec 2015 06:59:14 -0800 (PST)
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
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
List-Id: intel-gfx@lists.freedesktop.org

U3dhcCB0aGUgb3JkZXIgb2YgY29udGV4dCAmIGVuZ2luZSBjbGVhbnVwLCBzbyB0aGF0IGl0IGlz
IG5vdwpjb250ZXh0cywgdGhlbiBlbmdpbmVzLgpUaGlzIGFsbG93cyB0aGUgY29udGV4dCBjbGVh
biB1cCBjb2RlIHRvIGRvIHRoaW5ncyBsaWtlIGNvbmZpcm0KdGhhdCByaW5nLT5kZXYtPnN0cnVj
dF9tdXRleCBpcyBsb2NrZWQgd2l0aG91dCBhIE5VTEwgcG9pbnRlcgpkZXJlZmVyZW5jZS4KVGhp
cyBjYW1lIGFib3V0IGFzIGEgcmVzdWx0IG9mIHRoZSAnaW50ZWxfcmluZ19pbml0aWFsaXplZCgp
IG11c3QKYmUgc2ltcGxlIGFuZCBpbmxpbmUnIHBhdGNoIG5vdyB1c2luZyByaW5nLT5kZXYgYXMg
YW4gaW5pdGlhbGlzZWQKZmxhZy4KUmVuYW1lIHRoZSBjbGVhbnVwIGZ1bmN0aW9uIHRvIHJlZmxl
Y3Qgd2hhdCBpdCBhY3R1YWxseSBkb2VzLgpBbHNvIGNsZWFuIHVwIHNvbWUgdmVyeSBhbm5veWlu
ZyB3aGl0ZXNwYWNlIGlzc3VlcyBhdCB0aGUgc2FtZSB0aW1lLgoKdjI6IEFsc28gbWFrZSB0aGUg
Zml4IGluIGk5MTVfbG9hZF9tb2Rlc2V0X2luaXQsIG5vdCBqdXN0CiAgICBpbiBpOTE1X2RyaXZl
cl91bmxvYWQgKENocmlzIFdpbHNvbikKClNpZ25lZC1vZmYtYnk6IE5pY2sgSG9hdGggPG5pY2hv
bGFzLmhvYXRoQGludGVsLmNvbT4KUmV2aWV3ZWQtYnk6IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hy
aXMtd2lsc29uLmNvLnVrPgoKQ2M6IE1pa2EgS3VvcHBhbGEgPG1pa2Eua3VvcHBhbGFAbGludXgu
aW50ZWwuY29tPgpDYzogRGFuaWVsIFZldHRlciA8ZGFuaWVsLnZldHRlckBmZndsbC5jaD4KQ2M6
IERhdmlkIEdvcmRvbiA8ZGF2aWQucy5nb3Jkb25AaW50ZWwuY29tPgpDYzogQ2hyaXMgV2lsc29u
IDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx
NV9kbWEuYyB8ICA0ICsrLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggfCAgMiAr
LQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYyB8IDIzICsrKysrKysrKysrKy0tLS0t
LS0tLS0tCiAzIGZpbGVzIGNoYW5nZWQsIDE1IGluc2VydGlvbnMoKyksIDE0IGRlbGV0aW9ucygt
KQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZG1hLmMgYi9kcml2ZXJz
L2dwdS9kcm0vaTkxNS9pOTE1X2RtYS5jCmluZGV4IDg0ZTJiMjAuLjRkYWQxMjEgMTAwNjQ0Ci0t
LSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZG1hLmMKKysrIGIvZHJpdmVycy9ncHUvZHJt
L2k5MTUvaTkxNV9kbWEuYwpAQCAtNDQ5LDggKzQ0OSw4IEBAIHN0YXRpYyBpbnQgaTkxNV9sb2Fk
X21vZGVzZXRfaW5pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCiBjbGVhbnVwX2dlbToKIAlt
dXRleF9sb2NrKCZkZXYtPnN0cnVjdF9tdXRleCk7Ci0JaTkxNV9nZW1fY2xlYW51cF9yaW5nYnVm
ZmVyKGRldik7CiAJaTkxNV9nZW1fY29udGV4dF9maW5pKGRldik7CisJaTkxNV9nZW1fY2xlYW51
cF9lbmdpbmVzKGRldik7CiAJbXV0ZXhfdW5sb2NrKCZkZXYtPnN0cnVjdF9tdXRleCk7CiBjbGVh
bnVwX2lycToKIAlpbnRlbF9ndWNfdWNvZGVfZmluaShkZXYpOwpAQCAtMTE4OCw4ICsxMTg4LDgg
QEAgaW50IGk5MTVfZHJpdmVyX3VubG9hZChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCiAJaW50
ZWxfZ3VjX3Vjb2RlX2ZpbmkoZGV2KTsKIAltdXRleF9sb2NrKCZkZXYtPnN0cnVjdF9tdXRleCk7
Ci0JaTkxNV9nZW1fY2xlYW51cF9yaW5nYnVmZmVyKGRldik7CiAJaTkxNV9nZW1fY29udGV4dF9m
aW5pKGRldik7CisJaTkxNV9nZW1fY2xlYW51cF9lbmdpbmVzKGRldik7CiAJbXV0ZXhfdW5sb2Nr
KCZkZXYtPnN0cnVjdF9tdXRleCk7CiAJaW50ZWxfZmJjX2NsZWFudXBfY2ZiKGRldl9wcml2KTsK
IAlpOTE1X2dlbV9jbGVhbnVwX3N0b2xlbihkZXYpOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUv
ZHJtL2k5MTUvaTkxNV9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKaW5k
ZXggNWVkZDM5My4uZTMxN2Y4OCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx
NV9kcnYuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCkBAIC0zMDE2LDcg
KzMwMTYsNyBAQCBpbnQgaTkxNV9nZW1faW5pdF9yaW5ncyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2
KTsKIGludCBfX211c3RfY2hlY2sgaTkxNV9nZW1faW5pdF9odyhzdHJ1Y3QgZHJtX2RldmljZSAq
ZGV2KTsKIGludCBpOTE1X2dlbV9sM19yZW1hcChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3Qg
KnJlcSwgaW50IHNsaWNlKTsKIHZvaWQgaTkxNV9nZW1faW5pdF9zd2l6emxpbmcoc3RydWN0IGRy
bV9kZXZpY2UgKmRldik7Ci12b2lkIGk5MTVfZ2VtX2NsZWFudXBfcmluZ2J1ZmZlcihzdHJ1Y3Qg
ZHJtX2RldmljZSAqZGV2KTsKK3ZvaWQgaTkxNV9nZW1fY2xlYW51cF9lbmdpbmVzKHN0cnVjdCBk
cm1fZGV2aWNlICpkZXYpOwogaW50IF9fbXVzdF9jaGVjayBpOTE1X2dwdV9pZGxlKHN0cnVjdCBk
cm1fZGV2aWNlICpkZXYpOwogaW50IF9fbXVzdF9jaGVjayBpOTE1X2dlbV9zdXNwZW5kKHN0cnVj
dCBkcm1fZGV2aWNlICpkZXYpOwogdm9pZCBfX2k5MTVfYWRkX3JlcXVlc3Qoc3RydWN0IGRybV9p
OTE1X2dlbV9yZXF1ZXN0ICpyZXEsCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p
OTE1X2dlbS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYwppbmRleCA4ZTJhY2Rl
Li4wNGEyMmRiIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCisr
KyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKQEAgLTQ4MjMsNyArNDgyMyw3IEBA
IGk5MTVfZ2VtX2luaXRfaHcoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAogCQlyZXQgPSBpOTE1
X2dlbV9yZXF1ZXN0X2FsbG9jKHJpbmcsIHJpbmctPmRlZmF1bHRfY29udGV4dCwgJnJlcSk7CiAJ
CWlmIChyZXQpIHsKLQkJCWk5MTVfZ2VtX2NsZWFudXBfcmluZ2J1ZmZlcihkZXYpOworCQkJaTkx
NV9nZW1fY2xlYW51cF9lbmdpbmVzKGRldik7CiAJCQlnb3RvIG91dDsKIAkJfQogCkBAIC00ODM2
LDcgKzQ4MzYsNyBAQCBpOTE1X2dlbV9pbml0X2h3KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJ
CWlmIChyZXQgJiYgcmV0ICE9IC1FSU8pIHsKIAkJCURSTV9FUlJPUigiUFBHVFQgZW5hYmxlIHJp
bmcgIyVkIGZhaWxlZCAlZFxuIiwgaSwgcmV0KTsKIAkJCWk5MTVfZ2VtX3JlcXVlc3RfY2FuY2Vs
KHJlcSk7Ci0JCQlpOTE1X2dlbV9jbGVhbnVwX3JpbmdidWZmZXIoZGV2KTsKKwkJCWk5MTVfZ2Vt
X2NsZWFudXBfZW5naW5lcyhkZXYpOwogCQkJZ290byBvdXQ7CiAJCX0KIApAQCAtNDg0NCw3ICs0
ODQ0LDcgQEAgaTkxNV9nZW1faW5pdF9odyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCQlpZiAo
cmV0ICYmIHJldCAhPSAtRUlPKSB7CiAJCQlEUk1fRVJST1IoIkNvbnRleHQgZW5hYmxlIHJpbmcg
IyVkIGZhaWxlZCAlZFxuIiwgaSwgcmV0KTsKIAkJCWk5MTVfZ2VtX3JlcXVlc3RfY2FuY2VsKHJl
cSk7Ci0JCQlpOTE1X2dlbV9jbGVhbnVwX3JpbmdidWZmZXIoZGV2KTsKKwkJCWk5MTVfZ2VtX2Ns
ZWFudXBfZW5naW5lcyhkZXYpOwogCQkJZ290byBvdXQ7CiAJCX0KIApAQCAtNDkxOSw3ICs0OTE5
LDcgQEAgb3V0X3VubG9jazoKIH0KIAogdm9pZAotaTkxNV9nZW1fY2xlYW51cF9yaW5nYnVmZmVy
KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCitpOTE1X2dlbV9jbGVhbnVwX2VuZ2luZXMoc3RydWN0
IGRybV9kZXZpY2UgKmRldikKIHsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYg
PSBkZXYtPmRldl9wcml2YXRlOwogCXN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmc7CkBAIC00
OTI4LDEzICs0OTI4LDE0IEBAIGk5MTVfZ2VtX2NsZWFudXBfcmluZ2J1ZmZlcihzdHJ1Y3QgZHJt
X2RldmljZSAqZGV2KQogCWZvcl9lYWNoX3JpbmcocmluZywgZGV2X3ByaXYsIGkpCiAJCWRldl9w
cml2LT5ndC5jbGVhbnVwX3JpbmcocmluZyk7CiAKLSAgICBpZiAoaTkxNS5lbmFibGVfZXhlY2xp
c3RzKQotICAgICAgICAgICAgLyoKLSAgICAgICAgICAgICAqIE5laXRoZXIgdGhlIEJJT1MsIG91
cnNlbHZlcyBvciBhbnkgb3RoZXIga2VybmVsCi0gICAgICAgICAgICAgKiBleHBlY3RzIHRoZSBz
eXN0ZW0gdG8gYmUgaW4gZXhlY2xpc3RzIG1vZGUgb24gc3RhcnR1cCwKLSAgICAgICAgICAgICAq
IHNvIHdlIG5lZWQgdG8gcmVzZXQgdGhlIEdQVSBiYWNrIHRvIGxlZ2FjeSBtb2RlLgotICAgICAg
ICAgICAgICovCi0gICAgICAgICAgICBpbnRlbF9ncHVfcmVzZXQoZGV2KTsKKwlpZiAoaTkxNS5l
bmFibGVfZXhlY2xpc3RzKSB7CisJCS8qCisJCSAqIE5laXRoZXIgdGhlIEJJT1MsIG91cnNlbHZl
cyBvciBhbnkgb3RoZXIga2VybmVsCisJCSAqIGV4cGVjdHMgdGhlIHN5c3RlbSB0byBiZSBpbiBl
eGVjbGlzdHMgbW9kZSBvbiBzdGFydHVwLAorCQkgKiBzbyB3ZSBuZWVkIHRvIHJlc2V0IHRoZSBH
UFUgYmFjayB0byBsZWdhY3kgbW9kZS4KKwkJICovCisJCWludGVsX2dwdV9yZXNldChkZXYpOwor
CX0KIH0KIAogc3RhdGljIHZvaWQKLS0gCjEuOS4xCgpfX19fX19fX19fX19fX19fX19fX19fX19f
X19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBs
aXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFu
L2xpc3RpbmZvL2ludGVsLWdmeAo=