From: Mika Kuoppala Subject: [PATCH 2/2] drm/i915: Force reset on unready engine Date: Mon, 13 Aug 2018 16:01:16 +0300 Message-ID: <20180813130116.7250-1-mika.kuoppala@linux.intel.com> References: <153415852813.32460.2485070433955631770@skylake-alporthouse-com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTPS id CD5B589FE3 for ; Mon, 13 Aug 2018 13:03:04 +0000 (UTC) In-Reply-To: <153415852813.32460.2485070433955631770@skylake-alporthouse-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 SWYgZW5naW5lIHJlcG9ydHMgdGhhdCBpdCBpcyBub3QgcmVhZHkgZm9yIHJlc2V0LCB3ZQpnaXZl IHVwLiBFdmlkZW5jZSBzaG93cyB0aGF0IGZvcmNpbmcgYSBwZXIgZW5naW5lIHJlc2V0Cm9uIGFu IGVuZ2luZSB3aGljaCBpcyBub3QgcmVwb3J0aW5nIHRvIGJlIHJlYWR5IGZvciByZXNldCwKY2Fu IGJyaW5nIGl0IGJhY2sgaW50byBhIHdvcmtpbmcgb3JkZXIuIFRoZXJlIGlzIHJpc2sgdGhhdAp3 ZSBjb3JydXB0IHRoZSBjb250ZXh0IGltYWdlIGN1cnJlbnRseSBleGVjdXRpbmcgb24gdGhhdApl bmdpbmUuIEJ1dCB0aGF0IGlzIGEgcmlzayB3b3J0aCB0YWtpbmcgYXMgaWYgd2UgdW5ibG9jawp0 aGUgZW5naW5lLCB3ZSBwcmV2ZW50IGEgd2hvbGUgZGV2aWNlIHdlZGdpbmcgaW4gYSBjYXNlCm9m IGZ1bGwgZ3B1IHJlc2V0LgoKUmVzZXQgaW5kaXZpZHVhbCBlbmdpbmUgZXZlbiBpZiBpdCByZXBv cnRzIHRoYXQgaXQgaXMgbm90CnByZXBhcmVkIGZvciByZXNldCwgYnV0IG9ubHkgaWYgd2UgYWlt IGZvciBmdWxsIGdwdSByZXNldAphbmQgbm90IG9uIGZpcnN0IHJlc2V0IGF0dGVtcHQuCgp2Mjog Zm9yY2UgcmVzZXQgb25seSBvbiBsYXRlciBhdHRlbXB0cywgcmVhZGFiaWxpdHkgKENocmlzKQp2 Mzogc2ltcGxpZnkgd2l0aCBhZGVxdWF0ZSBjYWZmZWluZSBsZXZlbHMgKENocmlzKQp2NDogY29t bWVudCBhYm91dCByaXNrcyBhbmQgbWlnaXRhdGlvbnMgKENocmlzKQoKQ2M6IENocmlzIFdpbHNv biA8Y2hyaXNAY2hyaXMtd2lsc29uLmNvLnVrPgpTaWduZWQtb2ZmLWJ5OiBNaWthIEt1b3BwYWxh IDxtaWthLmt1b3BwYWxhQGxpbnV4LmludGVsLmNvbT4KUmV2aWV3ZWQtYnk6IENocmlzIFdpbHNv biA8Y2hyaXNAY2hyaXMtd2lsc29uLmNvLnVrPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX3VuY29yZS5jIHwgNTAgKysrKysrKysrKysrKysrKysrKysrLS0tLS0tLS0KIDEgZmlsZSBj aGFuZ2VkLCAzNyBpbnNlcnRpb25zKCspLCAxMyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF91bmNvcmUuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX3VuY29yZS5jCmluZGV4IDAyN2QxNDU3NGJmYS4uMjBmMmY1YWQ5YzNmIDEwMDY0NAot LS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF91bmNvcmUuYworKysgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF91bmNvcmUuYwpAQCAtMjA4NSw3ICsyMDg1LDcgQEAgaW50IF9faW50 ZWxfd2FpdF9mb3JfcmVnaXN0ZXIoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAog CXJldHVybiByZXQ7CiB9CiAKLXN0YXRpYyBpbnQgZ2VuOF9yZXNldF9lbmdpbmVfc3RhcnQoc3Ry dWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKQorc3RhdGljIGludCBnZW44X2VuZ2luZV9yZXNl dF9wcmVwYXJlKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKIHsKIAlzdHJ1Y3QgZHJt X2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBlbmdpbmUtPmk5MTU7CiAJaW50IHJldDsKQEAgLTIx MDUsNyArMjEwNSw3IEBAIHN0YXRpYyBpbnQgZ2VuOF9yZXNldF9lbmdpbmVfc3RhcnQoc3RydWN0 IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKQogCXJldHVybiByZXQ7CiB9CiAKLXN0YXRpYyB2b2lk IGdlbjhfcmVzZXRfZW5naW5lX2NhbmNlbChzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUp CitzdGF0aWMgdm9pZCBnZW44X2VuZ2luZV9yZXNldF9jYW5jZWwoc3RydWN0IGludGVsX2VuZ2lu ZV9jcyAqZW5naW5lKQogewogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGVu Z2luZS0+aTkxNTsKIApAQCAtMjExMywyOSArMjExMyw1MCBAQCBzdGF0aWMgdm9pZCBnZW44X3Jl c2V0X2VuZ2luZV9jYW5jZWwoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKQogCQkgICAg ICBfTUFTS0VEX0JJVF9ESVNBQkxFKFJFU0VUX0NUTF9SRVFVRVNUX1JFU0VUKSk7CiB9CiAKK3N0 YXRpYyBpbnQgcmVzZXRfZW5naW5lcyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqaTkxNSwKKwkJ CSB1bnNpZ25lZCBpbnQgZW5naW5lX21hc2ssCisJCQkgdW5zaWduZWQgaW50IHJldHJ5KQorewor CWlmIChJTlRFTF9HRU4oaTkxNSkgPj0gMTEpCisJCXJldHVybiBnZW4xMV9yZXNldF9lbmdpbmVz KGk5MTUsIGVuZ2luZV9tYXNrKTsKKwllbHNlCisJCXJldHVybiBnZW42X3Jlc2V0X2VuZ2luZXMo aTkxNSwgZW5naW5lX21hc2ssIHJldHJ5KTsKK30KKwogc3RhdGljIGludCBnZW44X3Jlc2V0X2Vu Z2luZXMoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogCQkJICAgICAgdW5zaWdu ZWQgaW50IGVuZ2luZV9tYXNrLAogCQkJICAgICAgdW5zaWduZWQgaW50IHJldHJ5KQogewogCXN0 cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZTsKKwljb25zdCBib29sIHJlc2V0X25vbl9yZWFk eSA9IHJldHJ5ID49IDE7CiAJdW5zaWduZWQgaW50IHRtcDsKIAlpbnQgcmV0OwogCiAJZm9yX2Vh Y2hfZW5naW5lX21hc2tlZChlbmdpbmUsIGRldl9wcml2LCBlbmdpbmVfbWFzaywgdG1wKSB7Ci0J CWlmIChnZW44X3Jlc2V0X2VuZ2luZV9zdGFydChlbmdpbmUpKSB7Ci0JCQlyZXQgPSAtRUlPOwot CQkJZ290byBub3RfcmVhZHk7Ci0JCX0KKwkJcmV0ID0gZ2VuOF9lbmdpbmVfcmVzZXRfcHJlcGFy ZShlbmdpbmUpOworCQlpZiAocmV0ICYmICFyZXNldF9ub25fcmVhZHkpCisJCQlnb3RvIHNraXBf cmVzZXQ7CisKKwkJLyoKKwkJICogSWYgdGhpcyBpcyBub3QgdGhlIGZpcnN0IGZhaWxlZCBhdHRl bXB0IHRvIHByZXBhcmUsCisJCSAqIHdlIGRlY2lkZSB0byBwcm9jZWVkIGFueXdheS4KKwkJICoK KwkJICogQnkgZG9pbmcgc28gd2UgcmlzayBjb250ZXh0IGNvcnJ1cHRpb24gYW5kIHdpdGgKKwkJ ICogc29tZSBnZW5zIChrYmwpLCBwb3NzaWJsZSBzeXN0ZW0gaGFuZyBpZiByZXNldAorCQkgKiBo YXBwZW5zIGR1cmluZyBhY3RpdmUgYmIgZXhlY3V0aW9uLgorCQkgKgorCQkgKiBXZSByYXRoZXIg dGFrZSBjb250ZXh0IGNvcnJ1cHRpb24gaW5zdGVhZCBvZgorCQkgKiBmYWlsZWQgcmVzZXQgd2l0 aCBhIHdlZGdlZCBkcml2ZXIvZ3B1LiBBbmQKKwkJICogYWN0aXZlIGJiIGV4ZWN1dGlvbiBjYXNl IHNob3VsZCBiZSBjb3ZlcmVkIGJ5CisJCSAqIGk5MTVfc3RvcF9lbmdpbmVzIHdlIGhhdmUgYmVm b3JlIHRoZSByZXNldC4KKwkJICovCiAJfQogCi0JaWYgKElOVEVMX0dFTihkZXZfcHJpdikgPj0g MTEpCi0JCXJldCA9IGdlbjExX3Jlc2V0X2VuZ2luZXMoZGV2X3ByaXYsIGVuZ2luZV9tYXNrKTsK LQllbHNlCi0JCXJldCA9IGdlbjZfcmVzZXRfZW5naW5lcyhkZXZfcHJpdiwgZW5naW5lX21hc2ss IHJldHJ5KTsKKwlyZXQgPSByZXNldF9lbmdpbmVzKGRldl9wcml2LCBlbmdpbmVfbWFzaywgcmV0 cnkpOwogCi1ub3RfcmVhZHk6Citza2lwX3Jlc2V0OgogCWZvcl9lYWNoX2VuZ2luZV9tYXNrZWQo ZW5naW5lLCBkZXZfcHJpdiwgZW5naW5lX21hc2ssIHRtcCkKLQkJZ2VuOF9yZXNldF9lbmdpbmVf Y2FuY2VsKGVuZ2luZSk7CisJCWdlbjhfZW5naW5lX3Jlc2V0X2NhbmNlbChlbmdpbmUpOwogCiAJ cmV0dXJuIHJldDsKIH0KQEAgLTIxNjQsMTIgKzIxODUsMTUgQEAgc3RhdGljIHJlc2V0X2Z1bmMg aW50ZWxfZ2V0X2dwdV9yZXNldChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJ CXJldHVybiBOVUxMOwogfQogCi1pbnQgaW50ZWxfZ3B1X3Jlc2V0KHN0cnVjdCBkcm1faTkxNV9w cml2YXRlICpkZXZfcHJpdiwgdW5zaWduZWQgaW50IGVuZ2luZV9tYXNrKQoraW50IGludGVsX2dw dV9yZXNldChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCisJCSAgICBjb25zdCB1 bnNpZ25lZCBpbnQgZW5naW5lX21hc2spCiB7CiAJcmVzZXRfZnVuYyByZXNldCA9IGludGVsX2dl dF9ncHVfcmVzZXQoZGV2X3ByaXYpOwogCXVuc2lnbmVkIGludCByZXRyeTsKIAlpbnQgcmV0Owog CisJR0VNX0JVR19PTighZW5naW5lX21hc2spOworCiAJLyoKIAkgKiBXZSB3YW50IHRvIHBlcmZv cm0gcGVyLWVuZ2luZSByZXNldCBmcm9tIGF0b21pYyBjb250ZXh0IChlLmcuCiAJICogc29mdGly cSksIHdoaWNoIGltcG9zZXMgdGhlIGNvbnN0cmFpbnQgdGhhdCB3ZSBjYW5ub3Qgc2xlZXAuCi0t IAoyLjE3LjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f CkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpo dHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=