From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michel Thierry Subject: [PATCH] drm/i915: Cancel reset-engine if we couldn't find an active request Date: Wed, 17 May 2017 13:41:34 -0700 Message-ID: <20170517204134.25388-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 mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTPS id D0A286E0D6 for ; Wed, 17 May 2017 20:41:35 +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 QmVmb3JlIHJlc2V0aW5nIGFuIGVuZ2luZSwgY2hlY2sgaWYgdGhlcmUgaXMgYW4gYWN0aXZlIHJl cXVlc3QsIGFuZCBpZgp0aGUgX2h1bmdfIHJlcXVlc3QgaGFzIGNvbXBsZXRlZC4gSW4gdGhlc2Ug dHdvIGNhc2VzLCB0aGUgc2Vxbm8gaGFzIG1vdmVkCmFmdGVyIGhhbmcgZGVjbGFyYXRpb24gYW5k IHdlIGNhbiBza2lwIHRoZSByZXNldC4KCkFsc28gc3RvcmUgdGhlIGFjdGl2ZSByZXF1ZXN0IHNv IHRoYXQgd2Ugb25seSBzZWFyY2ggZm9yIGl0IG9uY2UsIHRoaXMKYXBwbGllcyBmb3IgcmVzZXQt ZW5naW5lIGFuZCBmdWxsIHJlc2V0LgoKdjI6IENoZWNrIGZvciByZXF1ZXN0IGNvbXBsZXRpb24g aW5zaWRlIF9wcmVwYXJlX2VuZ2luZSwgZG9uJ3QgdXNlCkVDQU5DRUxFRCwgcmVtb3ZlIHVubmVj ZXNzYXJ5IG51bGwgY2hlY2tzIChDaHJpcykuCgp2MzogQ2FwdHVyZSBhY3RpdmUgcmVxdWVzdHMg ZHVyaW5nIHJlc2V0X3ByZXBhcmUgYW5kIHN0b3JlIGl0IHRoZQplbmdpbmUgaGFuZ2NoZWNrIG9i aiAoQ2hyaXMpLgoKU3VnZ2VzdGVkLWJ5OiBDaHJpcyBXaWxzb24gPGNocmlzQGNocmlzLXdpbHNv bi5jby51az4KU2lnbmVkLW9mZi1ieTogTWljaGVsIFRoaWVycnkgPG1pY2hlbC50aGllcnJ5QGlu dGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5jICAgICAgICAgfCAx OCArKysrKysrKysrLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCAgICAgICAg IHwgIDMgKystCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jICAgICAgICAgfCA0MiAr KysrKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX3JpbmdidWZmZXIuaCB8ICAxICsKIDQgZmlsZXMgY2hhbmdlZCwgNDYgaW5zZXJ0aW9ucygr KSwgMTggZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx NV9kcnYuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMKaW5kZXggZDYyNzkzODA1 Nzk0Li43NzE4NTcyNTgyOTIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf ZHJ2LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYwpAQCAtMTkwMCwxNSAr MTkwMCwxOSBAQCBpbnQgaTkxNV9yZXNldF9lbmdpbmUoc3RydWN0IGludGVsX2VuZ2luZV9jcyAq ZW5naW5lKQogCiAJRFJNX0RFQlVHX0RSSVZFUigicmVzZXR0aW5nICVzXG4iLCBlbmdpbmUtPm5h bWUpOwogCi0JcmV0ID0gaTkxNV9nZW1fcmVzZXRfcHJlcGFyZV9lbmdpbmUoZW5naW5lKTsKLQlp ZiAocmV0KSB7Ci0JCURSTV9FUlJPUigiUHJldmlvdXMgcmVzZXQgZmFpbGVkIC0gcHJvbW90ZSB0 byBmdWxsIHJlc2V0XG4iKTsKKwllbmdpbmUtPmhhbmdjaGVjay5hY3RpdmVfcmVxdWVzdCA9IGk5 MTVfZ2VtX3Jlc2V0X3ByZXBhcmVfZW5naW5lKGVuZ2luZSk7CisJaWYgKCFlbmdpbmUtPmhhbmdj aGVjay5hY3RpdmVfcmVxdWVzdCkgeworCQlEUk1fREVCVUdfRFJJVkVSKCJzZXFubyBtb3ZlZCBh ZnRlciBoYW5nIGRlY2xhcmF0aW9uLCBwYXJkb25lZFxuIik7CisJCWdvdG8gY2FuY2VsZWQ7CisJ fSBlbHNlIGlmIChJU19FUlIoZW5naW5lLT5oYW5nY2hlY2suYWN0aXZlX3JlcXVlc3QpKSB7CisJ CURSTV9ERUJVR19EUklWRVIoIlByZXZpb3VzIHJlc2V0IGZhaWxlZCwgcHJvbW90ZSB0byBmdWxs IHJlc2V0XG4iKTsKKwkJcmV0ID0gUFRSX0VSUihlbmdpbmUtPmhhbmdjaGVjay5hY3RpdmVfcmVx dWVzdCk7CiAJCWdvdG8gb3V0OwogCX0KIAogCS8qCi0JICogdGhlIHJlcXVlc3QgdGhhdCBjYXVz ZWQgdGhlIGhhbmcgaXMgc3R1Y2sgb24gZWxzcCwgaWRlbnRpZnkgdGhlCi0JICogYWN0aXZlIHJl cXVlc3QgYW5kIGRyb3AgaXQsIGFkanVzdCBoZWFkIHRvIHNraXAgdGhlIG9mZmVuZGluZworCSAq IHRoZSByZXF1ZXN0IHRoYXQgY2F1c2VkIHRoZSBoYW5nIGlzIHN0dWNrIG9uIGVsc3AsIHdlIGtu b3cgdGhlCisJICogYWN0aXZlIHJlcXVlc3QgYW5kIGNhbiBkcm9wIGl0LCBhZGp1c3QgaGVhZCB0 byBza2lwIHRoZSBvZmZlbmRpbmcKIAkgKiByZXF1ZXN0IHRvIHJlc3VtZSBleGVjdXRpbmcgcmVt YWluaW5nIHJlcXVlc3RzIGluIHRoZSBxdWV1ZS4KIAkgKi8KIAlpOTE1X2dlbV9yZXNldF9lbmdp bmUoZW5naW5lKTsKQEAgLTE5NDIsNiArMTk0NiwxMCBAQCBpbnQgaTkxNV9yZXNldF9lbmdpbmUo c3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKQogCiBvdXQ6CiAJcmV0dXJuIHJldDsKKwor Y2FuY2VsZWQ6CisJaTkxNV9nZW1fcmVzZXRfZmluaXNoX2VuZ2luZShlbmdpbmUpOworCXJldHVy biAwOwogfQogCiBzdGF0aWMgaW50IGk5MTVfcG1fc3VzcGVuZChzdHJ1Y3QgZGV2aWNlICprZGV2 KQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKaW5kZXggYTViOWM2NjZiM2JmLi42Y2JmZWFhMDIyNDYg MTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKKysrIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaApAQCAtMzM3MCw3ICszMzcwLDggQEAgc3RhdGljIGlu bGluZSB1MzIgaTkxNV9yZXNldF9jb3VudChzdHJ1Y3QgaTkxNV9ncHVfZXJyb3IgKmVycm9yKQog CXJldHVybiBSRUFEX09OQ0UoZXJyb3ItPnJlc2V0X2NvdW50KTsKIH0KIAotaW50IGk5MTVfZ2Vt X3Jlc2V0X3ByZXBhcmVfZW5naW5lKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSk7Citz dHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKgoraTkxNV9nZW1fcmVzZXRfcHJlcGFyZV9lbmdp bmUoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKTsKIGludCBpOTE1X2dlbV9yZXNldF9w cmVwYXJlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdik7CiB2b2lkIGk5MTVfZ2Vt X3Jlc2V0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdik7CiB2b2lkIGk5MTVfZ2Vt X3Jlc2V0X2ZpbmlzaF9lbmdpbmUoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKTsKZGlm ZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2dlbS5jCmluZGV4IGI1ZGMwNzNhNWRkYy4uNWVjNDU0ZGFmYjlmIDEwMDY0 NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCisrKyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZ2VtLmMKQEAgLTI3OTMsMTIgKzI3OTMsMTQgQEAgc3RhdGljIGJvb2wg ZW5naW5lX3N0YWxsZWQoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKQogCXJldHVybiB0 cnVlOwogfQogCi0vKiBFbnN1cmUgaXJxIGhhbmRsZXIgZmluaXNoZXMsIGFuZCBub3QgcnVuIGFn YWluLiAqLwotaW50IGk5MTVfZ2VtX3Jlc2V0X3ByZXBhcmVfZW5naW5lKHN0cnVjdCBpbnRlbF9l bmdpbmVfY3MgKmVuZ2luZSkKKy8qCisgKiBFbnN1cmUgaXJxIGhhbmRsZXIgZmluaXNoZXMsIGFu ZCBub3QgcnVuIGFnYWluLgorICogQWxzbyBzdG9yZSB0aGUgYWN0aXZlIHJlcXVlc3Qgc28gdGhh dCB3ZSBvbmx5IHNlYXJjaCBmb3IgaXQgb25jZS4KKyAqLworc3RydWN0IGRybV9pOTE1X2dlbV9y ZXF1ZXN0ICoKK2k5MTVfZ2VtX3Jlc2V0X3ByZXBhcmVfZW5naW5lKHN0cnVjdCBpbnRlbF9lbmdp bmVfY3MgKmVuZ2luZSkKIHsKLQlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcXVlc3Q7 Ci0JaW50IGVyciA9IDA7Ci0KKwlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcXVlc3Qg PSBOVUxMOwogCiAJLyogUHJldmVudCB0aGUgc2lnbmFsZXIgdGhyZWFkIGZyb20gdXBkYXRpbmcg dGhlIHJlcXVlc3QKIAkgKiBzdGF0ZSAoYnkgY2FsbGluZyBkbWFfZmVuY2Vfc2lnbmFsKSBhcyB3 ZSBhcmUgcHJvY2Vzc2luZwpAQCAtMjgyNywyMSArMjgyOSwzNSBAQCBpbnQgaTkxNV9nZW1fcmVz ZXRfcHJlcGFyZV9lbmdpbmUoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKQogCiAJaWYg KGVuZ2luZV9zdGFsbGVkKGVuZ2luZSkpIHsKIAkJcmVxdWVzdCA9IGk5MTVfZ2VtX2ZpbmRfYWN0 aXZlX3JlcXVlc3QoZW5naW5lKTsKLQkJaWYgKHJlcXVlc3QgJiYgcmVxdWVzdC0+ZmVuY2UuZXJy b3IgPT0gLUVJTykKLQkJCWVyciA9IC1FSU87IC8qIFByZXZpb3VzIHJlc2V0IGZhaWxlZCEgKi8K KworCQlpZiAocmVxdWVzdCkgeworCQkJaWYgKHJlcXVlc3QtPmZlbmNlLmVycm9yID09IC1FSU8p CisJCQkJcmV0dXJuIEVSUl9QVFIoLUVJTyk7IC8qIFByZXZpb3VzIHJlc2V0IGZhaWxlZCEgKi8K KworCQkJaWYgKGk5MTVfZ2VtX3JlcXVlc3RfY29tcGxldGVkKHJlcXVlc3QpKQorCQkJCXJldHVy biBOVUxMOyAvKiByZXF1ZXN0IGNvbXBsZXRlZCwgc2tpcCBpdCAqLworCQl9CiAJfQogCi0JcmV0 dXJuIGVycjsKKwlyZXR1cm4gcmVxdWVzdDsKIH0KIAogaW50IGk5MTVfZ2VtX3Jlc2V0X3ByZXBh cmUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogewogCXN0cnVjdCBpbnRlbF9l bmdpbmVfY3MgKmVuZ2luZTsKKwlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcXVlc3Q7 CiAJZW51bSBpbnRlbF9lbmdpbmVfaWQgaWQ7CiAJaW50IGVyciA9IDA7CiAKLQlmb3JfZWFjaF9l bmdpbmUoZW5naW5lLCBkZXZfcHJpdiwgaWQpCi0JCWVyciA9IGk5MTVfZ2VtX3Jlc2V0X3ByZXBh cmVfZW5naW5lKGVuZ2luZSk7CisJZm9yX2VhY2hfZW5naW5lKGVuZ2luZSwgZGV2X3ByaXYsIGlk KSB7CisJCXJlcXVlc3QgPSBpOTE1X2dlbV9yZXNldF9wcmVwYXJlX2VuZ2luZShlbmdpbmUpOwor CQlpZiAoSVNfRVJSKHJlcXVlc3QpKSB7CisJCQllcnIgPSBQVFJfRVJSKHJlcXVlc3QpOworCQkJ YnJlYWs7CisJCX0KKworCQllbmdpbmUtPmhhbmdjaGVjay5hY3RpdmVfcmVxdWVzdCA9IHJlcXVl c3Q7CisJfQogCiAJaTkxNV9nZW1fcmV2b2tlX2ZlbmNlcyhkZXZfcHJpdik7CiAKQEAgLTI5MzAs OSArMjk0NiwxMSBAQCBzdGF0aWMgYm9vbCBpOTE1X2dlbV9yZXNldF9yZXF1ZXN0KHN0cnVjdCBk cm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxdWVzdCkKIAogdm9pZCBpOTE1X2dlbV9yZXNldF9lbmdp bmUoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKQogewotCXN0cnVjdCBkcm1faTkxNV9n ZW1fcmVxdWVzdCAqcmVxdWVzdDsKKwlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcXVl c3QgPSBlbmdpbmUtPmhhbmdjaGVjay5hY3RpdmVfcmVxdWVzdDsKKworCWlmICghcmVxdWVzdCkK KwkJcmVxdWVzdCA9IGk5MTVfZ2VtX2ZpbmRfYWN0aXZlX3JlcXVlc3QoZW5naW5lKTsKIAotCXJl cXVlc3QgPSBpOTE1X2dlbV9maW5kX2FjdGl2ZV9yZXF1ZXN0KGVuZ2luZSk7CiAJaWYgKHJlcXVl c3QgJiYgaTkxNV9nZW1fcmVzZXRfcmVxdWVzdChyZXF1ZXN0KSkgewogCQlEUk1fREVCVUdfRFJJ VkVSKCJyZXNldHRpbmcgJXMgdG8gcmVzdGFydCBmcm9tIHRhaWwgb2YgcmVxdWVzdCAweCV4XG4i LAogCQkJCSBlbmdpbmUtPm5hbWUsIHJlcXVlc3QtPmdsb2JhbF9zZXFubyk7CmRpZmYgLS1naXQg YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmggYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmgKaW5kZXggZWMxNmZiNmZkZTYyLi5mODUwYzRiMTIz MzcgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuaAor KysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmgKQEAgLTEyMSw2ICsx MjEsNyBAQCBzdHJ1Y3QgaW50ZWxfZW5naW5lX2hhbmdjaGVjayB7CiAJdW5zaWduZWQgbG9uZyBh Y3Rpb25fdGltZXN0YW1wOwogCWludCBkZWFkbG9jazsKIAlzdHJ1Y3QgaW50ZWxfaW5zdGRvbmUg aW5zdGRvbmU7CisJc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICphY3RpdmVfcmVxdWVzdDsK IAlib29sIHN0YWxsZWQ7CiB9OwogCi0tIAoyLjExLjAKCl9fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4 QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWls bWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=