From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dave Gordon Subject: [PATCH v4 6/6] drm/i915: fix context/engine cleanup order Date: Fri, 29 Jan 2016 19:19:31 +0000 Message-ID: <1454095171-22475-7-git-send-email-david.s.gordon@intel.com> References: <1454095171-22475-1-git-send-email-david.s.gordon@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTP id D3B116EA0A for ; Fri, 29 Jan 2016 11:19:48 -0800 (PST) In-Reply-To: <1454095171-22475-1-git-send-email-david.s.gordon@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: intel-gfx@lists.freedesktop.org Cc: Daniel Vetter List-Id: intel-gfx@lists.freedesktop.org RnJvbTogTmljayBIb2F0aCA8bmljaG9sYXMuaG9hdGhAaW50ZWwuY29tPgoKU3dhcCB0aGUgb3Jk ZXIgb2YgY29udGV4dCAmIGVuZ2luZSBjbGVhbnVwLCBzbyB0aGF0IGNvbnRleHRzIGFyZSBjbGVh bmVkCnVwIGZpcnN0LCBhbmQgKnRoZW4qIGVuZ2luZXMuIFRoaXMgaXMgYSBtb3JlIHNlbnNpYmxl IG9yZGVyIGFueXdheSwgYnV0CmluIHBhcnRpY3VsYXIgaGFzIGJlY29tZSBuZWNlc3Nhcnkgc2lu Y2UgdGhlICdpbnRlbF9yaW5nX2luaXRpYWxpemVkKCkKbXVzdCBiZSBzaW1wbGUgYW5kIGlubGlu ZScgcGF0Y2gsIHdoaWNoIG5vdyB1c2VzIHJpbmctPmRldiBhcyBhbgonaW5pdGlhbGlzZWQnIGZs YWcsIHNvIGl0IGNhbiBub3cgYmUgTlVMTCBhZnRlciBlbmdpbmUgdGVhcmRvd24uIFRoaXMgaW4K dHVybiBjYW4gY2F1c2UgYSBwcm9ibGVtIGluIHRoZSBjb250ZXh0IGNvZGUsIHdoaWNoICh1c2Vk IHRvKSBjaGVjayB0aGUKcmluZy0+ZGV2LT5zdHJ1Y3RfbXV0ZXggLS0gY2F1c2luZyBhIGZhdWx0 IGlmIHJpbmctPmRldiB3YXMgTlVMTC4KCkFsc28gcmVuYW1lIHRoZSBjbGVhbnVwIGZ1bmN0aW9u IHRvIHJlZmxlY3Qgd2hhdCBpdCBhY3R1YWxseSBkb2VzCihjbGVhbnVwIGVuZ2luZXMsIG5vdCBh IHJpbmdidWZmZXIpLCBhbmQgZml4IGFuIGFubm95aW5nIHdoaXRlc3BhY2UKaXNzdWUuCgp2Mjog QWxzbyBtYWtlIHRoZSBmaXggaW4gaTkxNV9sb2FkX21vZGVzZXRfaW5pdCwgbm90IGp1c3QgaW4K ICAgIGk5MTVfZHJpdmVyX3VubG9hZCAoQ2hyaXMgV2lsc29uKQp2MzogSGFkIGV4dHJhIHN0dWZm IGluIGl0Lgp2NDogUmV2ZXJ0ZWQgZXh0cmEgc3R1ZmYgKHNvIHdlJ3JlIGJhY2sgdG8gdjIpLgog ICAgUmViYXNlZCBhbmQgdXBkYXRlZCBjb21tZW50YXJ5IGFib3ZlIChEYXZlIEdvcmRvbikuCgpT aWduZWQtb2ZmLWJ5OiBOaWNrIEhvYXRoIDxuaWNob2xhcy5ob2F0aEBpbnRlbC5jb20+ClNpZ25l ZC1vZmYtYnk6IERhdmlkIEdvcmRvbiA8ZGF2aWQucy5nb3Jkb25AaW50ZWwuY29tPgpSZXZpZXdl ZC1ieTogQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+CgpDYzogTWlrYSBL dW9wcGFsYSA8bWlrYS5rdW9wcGFsYUBsaW51eC5pbnRlbC5jb20+CkNjOiBEYW5pZWwgVmV0dGVy IDxkYW5pZWwudmV0dGVyQGZmd2xsLmNoPgpDYzogQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13 aWxzb24uY28udWs+ClNpZ25lZC1vZmYtYnk6IERhdmUgR29yZG9uIDxkYXZpZC5zLmdvcmRvbkBp bnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kbWEuYyB8ICA0ICsrLS0K IGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggfCAgMiArLQogZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9nZW0uYyB8IDIzICsrKysrKysrKysrKy0tLS0tLS0tLS0tCiAzIGZpbGVzIGNo YW5nZWQsIDE1IGluc2VydGlvbnMoKyksIDE0IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZG1hLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2RtYS5jCmluZGV4IGRiOWIwYzYuLjNlYjY4NDQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZG1hLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kbWEuYwpA QCAtNDQ0LDggKzQ0NCw4IEBAIHN0YXRpYyBpbnQgaTkxNV9sb2FkX21vZGVzZXRfaW5pdChzdHJ1 Y3QgZHJtX2RldmljZSAqZGV2KQogCiBjbGVhbnVwX2dlbToKIAltdXRleF9sb2NrKCZkZXYtPnN0 cnVjdF9tdXRleCk7Ci0JaTkxNV9nZW1fY2xlYW51cF9yaW5nYnVmZmVyKGRldik7CiAJaTkxNV9n ZW1fY29udGV4dF9maW5pKGRldik7CisJaTkxNV9nZW1fY2xlYW51cF9lbmdpbmVzKGRldik7CiAJ bXV0ZXhfdW5sb2NrKCZkZXYtPnN0cnVjdF9tdXRleCk7CiBjbGVhbnVwX2lycToKIAlpbnRlbF9n dWNfdWNvZGVfZmluaShkZXYpOwpAQCAtMTIyMCw4ICsxMjIwLDggQEAgaW50IGk5MTVfZHJpdmVy X3VubG9hZChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCiAJaW50ZWxfZ3VjX3Vjb2RlX2Zpbmko ZGV2KTsKIAltdXRleF9sb2NrKCZkZXYtPnN0cnVjdF9tdXRleCk7Ci0JaTkxNV9nZW1fY2xlYW51 cF9yaW5nYnVmZmVyKGRldik7CiAJaTkxNV9nZW1fY29udGV4dF9maW5pKGRldik7CisJaTkxNV9n ZW1fY2xlYW51cF9lbmdpbmVzKGRldik7CiAJbXV0ZXhfdW5sb2NrKCZkZXYtPnN0cnVjdF9tdXRl eCk7CiAJaW50ZWxfZmJjX2NsZWFudXBfY2ZiKGRldl9wcml2KTsKIApkaWZmIC0tZ2l0IGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf ZHJ2LmgKaW5kZXggOTA1ZTkwZi4uOGJhYWNhNyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9kcnYuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCkBA IC0zMDIwLDcgKzMwMjAsNyBAQCBpbnQgaTkxNV9nZW1faW5pdF9yaW5ncyhzdHJ1Y3QgZHJtX2Rl dmljZSAqZGV2KTsKIGludCBfX211c3RfY2hlY2sgaTkxNV9nZW1faW5pdF9odyhzdHJ1Y3QgZHJt X2RldmljZSAqZGV2KTsKIGludCBpOTE1X2dlbV9sM19yZW1hcChzdHJ1Y3QgZHJtX2k5MTVfZ2Vt X3JlcXVlc3QgKnJlcSwgaW50IHNsaWNlKTsKIHZvaWQgaTkxNV9nZW1faW5pdF9zd2l6emxpbmco c3RydWN0IGRybV9kZXZpY2UgKmRldik7Ci12b2lkIGk5MTVfZ2VtX2NsZWFudXBfcmluZ2J1ZmZl cihzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KTsKK3ZvaWQgaTkxNV9nZW1fY2xlYW51cF9lbmdpbmVz KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpOwogaW50IF9fbXVzdF9jaGVjayBpOTE1X2dwdV9pZGxl KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpOwogaW50IF9fbXVzdF9jaGVjayBpOTE1X2dlbV9zdXNw ZW5kKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpOwogdm9pZCBfX2k5MTVfYWRkX3JlcXVlc3Qoc3Ry dWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEsCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2dlbS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYwppbmRl eCA1YTRkNDY4Li40ZWU2ZGY5IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2dlbS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKQEAgLTQ5MTIsNyAr NDkxMiw3IEBAIGludCBpOTE1X2dlbV9pbml0X3JpbmdzKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYp CiAJCXJlcSA9IGk5MTVfZ2VtX3JlcXVlc3RfYWxsb2MocmluZywgTlVMTCk7CiAJCWlmIChJU19F UlIocmVxKSkgewogCQkJcmV0ID0gUFRSX0VSUihyZXEpOwotCQkJaTkxNV9nZW1fY2xlYW51cF9y aW5nYnVmZmVyKGRldik7CisJCQlpOTE1X2dlbV9jbGVhbnVwX2VuZ2luZXMoZGV2KTsKIAkJCWdv dG8gb3V0OwogCQl9CiAKQEAgLTQ5MjUsNyArNDkyNSw3IEBAIGludCBpOTE1X2dlbV9pbml0X3Jp bmdzKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJCWlmIChyZXQgJiYgcmV0ICE9IC1FSU8pIHsK IAkJCURSTV9FUlJPUigiUFBHVFQgZW5hYmxlIHJpbmcgIyVkIGZhaWxlZCAlZFxuIiwgaSwgcmV0 KTsKIAkJCWk5MTVfZ2VtX3JlcXVlc3RfY2FuY2VsKHJlcSk7Ci0JCQlpOTE1X2dlbV9jbGVhbnVw X3JpbmdidWZmZXIoZGV2KTsKKwkJCWk5MTVfZ2VtX2NsZWFudXBfZW5naW5lcyhkZXYpOwogCQkJ Z290byBvdXQ7CiAJCX0KIApAQCAtNDkzMyw3ICs0OTMzLDcgQEAgaW50IGk5MTVfZ2VtX2luaXRf cmluZ3Moc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAkJaWYgKHJldCAmJiByZXQgIT0gLUVJTykg ewogCQkJRFJNX0VSUk9SKCJDb250ZXh0IGVuYWJsZSByaW5nICMlZCBmYWlsZWQgJWRcbiIsIGks IHJldCk7CiAJCQlpOTE1X2dlbV9yZXF1ZXN0X2NhbmNlbChyZXEpOwotCQkJaTkxNV9nZW1fY2xl YW51cF9yaW5nYnVmZmVyKGRldik7CisJCQlpOTE1X2dlbV9jbGVhbnVwX2VuZ2luZXMoZGV2KTsK IAkJCWdvdG8gb3V0OwogCQl9CiAKQEAgLTUwMTEsNyArNTAxMSw3IEBAIGludCBpOTE1X2dlbV9p bml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiB9CiAKIHZvaWQKLWk5MTVfZ2VtX2NsZWFudXBf cmluZ2J1ZmZlcihzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQoraTkxNV9nZW1fY2xlYW51cF9lbmdp bmVzKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiB7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUg KmRldl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKIAlzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpy aW5nOwpAQCAtNTAyMCwxMyArNTAyMCwxNCBAQCBpbnQgaTkxNV9nZW1faW5pdChzdHJ1Y3QgZHJt X2RldmljZSAqZGV2KQogCWZvcl9lYWNoX3JpbmcocmluZywgZGV2X3ByaXYsIGkpCiAJCWRldl9w cml2LT5ndC5jbGVhbnVwX3JpbmcocmluZyk7CiAKLSAgICBpZiAoaTkxNS5lbmFibGVfZXhlY2xp c3RzKQotICAgICAgICAgICAgLyoKLSAgICAgICAgICAgICAqIE5laXRoZXIgdGhlIEJJT1MsIG91 cnNlbHZlcyBvciBhbnkgb3RoZXIga2VybmVsCi0gICAgICAgICAgICAgKiBleHBlY3RzIHRoZSBz eXN0ZW0gdG8gYmUgaW4gZXhlY2xpc3RzIG1vZGUgb24gc3RhcnR1cCwKLSAgICAgICAgICAgICAq IHNvIHdlIG5lZWQgdG8gcmVzZXQgdGhlIEdQVSBiYWNrIHRvIGxlZ2FjeSBtb2RlLgotICAgICAg ICAgICAgICovCi0gICAgICAgICAgICBpbnRlbF9ncHVfcmVzZXQoZGV2KTsKKwlpZiAoaTkxNS5l bmFibGVfZXhlY2xpc3RzKSB7CisJCS8qCisJCSAqIE5laXRoZXIgdGhlIEJJT1MsIG91cnNlbHZl cyBvciBhbnkgb3RoZXIga2VybmVsCisJCSAqIGV4cGVjdHMgdGhlIHN5c3RlbSB0byBiZSBpbiBl eGVjbGlzdHMgbW9kZSBvbiBzdGFydHVwLAorCQkgKiBzbyB3ZSBuZWVkIHRvIHJlc2V0IHRoZSBH UFUgYmFjayB0byBsZWdhY3kgbW9kZS4KKwkJICovCisJCWludGVsX2dwdV9yZXNldChkZXYpOwor CX0KIH0KIAogc3RhdGljIHZvaWQKLS0gCjEuOS4xCgpfX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBs aXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFu L2xpc3RpbmZvL2ludGVsLWdmeAo=