From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dave Gordon Subject: [PATCH v2 1/6] drm/i915: fix context/engine cleanup order Date: Fri, 22 Jan 2016 23:10:06 +0000 Message-ID: <1453504211-7982-2-git-send-email-david.s.gordon@intel.com> References: <1453504211-7982-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 mga04.intel.com (mga04.intel.com [192.55.52.120]) by gabe.freedesktop.org (Postfix) with ESMTP id 4F96B6E369 for ; Fri, 22 Jan 2016 15:10:19 -0800 (PST) In-Reply-To: <1453504211-7982-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 YWcsIHNvIGl0IGNhbiBub3cgYmUgTlVMTCBhZnRlciBlbmdpbmUgdGVhcmRvd24uIFRoaXMKaW4g dHVybiBjYW4gY2F1c2UgYSBwcm9ibGVtIGluIHRoZSBjb250ZXh0IGNvZGUsIHdoaWNoICh1c2Vk IHRvKSBjaGVjawp0aGUgcmluZy0+ZGV2LT5zdHJ1Y3RfbXV0ZXggLS0gY2F1c2luZyBhIGZhdWx0 IGlmIHJpbmctPmRldiB3YXMgTlVMTC4KCkFsc28gcmVuYW1lIHRoZSBjbGVhbnVwIGZ1bmN0aW9u IHRvIHJlZmxlY3Qgd2hhdCBpdCBhY3R1YWxseSBkb2VzCihjbGVhbnVwIGVuZ2luZXMsIG5vdCBh IHJpbmdidWZmZXIpLCBhbmQgZml4IGFuIGFubm95aW5nIHdoaXRlc3BhY2UgaXNzdWUuCgp2Mjog QWxzbyBtYWtlIHRoZSBmaXggaW4gaTkxNV9sb2FkX21vZGVzZXRfaW5pdCwgbm90IGp1c3QgaW4K ICAgIGk5MTVfZHJpdmVyX3VubG9hZCAoQ2hyaXMgV2lsc29uKQp2MzogSGFkIGV4dHJhIHN0dWZm IGluIGl0Lgp2NDogUmV2ZXJ0ZWQgZXh0cmEgc3R1ZmYgKHNvIHdlJ3JlIGJhY2sgdG8gdjIpLgog ICAgUmViYXNlZCBhbmQgdXBkYXRlZCBjb21tZW50YXJ5IGFib3ZlIChEYXZlIEdvcmRvbikuCgpT aWduZWQtb2ZmLWJ5OiBOaWNrIEhvYXRoIDxuaWNob2xhcy5ob2F0aEBpbnRlbC5jb20+ClNpZ25l ZC1vZmYtYnk6IERhdmlkIEdvcmRvbiA8ZGF2aWQucy5nb3Jkb25AaW50ZWwuY29tPgpSZXZpZXdl ZC1ieTogQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+CgpDYzogTWlrYSBL dW9wcGFsYSA8bWlrYS5rdW9wcGFsYUBsaW51eC5pbnRlbC5jb20+CkNjOiBEYW5pZWwgVmV0dGVy IDxkYW5pZWwudmV0dGVyQGZmd2xsLmNoPgpDYzogQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13 aWxzb24uY28udWs+ClNpZ25lZC1vZmYtYnk6IERhdmUgR29yZG9uIDxkYXZpZC5zLmdvcmRvbkBp bnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kbWEuYyB8ICA0ICsrLS0K IGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggfCAgMiArLQogZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9nZW0uYyB8IDIzICsrKysrKysrKysrKy0tLS0tLS0tLS0tCiAzIGZpbGVzIGNo YW5nZWQsIDE1IGluc2VydGlvbnMoKyksIDE0IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZG1hLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2RtYS5jCmluZGV4IGQ3MGQ5NmYuLjQ3MjVlOGQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZG1hLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kbWEuYwpA QCAtNDUxLDggKzQ1MSw4IEBAIHN0YXRpYyBpbnQgaTkxNV9sb2FkX21vZGVzZXRfaW5pdChzdHJ1 Y3QgZHJtX2RldmljZSAqZGV2KQogCiBjbGVhbnVwX2dlbToKIAltdXRleF9sb2NrKCZkZXYtPnN0 cnVjdF9tdXRleCk7Ci0JaTkxNV9nZW1fY2xlYW51cF9yaW5nYnVmZmVyKGRldik7CiAJaTkxNV9n ZW1fY29udGV4dF9maW5pKGRldik7CisJaTkxNV9nZW1fY2xlYW51cF9lbmdpbmVzKGRldik7CiAJ bXV0ZXhfdW5sb2NrKCZkZXYtPnN0cnVjdF9tdXRleCk7CiBjbGVhbnVwX2lycToKIAlpbnRlbF9n dWNfdWNvZGVfZmluaShkZXYpOwpAQCAtMTE5Niw4ICsxMTk2LDggQEAgaW50IGk5MTVfZHJpdmVy X3VubG9hZChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCiAJaW50ZWxfZ3VjX3Vjb2RlX2Zpbmko ZGV2KTsKIAltdXRleF9sb2NrKCZkZXYtPnN0cnVjdF9tdXRleCk7Ci0JaTkxNV9nZW1fY2xlYW51 cF9yaW5nYnVmZmVyKGRldik7CiAJaTkxNV9nZW1fY29udGV4dF9maW5pKGRldik7CisJaTkxNV9n ZW1fY2xlYW51cF9lbmdpbmVzKGRldik7CiAJbXV0ZXhfdW5sb2NrKCZkZXYtPnN0cnVjdF9tdXRl eCk7CiAJaW50ZWxfZmJjX2NsZWFudXBfY2ZiKGRldl9wcml2KTsKIAlpOTE1X2dlbV9jbGVhbnVw X3N0b2xlbihkZXYpOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYu aCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKaW5kZXggMjA0NjYxZi4uMDIxZTg4 YSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAorKysgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCkBAIC0zMDEyLDcgKzMwMTIsNyBAQCBpbnQgaTkx NV9nZW1faW5pdF9yaW5ncyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KTsKIGludCBfX211c3RfY2hl Y2sgaTkxNV9nZW1faW5pdF9odyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KTsKIGludCBpOTE1X2dl bV9sM19yZW1hcChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSwgaW50IHNsaWNlKTsK IHZvaWQgaTkxNV9nZW1faW5pdF9zd2l6emxpbmcoc3RydWN0IGRybV9kZXZpY2UgKmRldik7Ci12 b2lkIGk5MTVfZ2VtX2NsZWFudXBfcmluZ2J1ZmZlcihzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KTsK K3ZvaWQgaTkxNV9nZW1fY2xlYW51cF9lbmdpbmVzKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpOwog aW50IF9fbXVzdF9jaGVjayBpOTE1X2dwdV9pZGxlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpOwog aW50IF9fbXVzdF9jaGVjayBpOTE1X2dlbV9zdXNwZW5kKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYp Owogdm9pZCBfX2k5MTVfYWRkX3JlcXVlc3Qoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpy ZXEsCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYwppbmRleCAzNzFiYmIyLi43OTlhNTNhIDEwMDY0NAot LS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCisrKyBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZ2VtLmMKQEAgLTQ5MTIsNyArNDkxMiw3IEBAIGludCBpOTE1X2dlbV9pbml0 X3JpbmdzKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJCXJlcSA9IGk5MTVfZ2VtX3JlcXVlc3Rf YWxsb2MocmluZywgTlVMTCk7CiAJCWlmIChJU19FUlIocmVxKSkgewogCQkJcmV0ID0gUFRSX0VS UihyZXEpOwotCQkJaTkxNV9nZW1fY2xlYW51cF9yaW5nYnVmZmVyKGRldik7CisJCQlpOTE1X2dl bV9jbGVhbnVwX2VuZ2luZXMoZGV2KTsKIAkJCWdvdG8gb3V0OwogCQl9CiAKQEAgLTQ5MjUsNyAr NDkyNSw3IEBAIGludCBpOTE1X2dlbV9pbml0X3JpbmdzKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYp CiAJCWlmIChyZXQgJiYgcmV0ICE9IC1FSU8pIHsKIAkJCURSTV9FUlJPUigiUFBHVFQgZW5hYmxl IHJpbmcgIyVkIGZhaWxlZCAlZFxuIiwgaSwgcmV0KTsKIAkJCWk5MTVfZ2VtX3JlcXVlc3RfY2Fu Y2VsKHJlcSk7Ci0JCQlpOTE1X2dlbV9jbGVhbnVwX3JpbmdidWZmZXIoZGV2KTsKKwkJCWk5MTVf Z2VtX2NsZWFudXBfZW5naW5lcyhkZXYpOwogCQkJZ290byBvdXQ7CiAJCX0KIApAQCAtNDkzMyw3 ICs0OTMzLDcgQEAgaW50IGk5MTVfZ2VtX2luaXRfcmluZ3Moc3RydWN0IGRybV9kZXZpY2UgKmRl dikKIAkJaWYgKHJldCAmJiByZXQgIT0gLUVJTykgewogCQkJRFJNX0VSUk9SKCJDb250ZXh0IGVu YWJsZSByaW5nICMlZCBmYWlsZWQgJWRcbiIsIGksIHJldCk7CiAJCQlpOTE1X2dlbV9yZXF1ZXN0 X2NhbmNlbChyZXEpOwotCQkJaTkxNV9nZW1fY2xlYW51cF9yaW5nYnVmZmVyKGRldik7CisJCQlp OTE1X2dlbV9jbGVhbnVwX2VuZ2luZXMoZGV2KTsKIAkJCWdvdG8gb3V0OwogCQl9CiAKQEAgLTUw MDgsNyArNTAwOCw3IEBAIGludCBpOTE1X2dlbV9pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYp CiB9CiAKIHZvaWQKLWk5MTVfZ2VtX2NsZWFudXBfcmluZ2J1ZmZlcihzdHJ1Y3QgZHJtX2Rldmlj ZSAqZGV2KQoraTkxNV9nZW1fY2xlYW51cF9lbmdpbmVzKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYp CiB7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0 ZTsKIAlzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nOwpAQCAtNTAxNywxMyArNTAxNywxNCBA QCBpbnQgaTkxNV9nZW1faW5pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCWZvcl9lYWNoX3Jp bmcocmluZywgZGV2X3ByaXYsIGkpCiAJCWRldl9wcml2LT5ndC5jbGVhbnVwX3JpbmcocmluZyk7 CiAKLSAgICBpZiAoaTkxNS5lbmFibGVfZXhlY2xpc3RzKQotICAgICAgICAgICAgLyoKLSAgICAg ICAgICAgICAqIE5laXRoZXIgdGhlIEJJT1MsIG91cnNlbHZlcyBvciBhbnkgb3RoZXIga2VybmVs Ci0gICAgICAgICAgICAgKiBleHBlY3RzIHRoZSBzeXN0ZW0gdG8gYmUgaW4gZXhlY2xpc3RzIG1v ZGUgb24gc3RhcnR1cCwKLSAgICAgICAgICAgICAqIHNvIHdlIG5lZWQgdG8gcmVzZXQgdGhlIEdQ VSBiYWNrIHRvIGxlZ2FjeSBtb2RlLgotICAgICAgICAgICAgICovCi0gICAgICAgICAgICBpbnRl bF9ncHVfcmVzZXQoZGV2KTsKKwlpZiAoaTkxNS5lbmFibGVfZXhlY2xpc3RzKSB7CisJCS8qCisJ CSAqIE5laXRoZXIgdGhlIEJJT1MsIG91cnNlbHZlcyBvciBhbnkgb3RoZXIga2VybmVsCisJCSAq IGV4cGVjdHMgdGhlIHN5c3RlbSB0byBiZSBpbiBleGVjbGlzdHMgbW9kZSBvbiBzdGFydHVwLAor CQkgKiBzbyB3ZSBuZWVkIHRvIHJlc2V0IHRoZSBHUFUgYmFjayB0byBsZWdhY3kgbW9kZS4KKwkJ ICovCisJCWludGVsX2dwdV9yZXNldChkZXYpOworCX0KIH0KIAogc3RhdGljIHZvaWQKLS0gCjEu OS4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRl bC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDov L2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=