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 14:11:15 -0700 Message-ID: <20170518211115.23262-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 mga04.intel.com (mga04.intel.com [192.55.52.120]) by gabe.freedesktop.org (Postfix) with ESMTPS id CDEC46E188 for ; Thu, 18 May 2017 21:11:16 +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 cykuCgp2NTogV2l0aCBzdHlsZTsgcGFzcyB0aGUgYWN0aXZlIHJlcXVlc3QgdG8gZ2VtX3Jlc2V0 X2VuZ2luZSwga2VlcCBzaW5nbGUKcmV0dXJuIGluIHJlc2V0X3ByZXBhcmVfZW5naW5lIChDaHJp cykuCgpTdWdnZXN0ZWQtYnk6IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hyaXMtd2lsc29uLmNvLnVr PgpTaWduZWQtb2ZmLWJ5OiBNaWNoZWwgVGhpZXJyeSA8bWljaGVsLnRoaWVycnlAaW50ZWwuY29t PgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMgICAgICAgICB8IDE0ICsrKysr Ky0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCAgICAgICAgIHwgIDYgKysr Ky0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jICAgICAgICAgfCAzOCArKysrKysr KysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Jp bmdidWZmZXIuaCB8ICAxICsKIDQgZmlsZXMgY2hhbmdlZCwgMzYgaW5zZXJ0aW9ucygrKSwgMjMg ZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYu YyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMKaW5kZXggZDYyNzkzODA1Nzk0Li4y YmEyODhlOTMxMWMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMK KysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYwpAQCAtMTg5NSwyMyArMTg5NSwy NSBAQCBpbnQgaTkxNV9yZXNldF9lbmdpbmUoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5l KQogCWludCByZXQ7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZW5naW5l LT5pOTE1OwogCXN0cnVjdCBpOTE1X2dwdV9lcnJvciAqZXJyb3IgPSAmZGV2X3ByaXYtPmdwdV9l cnJvcjsKKwlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKmFjdGl2ZV9yZXF1ZXN0OwogCiAJ R0VNX0JVR19PTighdGVzdF9iaXQoSTkxNV9SRVNFVF9FTkdJTkVfSU5fUFJPR1JFU1MsICZlcnJv ci0+ZmxhZ3MpKTsKIAogCURSTV9ERUJVR19EUklWRVIoInJlc2V0dGluZyAlc1xuIiwgZW5naW5l LT5uYW1lKTsKIAotCXJldCA9IGk5MTVfZ2VtX3Jlc2V0X3ByZXBhcmVfZW5naW5lKGVuZ2luZSk7 Ci0JaWYgKHJldCkgewotCQlEUk1fRVJST1IoIlByZXZpb3VzIHJlc2V0IGZhaWxlZCAtIHByb21v dGUgdG8gZnVsbCByZXNldFxuIik7CisJYWN0aXZlX3JlcXVlc3QgPSBpOTE1X2dlbV9yZXNldF9w cmVwYXJlX2VuZ2luZShlbmdpbmUpOworCWlmIChJU19FUlIoYWN0aXZlX3JlcXVlc3QpKSB7CisJ CURSTV9ERUJVR19EUklWRVIoIlByZXZpb3VzIHJlc2V0IGZhaWxlZCwgcHJvbW90ZSB0byBmdWxs IHJlc2V0XG4iKTsKKwkJcmV0ID0gUFRSX0VSUihhY3RpdmVfcmVxdWVzdCk7CiAJCWdvdG8gb3V0 OwogCX0KIAogCS8qCi0JICogdGhlIHJlcXVlc3QgdGhhdCBjYXVzZWQgdGhlIGhhbmcgaXMgc3R1 Y2sgb24gZWxzcCwgaWRlbnRpZnkgdGhlCi0JICogYWN0aXZlIHJlcXVlc3QgYW5kIGRyb3AgaXQs IGFkanVzdCBoZWFkIHRvIHNraXAgdGhlIG9mZmVuZGluZworCSAqIHRoZSByZXF1ZXN0IHRoYXQg Y2F1c2VkIHRoZSBoYW5nIGlzIHN0dWNrIG9uIGVsc3AsIHdlIGtub3cgdGhlCisJICogYWN0aXZl IHJlcXVlc3QgYW5kIGNhbiBkcm9wIGl0LCBhZGp1c3QgaGVhZCB0byBza2lwIHRoZSBvZmZlbmRp bmcKIAkgKiByZXF1ZXN0IHRvIHJlc3VtZSBleGVjdXRpbmcgcmVtYWluaW5nIHJlcXVlc3RzIGlu IHRoZSBxdWV1ZS4KIAkgKi8KLQlpOTE1X2dlbV9yZXNldF9lbmdpbmUoZW5naW5lKTsKKwlpOTE1 X2dlbV9yZXNldF9lbmdpbmUoZW5naW5lLCBhY3RpdmVfcmVxdWVzdCk7CiAKIAkvKiBmb3JjaW5n IGVuZ2luZSB0byBpZGxlICovCiAJcmV0ID0gaW50ZWxfcmVzZXRfZW5naW5lX3N0YXJ0KGVuZ2lu ZSk7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAppbmRleCBhNWI5YzY2NmIzYmYuLmY4Y2JkMjg2Zjkw NCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAorKysgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCkBAIC0zMzcwLDE0ICszMzcwLDE2IEBAIHN0YXRp YyBpbmxpbmUgdTMyIGk5MTVfcmVzZXRfY291bnQoc3RydWN0IGk5MTVfZ3B1X2Vycm9yICplcnJv cikKIAlyZXR1cm4gUkVBRF9PTkNFKGVycm9yLT5yZXNldF9jb3VudCk7CiB9CiAKLWludCBpOTE1 X2dlbV9yZXNldF9wcmVwYXJlX2VuZ2luZShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUp Oworc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICoKK2k5MTVfZ2VtX3Jlc2V0X3ByZXBhcmVf ZW5naW5lKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSk7CiBpbnQgaTkxNV9nZW1fcmVz ZXRfcHJlcGFyZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpOwogdm9pZCBpOTE1 X2dlbV9yZXNldChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpOwogdm9pZCBpOTE1 X2dlbV9yZXNldF9maW5pc2hfZW5naW5lKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSk7 CiB2b2lkIGk5MTVfZ2VtX3Jlc2V0X2ZpbmlzaChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2 X3ByaXYpOwogdm9pZCBpOTE1X2dlbV9zZXRfd2VkZ2VkKHN0cnVjdCBkcm1faTkxNV9wcml2YXRl ICpkZXZfcHJpdik7CiBib29sIGk5MTVfZ2VtX3Vuc2V0X3dlZGdlZChzdHJ1Y3QgZHJtX2k5MTVf cHJpdmF0ZSAqZGV2X3ByaXYpOwotdm9pZCBpOTE1X2dlbV9yZXNldF9lbmdpbmUoc3RydWN0IGlu dGVsX2VuZ2luZV9jcyAqZW5naW5lKTsKK3ZvaWQgaTkxNV9nZW1fcmVzZXRfZW5naW5lKHN0cnVj dCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSwKKwkJCSAgIHN0cnVjdCBkcm1faTkxNV9nZW1fcmVx dWVzdCAqcmVxdWVzdCk7CiAKIHZvaWQgaTkxNV9nZW1faW5pdF9tbWlvKHN0cnVjdCBkcm1faTkx NV9wcml2YXRlICppOTE1KTsKIGludCBfX211c3RfY2hlY2sgaTkxNV9nZW1faW5pdChzdHJ1Y3Qg ZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9nZW0uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKaW5kZXgg YjVkYzA3M2E1ZGRjLi42ZTE0YmYwMzlhZWQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfZ2VtLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYwpAQCAt Mjc5MywxMiArMjc5MywxNCBAQCBzdGF0aWMgYm9vbCBlbmdpbmVfc3RhbGxlZChzdHJ1Y3QgaW50 ZWxfZW5naW5lX2NzICplbmdpbmUpCiAJcmV0dXJuIHRydWU7CiB9CiAKLS8qIEVuc3VyZSBpcnEg aGFuZGxlciBmaW5pc2hlcywgYW5kIG5vdCBydW4gYWdhaW4uICovCi1pbnQgaTkxNV9nZW1fcmVz ZXRfcHJlcGFyZV9lbmdpbmUoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKQorLyoKKyAq IEVuc3VyZSBpcnEgaGFuZGxlciBmaW5pc2hlcywgYW5kIG5vdCBydW4gYWdhaW4uCisgKiBBbHNv IHN0b3JlIHRoZSBhY3RpdmUgcmVxdWVzdCBzbyB0aGF0IHdlIG9ubHkgc2VhcmNoIGZvciBpdCBv bmNlLgorICovCitzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKgoraTkxNV9nZW1fcmVzZXRf cHJlcGFyZV9lbmdpbmUoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKQogewotCXN0cnVj dCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxdWVzdDsKLQlpbnQgZXJyID0gMDsKLQorCXN0cnVj dCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxdWVzdCA9IE5VTEw7CiAKIAkvKiBQcmV2ZW50IHRo ZSBzaWduYWxlciB0aHJlYWQgZnJvbSB1cGRhdGluZyB0aGUgcmVxdWVzdAogCSAqIHN0YXRlIChi eSBjYWxsaW5nIGRtYV9mZW5jZV9zaWduYWwpIGFzIHdlIGFyZSBwcm9jZXNzaW5nCkBAIC0yODI4 LDIwICsyODMwLDI4IEBAIGludCBpOTE1X2dlbV9yZXNldF9wcmVwYXJlX2VuZ2luZShzdHJ1Y3Qg aW50ZWxfZW5naW5lX2NzICplbmdpbmUpCiAJaWYgKGVuZ2luZV9zdGFsbGVkKGVuZ2luZSkpIHsK IAkJcmVxdWVzdCA9IGk5MTVfZ2VtX2ZpbmRfYWN0aXZlX3JlcXVlc3QoZW5naW5lKTsKIAkJaWYg KHJlcXVlc3QgJiYgcmVxdWVzdC0+ZmVuY2UuZXJyb3IgPT0gLUVJTykKLQkJCWVyciA9IC1FSU87 IC8qIFByZXZpb3VzIHJlc2V0IGZhaWxlZCEgKi8KKwkJCXJlcXVlc3QgPSBFUlJfUFRSKC1FSU8p OyAvKiBQcmV2aW91cyByZXNldCBmYWlsZWQhICovCiAJfQogCi0JcmV0dXJuIGVycjsKKwlyZXR1 cm4gcmVxdWVzdDsKIH0KIAogaW50IGk5MTVfZ2VtX3Jlc2V0X3ByZXBhcmUoc3RydWN0IGRybV9p OTE1X3ByaXZhdGUgKmRldl9wcml2KQogewogCXN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2lu ZTsKKwlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcXVlc3Q7CiAJZW51bSBpbnRlbF9l bmdpbmVfaWQgaWQ7CiAJaW50IGVyciA9IDA7CiAKLQlmb3JfZWFjaF9lbmdpbmUoZW5naW5lLCBk ZXZfcHJpdiwgaWQpCi0JCWVyciA9IGk5MTVfZ2VtX3Jlc2V0X3ByZXBhcmVfZW5naW5lKGVuZ2lu ZSk7CisJZm9yX2VhY2hfZW5naW5lKGVuZ2luZSwgZGV2X3ByaXYsIGlkKSB7CisJCXJlcXVlc3Qg PSBpOTE1X2dlbV9yZXNldF9wcmVwYXJlX2VuZ2luZShlbmdpbmUpOworCQlpZiAoSVNfRVJSKHJl cXVlc3QpKSB7CisJCQllcnIgPSBQVFJfRVJSKHJlcXVlc3QpOworCQkJYnJlYWs7CisJCX0KKwor CQllbmdpbmUtPmhhbmdjaGVjay5hY3RpdmVfcmVxdWVzdCA9IHJlcXVlc3Q7CisJfQogCiAJaTkx NV9nZW1fcmV2b2tlX2ZlbmNlcyhkZXZfcHJpdik7CiAKQEAgLTI4OTQsNyArMjkwNCw3IEBAIHN0 YXRpYyB2b2lkIGVuZ2luZV9za2lwX2NvbnRleHQoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0 ICpyZXF1ZXN0KQogc3RhdGljIGJvb2wgaTkxNV9nZW1fcmVzZXRfcmVxdWVzdChzdHJ1Y3QgZHJt X2k5MTVfZ2VtX3JlcXVlc3QgKnJlcXVlc3QpCiB7CiAJLyogUmVhZCBvbmNlIGFuZCByZXR1cm4g dGhlIHJlc29sdXRpb24gKi8KLQljb25zdCBib29sIGd1aWx0eSA9IGVuZ2luZV9zdGFsbGVkKHJl cXVlc3QtPmVuZ2luZSk7CisJY29uc3QgYm9vbCBndWlsdHkgPSAhaTkxNV9nZW1fcmVxdWVzdF9j b21wbGV0ZWQocmVxdWVzdCk7CiAKIAkvKiBUaGUgZ3VpbHR5IHJlcXVlc3Qgd2lsbCBnZXQgc2tp cHBlZCBvbiBhIGh1bmcgZW5naW5lLgogCSAqCkBAIC0yOTI4LDExICsyOTM4LDkgQEAgc3RhdGlj IGJvb2wgaTkxNV9nZW1fcmVzZXRfcmVxdWVzdChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3Qg KnJlcXVlc3QpCiAJcmV0dXJuIGd1aWx0eTsKIH0KIAotdm9pZCBpOTE1X2dlbV9yZXNldF9lbmdp bmUoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKQordm9pZCBpOTE1X2dlbV9yZXNldF9l bmdpbmUoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lLAorCQkJICAgc3RydWN0IGRybV9p OTE1X2dlbV9yZXF1ZXN0ICpyZXF1ZXN0KQogewotCXN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVz dCAqcmVxdWVzdDsKLQotCXJlcXVlc3QgPSBpOTE1X2dlbV9maW5kX2FjdGl2ZV9yZXF1ZXN0KGVu Z2luZSk7CiAJaWYgKHJlcXVlc3QgJiYgaTkxNV9nZW1fcmVzZXRfcmVxdWVzdChyZXF1ZXN0KSkg ewogCQlEUk1fREVCVUdfRFJJVkVSKCJyZXNldHRpbmcgJXMgdG8gcmVzdGFydCBmcm9tIHRhaWwg b2YgcmVxdWVzdCAweCV4XG4iLAogCQkJCSBlbmdpbmUtPm5hbWUsIHJlcXVlc3QtPmdsb2JhbF9z ZXFubyk7CkBAIC0yOTU4LDcgKzI5NjYsNyBAQCB2b2lkIGk5MTVfZ2VtX3Jlc2V0KHN0cnVjdCBk cm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAlmb3JfZWFjaF9lbmdpbmUoZW5naW5lLCBkZXZf cHJpdiwgaWQpIHsKIAkJc3RydWN0IGk5MTVfZ2VtX2NvbnRleHQgKmN0eDsKIAotCQlpOTE1X2dl bV9yZXNldF9lbmdpbmUoZW5naW5lKTsKKwkJaTkxNV9nZW1fcmVzZXRfZW5naW5lKGVuZ2luZSwg ZW5naW5lLT5oYW5nY2hlY2suYWN0aXZlX3JlcXVlc3QpOwogCQljdHggPSBmZXRjaF9hbmRfemVy bygmZW5naW5lLT5sYXN0X3JldGlyZWRfY29udGV4dCk7CiAJCWlmIChjdHgpCiAJCQllbmdpbmUt PmNvbnRleHRfdW5waW4oZW5naW5lLCBjdHgpOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmlu Z2J1ZmZlci5oCmluZGV4IGVjMTZmYjZmZGU2Mi4uZjg1MGM0YjEyMzM3IDEwMDY0NAotLS0gYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmgKKysrIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5oCkBAIC0xMjEsNiArMTIxLDcgQEAgc3RydWN0IGlu dGVsX2VuZ2luZV9oYW5nY2hlY2sgewogCXVuc2lnbmVkIGxvbmcgYWN0aW9uX3RpbWVzdGFtcDsK IAlpbnQgZGVhZGxvY2s7CiAJc3RydWN0IGludGVsX2luc3Rkb25lIGluc3Rkb25lOworCXN0cnVj dCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqYWN0aXZlX3JlcXVlc3Q7CiAJYm9vbCBzdGFsbGVkOwog fTsKIAotLSAKMi4xMS4wCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3Rv cC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRl bC1nZngK