From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michel Thierry Subject: [PATCH] drm/i915: Look for active requests earlier in the reset path Date: Thu, 18 May 2017 11:22:57 -0700 Message-ID: <20170518182257.23241-1-michel.thierry@intel.com> References: <20170427231300.32841-6-michel.thierry@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTPS id 1EC876E11C for ; Thu, 18 May 2017 18:22:58 +0000 (UTC) In-Reply-To: <20170427231300.32841-6-michel.thierry@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 List-Id: intel-gfx@lists.freedesktop.org QW5kIHN0b3JlIHRoZSBhY3RpdmUgcmVxdWVzdCBzbyB0aGF0IHdlIG9ubHkgc2VhcmNoIGZvciBp dCBvbmNlOyB0aGlzCmFwcGxpZXMgZm9yIHJlc2V0LWVuZ2luZSBhbmQgZnVsbCByZXNldC4KCnYy OiBDaGVjayBmb3IgcmVxdWVzdCBjb21wbGV0aW9uIGluc2lkZSBfcHJlcGFyZV9lbmdpbmUsIGRv bid0IHVzZQpFQ0FOQ0VMRUQsIHJlbW92ZSB1bm5lY2Vzc2FyeSBudWxsIGNoZWNrcyAoQ2hyaXMp LgoKdjM6IENhcHR1cmUgYWN0aXZlIHJlcXVlc3RzIGR1cmluZyByZXNldF9wcmVwYXJlIGFuZCBz dG9yZSBpdCB0aGUKZW5naW5lIGhhbmdjaGVjayBvYmouCgp2NDogUmVuYW1lIGNvbW1pdCwgY2hh bmdlIGk5MTVfZ2VtX3Jlc2V0X3JlcXVlc3QgdG8ganVzdCBjb25maXJtIHRoZQphY3RpdmVfcmVx dWVzdCBpcyBzdGlsbCBpbmNvbXBsZXRlLCBpbnN0ZWFkIG9mIGVuZ2luZV9zdGFsbGVkIChDaHJp cykuCgpTdWdnZXN0ZWQtYnk6IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hyaXMtd2lsc29uLmNvLnVr PgpTaWduZWQtb2ZmLWJ5OiBNaWNoZWwgVGhpZXJyeSA8bWljaGVsLnRoaWVycnlAaW50ZWwuY29t PgoKZml4ZXMKClNpZ25lZC1vZmYtYnk6IE1pY2hlbCBUaGllcnJ5IDxtaWNoZWwudGhpZXJyeUBp bnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYyAgICAgICAgIHwg MTEgKysrKysrLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggICAgICAgICB8 ICAzICsrLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYyAgICAgICAgIHwgMzQgKysr KysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9yaW5nYnVmZmVyLmggfCAgMSArCiA0IGZpbGVzIGNoYW5nZWQsIDMxIGluc2VydGlvbnMoKyks IDE4IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf ZHJ2LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5jCmluZGV4IGQ2Mjc5MzgwNTc5 NC4uZWM3MTkzNzZmYzI0IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Ry di5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMKQEAgLTE5MDAsMTUgKzE5 MDAsMTYgQEAgaW50IGk5MTVfcmVzZXRfZW5naW5lKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVu Z2luZSkKIAogCURSTV9ERUJVR19EUklWRVIoInJlc2V0dGluZyAlc1xuIiwgZW5naW5lLT5uYW1l KTsKIAotCXJldCA9IGk5MTVfZ2VtX3Jlc2V0X3ByZXBhcmVfZW5naW5lKGVuZ2luZSk7Ci0JaWYg KHJldCkgewotCQlEUk1fRVJST1IoIlByZXZpb3VzIHJlc2V0IGZhaWxlZCAtIHByb21vdGUgdG8g ZnVsbCByZXNldFxuIik7CisJZW5naW5lLT5oYW5nY2hlY2suYWN0aXZlX3JlcXVlc3QgPSBpOTE1 X2dlbV9yZXNldF9wcmVwYXJlX2VuZ2luZShlbmdpbmUpOworCWlmIChJU19FUlIoZW5naW5lLT5o YW5nY2hlY2suYWN0aXZlX3JlcXVlc3QpKSB7CisJCURSTV9ERUJVR19EUklWRVIoIlByZXZpb3Vz IHJlc2V0IGZhaWxlZCwgcHJvbW90ZSB0byBmdWxsIHJlc2V0XG4iKTsKKwkJcmV0ID0gUFRSX0VS UihlbmdpbmUtPmhhbmdjaGVjay5hY3RpdmVfcmVxdWVzdCk7CiAJCWdvdG8gb3V0OwogCX0KIAog CS8qCi0JICogdGhlIHJlcXVlc3QgdGhhdCBjYXVzZWQgdGhlIGhhbmcgaXMgc3R1Y2sgb24gZWxz cCwgaWRlbnRpZnkgdGhlCi0JICogYWN0aXZlIHJlcXVlc3QgYW5kIGRyb3AgaXQsIGFkanVzdCBo ZWFkIHRvIHNraXAgdGhlIG9mZmVuZGluZworCSAqIHRoZSByZXF1ZXN0IHRoYXQgY2F1c2VkIHRo ZSBoYW5nIGlzIHN0dWNrIG9uIGVsc3AsIHdlIGtub3cgdGhlCisJICogYWN0aXZlIHJlcXVlc3Qg YW5kIGNhbiBkcm9wIGl0LCBhZGp1c3QgaGVhZCB0byBza2lwIHRoZSBvZmZlbmRpbmcKIAkgKiBy ZXF1ZXN0IHRvIHJlc3VtZSBleGVjdXRpbmcgcmVtYWluaW5nIHJlcXVlc3RzIGluIHRoZSBxdWV1 ZS4KIAkgKi8KIAlpOTE1X2dlbV9yZXNldF9lbmdpbmUoZW5naW5lKTsKZGlmZiAtLWdpdCBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2Rydi5oCmluZGV4IGE1YjljNjY2YjNiZi4uNmNiZmVhYTAyMjQ2IDEwMDY0NAotLS0gYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZHJ2LmgKQEAgLTMzNzAsNyArMzM3MCw4IEBAIHN0YXRpYyBpbmxpbmUgdTMyIGk5MTVfcmVz ZXRfY291bnQoc3RydWN0IGk5MTVfZ3B1X2Vycm9yICplcnJvcikKIAlyZXR1cm4gUkVBRF9PTkNF KGVycm9yLT5yZXNldF9jb3VudCk7CiB9CiAKLWludCBpOTE1X2dlbV9yZXNldF9wcmVwYXJlX2Vu Z2luZShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpOworc3RydWN0IGRybV9pOTE1X2dl bV9yZXF1ZXN0ICoKK2k5MTVfZ2VtX3Jlc2V0X3ByZXBhcmVfZW5naW5lKHN0cnVjdCBpbnRlbF9l bmdpbmVfY3MgKmVuZ2luZSk7CiBpbnQgaTkxNV9nZW1fcmVzZXRfcHJlcGFyZShzdHJ1Y3QgZHJt X2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpOwogdm9pZCBpOTE1X2dlbV9yZXNldChzdHJ1Y3QgZHJt X2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpOwogdm9pZCBpOTE1X2dlbV9yZXNldF9maW5pc2hfZW5n aW5lKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSk7CmRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0u YwppbmRleCBiNWRjMDczYTVkZGMuLmM5ZjEzOWIzMjJkMiAxMDA2NDQKLS0tIGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9nZW0uYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dl bS5jCkBAIC0yNzkzLDEyICsyNzkzLDE0IEBAIHN0YXRpYyBib29sIGVuZ2luZV9zdGFsbGVkKHN0 cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKIAlyZXR1cm4gdHJ1ZTsKIH0KIAotLyogRW5z dXJlIGlycSBoYW5kbGVyIGZpbmlzaGVzLCBhbmQgbm90IHJ1biBhZ2Fpbi4gKi8KLWludCBpOTE1 X2dlbV9yZXNldF9wcmVwYXJlX2VuZ2luZShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUp CisvKgorICogRW5zdXJlIGlycSBoYW5kbGVyIGZpbmlzaGVzLCBhbmQgbm90IHJ1biBhZ2Fpbi4K KyAqIEFsc28gc3RvcmUgdGhlIGFjdGl2ZSByZXF1ZXN0IHNvIHRoYXQgd2Ugb25seSBzZWFyY2gg Zm9yIGl0IG9uY2UuCisgKi8KK3N0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqCitpOTE1X2dl bV9yZXNldF9wcmVwYXJlX2VuZ2luZShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpCiB7 Ci0Jc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXF1ZXN0OwotCWludCBlcnIgPSAwOwot CisJc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXF1ZXN0ID0gTlVMTDsKIAogCS8qIFBy ZXZlbnQgdGhlIHNpZ25hbGVyIHRocmVhZCBmcm9tIHVwZGF0aW5nIHRoZSByZXF1ZXN0CiAJICog c3RhdGUgKGJ5IGNhbGxpbmcgZG1hX2ZlbmNlX3NpZ25hbCkgYXMgd2UgYXJlIHByb2Nlc3NpbmcK QEAgLTI4MjcsMjEgKzI4MjksMzAgQEAgaW50IGk5MTVfZ2VtX3Jlc2V0X3ByZXBhcmVfZW5naW5l KHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKIAogCWlmIChlbmdpbmVfc3RhbGxlZChl bmdpbmUpKSB7CiAJCXJlcXVlc3QgPSBpOTE1X2dlbV9maW5kX2FjdGl2ZV9yZXF1ZXN0KGVuZ2lu ZSk7CisKIAkJaWYgKHJlcXVlc3QgJiYgcmVxdWVzdC0+ZmVuY2UuZXJyb3IgPT0gLUVJTykKLQkJ CWVyciA9IC1FSU87IC8qIFByZXZpb3VzIHJlc2V0IGZhaWxlZCEgKi8KKwkJCXJldHVybiBFUlJf UFRSKC1FSU8pOyAvKiBQcmV2aW91cyByZXNldCBmYWlsZWQhICovCiAJfQogCi0JcmV0dXJuIGVy cjsKKwlyZXR1cm4gcmVxdWVzdDsKIH0KIAogaW50IGk5MTVfZ2VtX3Jlc2V0X3ByZXBhcmUoc3Ry dWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogewogCXN0cnVjdCBpbnRlbF9lbmdpbmVf Y3MgKmVuZ2luZTsKKwlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcXVlc3Q7CiAJZW51 bSBpbnRlbF9lbmdpbmVfaWQgaWQ7CiAJaW50IGVyciA9IDA7CiAKLQlmb3JfZWFjaF9lbmdpbmUo ZW5naW5lLCBkZXZfcHJpdiwgaWQpCi0JCWVyciA9IGk5MTVfZ2VtX3Jlc2V0X3ByZXBhcmVfZW5n aW5lKGVuZ2luZSk7CisJZm9yX2VhY2hfZW5naW5lKGVuZ2luZSwgZGV2X3ByaXYsIGlkKSB7CisJ CXJlcXVlc3QgPSBpOTE1X2dlbV9yZXNldF9wcmVwYXJlX2VuZ2luZShlbmdpbmUpOworCQlpZiAo SVNfRVJSKHJlcXVlc3QpKSB7CisJCQllcnIgPSBQVFJfRVJSKHJlcXVlc3QpOworCQkJYnJlYWs7 CisJCX0KKworCQllbmdpbmUtPmhhbmdjaGVjay5hY3RpdmVfcmVxdWVzdCA9IHJlcXVlc3Q7CisJ fQogCiAJaTkxNV9nZW1fcmV2b2tlX2ZlbmNlcyhkZXZfcHJpdik7CiAKQEAgLTI4OTQsNyArMjkw NSw3IEBAIHN0YXRpYyB2b2lkIGVuZ2luZV9za2lwX2NvbnRleHQoc3RydWN0IGRybV9pOTE1X2dl bV9yZXF1ZXN0ICpyZXF1ZXN0KQogc3RhdGljIGJvb2wgaTkxNV9nZW1fcmVzZXRfcmVxdWVzdChz dHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcXVlc3QpCiB7CiAJLyogUmVhZCBvbmNlIGFu ZCByZXR1cm4gdGhlIHJlc29sdXRpb24gKi8KLQljb25zdCBib29sIGd1aWx0eSA9IGVuZ2luZV9z dGFsbGVkKHJlcXVlc3QtPmVuZ2luZSk7CisJY29uc3QgYm9vbCBndWlsdHkgPSAhaTkxNV9nZW1f cmVxdWVzdF9jb21wbGV0ZWQocmVxdWVzdCk7CiAKIAkvKiBUaGUgZ3VpbHR5IHJlcXVlc3Qgd2ls bCBnZXQgc2tpcHBlZCBvbiBhIGh1bmcgZW5naW5lLgogCSAqCkBAIC0yOTMwLDkgKzI5NDEsOCBA QCBzdGF0aWMgYm9vbCBpOTE1X2dlbV9yZXNldF9yZXF1ZXN0KHN0cnVjdCBkcm1faTkxNV9nZW1f cmVxdWVzdCAqcmVxdWVzdCkKIAogdm9pZCBpOTE1X2dlbV9yZXNldF9lbmdpbmUoc3RydWN0IGlu dGVsX2VuZ2luZV9jcyAqZW5naW5lKQogewotCXN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAq cmVxdWVzdDsKKwlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcXVlc3QgPSBlbmdpbmUt PmhhbmdjaGVjay5hY3RpdmVfcmVxdWVzdDsKIAotCXJlcXVlc3QgPSBpOTE1X2dlbV9maW5kX2Fj dGl2ZV9yZXF1ZXN0KGVuZ2luZSk7CiAJaWYgKHJlcXVlc3QgJiYgaTkxNV9nZW1fcmVzZXRfcmVx dWVzdChyZXF1ZXN0KSkgewogCQlEUk1fREVCVUdfRFJJVkVSKCJyZXNldHRpbmcgJXMgdG8gcmVz dGFydCBmcm9tIHRhaWwgb2YgcmVxdWVzdCAweCV4XG4iLAogCQkJCSBlbmdpbmUtPm5hbWUsIHJl cXVlc3QtPmdsb2JhbF9zZXFubyk7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9yaW5nYnVmZmVyLmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVy LmgKaW5kZXggZWMxNmZiNmZkZTYyLi5mODUwYzRiMTIzMzcgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9yaW5nYnVmZmVyLmgKQEAgLTEyMSw2ICsxMjEsNyBAQCBzdHJ1Y3QgaW50ZWxfZW5n aW5lX2hhbmdjaGVjayB7CiAJdW5zaWduZWQgbG9uZyBhY3Rpb25fdGltZXN0YW1wOwogCWludCBk ZWFkbG9jazsKIAlzdHJ1Y3QgaW50ZWxfaW5zdGRvbmUgaW5zdGRvbmU7CisJc3RydWN0IGRybV9p OTE1X2dlbV9yZXF1ZXN0ICphY3RpdmVfcmVxdWVzdDsKIAlib29sIHN0YWxsZWQ7CiB9OwogCi0t IAoyLjExLjAKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f CkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpo dHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=