From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michel Thierry Subject: [PATCH 05/20] drm/i915: Cancel reset-engine if we couldn't find an active request Date: Mon, 15 May 2017 14:20:01 -0700 Message-ID: <20170515212001.16418-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 mga07.intel.com (mga07.intel.com [134.134.136.100]) by gabe.freedesktop.org (Postfix) with ESMTPS id A451589F2D for ; Mon, 15 May 2017 21:20:01 +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 IHRoYXQgd2Ugb25seSBzZWFyY2ggZm9yIGl0IG9uY2UuCgp2MjogQ2hlY2sgZm9yIHJlcXVlc3Qg Y29tcGxldGlvbiBpbnNpZGUgX3ByZXBhcmVfZW5naW5lLCBkb24ndCB1c2UKRUNBTkNFTEVELCBy ZW1vdmUgdW5uZWNlc3NhcnkgbnVsbCBjaGVja3MgKENocmlzKS4KClN1Z2dlc3RlZC1ieTogQ2hy aXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+ClNpZ25lZC1vZmYtYnk6IE1pY2hl bCBUaGllcnJ5IDxtaWNoZWwudGhpZXJyeUBpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9kcnYuYyB8IDIxICsrKysrKysrKysrKystLS0tLS0KIGRyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZHJ2LmggfCAgNiArKysrLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf Z2VtLmMgfCA0NSArKysrKysrKysrKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLQogMyBm aWxlcyBjaGFuZ2VkLCA1MCBpbnNlcnRpb25zKCspLCAyMiBkZWxldGlvbnMoLSkKCmRpZmYgLS1n aXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5jIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9kcnYuYwppbmRleCBkNjI3OTM4MDU3OTQuLjZlZTYwYzFlMTdlZSAxMDA2NDQKLS0t IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYworKysgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2Rydi5jCkBAIC0xODk1LDIzICsxODk1LDI4IEBAIGludCBpOTE1X3Jlc2V0X2Vu Z2luZShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpCiAJaW50IHJldDsKIAlzdHJ1Y3Qg ZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBlbmdpbmUtPmk5MTU7CiAJc3RydWN0IGk5MTVf Z3B1X2Vycm9yICplcnJvciA9ICZkZXZfcHJpdi0+Z3B1X2Vycm9yOworCXN0cnVjdCBkcm1faTkx NV9nZW1fcmVxdWVzdCAqYWN0aXZlX3JlcXVlc3Q7CiAKIAlHRU1fQlVHX09OKCF0ZXN0X2JpdChJ OTE1X1JFU0VUX0VOR0lORV9JTl9QUk9HUkVTUywgJmVycm9yLT5mbGFncykpOwogCiAJRFJNX0RF QlVHX0RSSVZFUigicmVzZXR0aW5nICVzXG4iLCBlbmdpbmUtPm5hbWUpOwogCi0JcmV0ID0gaTkx NV9nZW1fcmVzZXRfcHJlcGFyZV9lbmdpbmUoZW5naW5lKTsKLQlpZiAocmV0KSB7Ci0JCURSTV9F UlJPUigiUHJldmlvdXMgcmVzZXQgZmFpbGVkIC0gcHJvbW90ZSB0byBmdWxsIHJlc2V0XG4iKTsK KwlhY3RpdmVfcmVxdWVzdCA9IGk5MTVfZ2VtX3Jlc2V0X3ByZXBhcmVfZW5naW5lKGVuZ2luZSk7 CisJaWYgKCFhY3RpdmVfcmVxdWVzdCkgeworCQlEUk1fREVCVUdfRFJJVkVSKCJzZXFubyBtb3Zl ZCBhZnRlciBoYW5nIGRlY2xhcmF0aW9uLCBwYXJkb25lZFxuIik7CisJCWdvdG8gY2FuY2VsZWQ7 CisJfSBlbHNlIGlmIChJU19FUlIoYWN0aXZlX3JlcXVlc3QpKSB7CisJCURSTV9ERUJVR19EUklW RVIoIlByZXZpb3VzIHJlc2V0IGZhaWxlZCwgcHJvbW90ZSB0byBmdWxsIHJlc2V0XG4iKTsKKwkJ cmV0ID0gUFRSX0VSUihhY3RpdmVfcmVxdWVzdCk7CiAJCWdvdG8gb3V0OwogCX0KIAogCS8qCi0J ICogdGhlIHJlcXVlc3QgdGhhdCBjYXVzZWQgdGhlIGhhbmcgaXMgc3R1Y2sgb24gZWxzcCwgaWRl bnRpZnkgdGhlCi0JICogYWN0aXZlIHJlcXVlc3QgYW5kIGRyb3AgaXQsIGFkanVzdCBoZWFkIHRv IHNraXAgdGhlIG9mZmVuZGluZworCSAqIHRoZSByZXF1ZXN0IHRoYXQgY2F1c2VkIHRoZSBoYW5n IGlzIHN0dWNrIG9uIGVsc3AsIHdlIGtub3cgdGhlCisJICogYWN0aXZlIHJlcXVlc3QgYW5kIGNh biBkcm9wIGl0LCBhZGp1c3QgaGVhZCB0byBza2lwIHRoZSBvZmZlbmRpbmcKIAkgKiByZXF1ZXN0 IHRvIHJlc3VtZSBleGVjdXRpbmcgcmVtYWluaW5nIHJlcXVlc3RzIGluIHRoZSBxdWV1ZS4KIAkg Ki8KLQlpOTE1X2dlbV9yZXNldF9lbmdpbmUoZW5naW5lKTsKKwlpOTE1X2dlbV9yZXNldF9lbmdp bmUoZW5naW5lLCBhY3RpdmVfcmVxdWVzdCk7CiAKIAkvKiBmb3JjaW5nIGVuZ2luZSB0byBpZGxl ICovCiAJcmV0ID0gaW50ZWxfcmVzZXRfZW5naW5lX3N0YXJ0KGVuZ2luZSk7CkBAIC0xOTQyLDYg KzE5NDcsMTAgQEAgaW50IGk5MTVfcmVzZXRfZW5naW5lKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3Mg KmVuZ2luZSkKIAogb3V0OgogCXJldHVybiByZXQ7CisKK2NhbmNlbGVkOgorCWk5MTVfZ2VtX3Jl c2V0X2ZpbmlzaF9lbmdpbmUoZW5naW5lKTsKKwlyZXR1cm4gMDsKIH0KIAogc3RhdGljIGludCBp OTE1X3BtX3N1c3BlbmQoc3RydWN0IGRldmljZSAqa2RldikKZGlmZiAtLWdpdCBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5o CmluZGV4IGE1YjljNjY2YjNiZi4uZjhjYmQyODZmOTA0IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2 LmgKQEAgLTMzNzAsMTQgKzMzNzAsMTYgQEAgc3RhdGljIGlubGluZSB1MzIgaTkxNV9yZXNldF9j b3VudChzdHJ1Y3QgaTkxNV9ncHVfZXJyb3IgKmVycm9yKQogCXJldHVybiBSRUFEX09OQ0UoZXJy b3ItPnJlc2V0X2NvdW50KTsKIH0KIAotaW50IGk5MTVfZ2VtX3Jlc2V0X3ByZXBhcmVfZW5naW5l KHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSk7CitzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3Jl cXVlc3QgKgoraTkxNV9nZW1fcmVzZXRfcHJlcGFyZV9lbmdpbmUoc3RydWN0IGludGVsX2VuZ2lu ZV9jcyAqZW5naW5lKTsKIGludCBpOTE1X2dlbV9yZXNldF9wcmVwYXJlKHN0cnVjdCBkcm1faTkx NV9wcml2YXRlICpkZXZfcHJpdik7CiB2b2lkIGk5MTVfZ2VtX3Jlc2V0KHN0cnVjdCBkcm1faTkx NV9wcml2YXRlICpkZXZfcHJpdik7CiB2b2lkIGk5MTVfZ2VtX3Jlc2V0X2ZpbmlzaF9lbmdpbmUo c3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKTsKIHZvaWQgaTkxNV9nZW1fcmVzZXRfZmlu aXNoKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdik7CiB2b2lkIGk5MTVfZ2VtX3Nl dF93ZWRnZWQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KTsKIGJvb2wgaTkxNV9n ZW1fdW5zZXRfd2VkZ2VkKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdik7Ci12b2lk IGk5MTVfZ2VtX3Jlc2V0X2VuZ2luZShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpOwor dm9pZCBpOTE1X2dlbV9yZXNldF9lbmdpbmUoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5l LAorCQkJICAgc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXF1ZXN0KTsKIAogdm9pZCBp OTE1X2dlbV9pbml0X21taW8oc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmk5MTUpOwogaW50IF9f bXVzdF9jaGVjayBpOTE1X2dlbV9pbml0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJp dik7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYwppbmRleCBiNWRjMDczYTVkZGMuLjJlNDc2NzgzMTVk NCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYworKysgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCkBAIC0yNzkzLDEyICsyNzkzLDE1IEBAIHN0YXRp YyBib29sIGVuZ2luZV9zdGFsbGVkKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKIAly ZXR1cm4gdHJ1ZTsKIH0KIAotLyogRW5zdXJlIGlycSBoYW5kbGVyIGZpbmlzaGVzLCBhbmQgbm90 IHJ1biBhZ2Fpbi4gKi8KLWludCBpOTE1X2dlbV9yZXNldF9wcmVwYXJlX2VuZ2luZShzdHJ1Y3Qg aW50ZWxfZW5naW5lX2NzICplbmdpbmUpCisvKgorICogRW5zdXJlIGlycSBoYW5kbGVyIGZpbmlz aGVzLCBhbmQgbm90IHJ1biBhZ2Fpbi4KKyAqIEZvciByZXNldC1lbmdpbmUgd2UgYWxzbyBzdG9y ZSB0aGUgYWN0aXZlIHJlcXVlc3Qgc28gdGhhdCB3ZSBvbmx5IHNlYXJjaAorICogZm9yIGl0IG9u Y2UuCisgKi8KK3N0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqCitpOTE1X2dlbV9yZXNldF9w cmVwYXJlX2VuZ2luZShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpCiB7Ci0Jc3RydWN0 IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXF1ZXN0OwotCWludCBlcnIgPSAwOwotCisJc3RydWN0 IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXF1ZXN0ID0gTlVMTDsKIAogCS8qIFByZXZlbnQgdGhl IHNpZ25hbGVyIHRocmVhZCBmcm9tIHVwZGF0aW5nIHRoZSByZXF1ZXN0CiAJICogc3RhdGUgKGJ5 IGNhbGxpbmcgZG1hX2ZlbmNlX3NpZ25hbCkgYXMgd2UgYXJlIHByb2Nlc3NpbmcKQEAgLTI4Mjcs MjEgKzI4MzAsMzQgQEAgaW50IGk5MTVfZ2VtX3Jlc2V0X3ByZXBhcmVfZW5naW5lKHN0cnVjdCBp bnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKIAogCWlmIChlbmdpbmVfc3RhbGxlZChlbmdpbmUpKSB7 CiAJCXJlcXVlc3QgPSBpOTE1X2dlbV9maW5kX2FjdGl2ZV9yZXF1ZXN0KGVuZ2luZSk7Ci0JCWlm IChyZXF1ZXN0ICYmIHJlcXVlc3QtPmZlbmNlLmVycm9yID09IC1FSU8pCi0JCQllcnIgPSAtRUlP OyAvKiBQcmV2aW91cyByZXNldCBmYWlsZWQhICovCisKKwkJaWYgKHJlcXVlc3QpIHsKKwkJCWlm IChyZXF1ZXN0LT5mZW5jZS5lcnJvciA9PSAtRUlPKQorCQkJCXJldHVybiBFUlJfUFRSKC1FSU8p OyAvKiBQcmV2aW91cyByZXNldCBmYWlsZWQhICovCisKKwkJCWlmIChfX2k5MTVfZ2VtX3JlcXVl c3RfY29tcGxldGVkKHJlcXVlc3QsCisJCQkJCQkJIGVuZ2luZS0+aGFuZ2NoZWNrLnNlcW5vKSkK KwkJCQlyZXR1cm4gTlVMTDsgLyogcmVxdWVzdCBjb21wbGV0ZWQsIHNraXAgcmVzZXQgKi8KKwkJ fQogCX0KIAotCXJldHVybiBlcnI7CisJcmV0dXJuIHJlcXVlc3Q7CiB9CiAKIGludCBpOTE1X2dl bV9yZXNldF9wcmVwYXJlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIHsKIAlz dHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmU7CisJc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1 ZXN0ICpyZXF1ZXN0OwogCWVudW0gaW50ZWxfZW5naW5lX2lkIGlkOwogCWludCBlcnIgPSAwOwog Ci0JZm9yX2VhY2hfZW5naW5lKGVuZ2luZSwgZGV2X3ByaXYsIGlkKQotCQllcnIgPSBpOTE1X2dl bV9yZXNldF9wcmVwYXJlX2VuZ2luZShlbmdpbmUpOworCWZvcl9lYWNoX2VuZ2luZShlbmdpbmUs IGRldl9wcml2LCBpZCkgeworCQlyZXF1ZXN0ID0gaTkxNV9nZW1fcmVzZXRfcHJlcGFyZV9lbmdp bmUoZW5naW5lKTsKKwkJaWYgKElTX0VSUihyZXF1ZXN0KSkgeworCQkJZXJyID0gUFRSX0VSUihy ZXF1ZXN0KTsKKwkJCWJyZWFrOworCQl9CisJfQogCiAJaTkxNV9nZW1fcmV2b2tlX2ZlbmNlcyhk ZXZfcHJpdik7CiAKQEAgLTI5MjgsMTEgKzI5NDQsMTIgQEAgc3RhdGljIGJvb2wgaTkxNV9nZW1f cmVzZXRfcmVxdWVzdChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcXVlc3QpCiAJcmV0 dXJuIGd1aWx0eTsKIH0KIAotdm9pZCBpOTE1X2dlbV9yZXNldF9lbmdpbmUoc3RydWN0IGludGVs X2VuZ2luZV9jcyAqZW5naW5lKQordm9pZCBpOTE1X2dlbV9yZXNldF9lbmdpbmUoc3RydWN0IGlu dGVsX2VuZ2luZV9jcyAqZW5naW5lLAorCQkJICAgc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0 ICpyZXF1ZXN0KQogewotCXN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxdWVzdDsKKwlp ZiAoIXJlcXVlc3QpCisJCXJlcXVlc3QgPSBpOTE1X2dlbV9maW5kX2FjdGl2ZV9yZXF1ZXN0KGVu Z2luZSk7CiAKLQlyZXF1ZXN0ID0gaTkxNV9nZW1fZmluZF9hY3RpdmVfcmVxdWVzdChlbmdpbmUp OwogCWlmIChyZXF1ZXN0ICYmIGk5MTVfZ2VtX3Jlc2V0X3JlcXVlc3QocmVxdWVzdCkpIHsKIAkJ RFJNX0RFQlVHX0RSSVZFUigicmVzZXR0aW5nICVzIHRvIHJlc3RhcnQgZnJvbSB0YWlsIG9mIHJl cXVlc3QgMHgleFxuIiwKIAkJCQkgZW5naW5lLT5uYW1lLCByZXF1ZXN0LT5nbG9iYWxfc2Vxbm8p OwpAQCAtMjk1OCw3ICsyOTc1LDcgQEAgdm9pZCBpOTE1X2dlbV9yZXNldChzdHJ1Y3QgZHJtX2k5 MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJZm9yX2VhY2hfZW5naW5lKGVuZ2luZSwgZGV2X3ByaXYs IGlkKSB7CiAJCXN0cnVjdCBpOTE1X2dlbV9jb250ZXh0ICpjdHg7CiAKLQkJaTkxNV9nZW1fcmVz ZXRfZW5naW5lKGVuZ2luZSk7CisJCWk5MTVfZ2VtX3Jlc2V0X2VuZ2luZShlbmdpbmUsIE5VTEwp OwogCQljdHggPSBmZXRjaF9hbmRfemVybygmZW5naW5lLT5sYXN0X3JldGlyZWRfY29udGV4dCk7 CiAJCWlmIChjdHgpCiAJCQllbmdpbmUtPmNvbnRleHRfdW5waW4oZW5naW5lLCBjdHgpOwotLSAK Mi4xMS4wCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJ bnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0 cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK