From: Mika Kuoppala Subject: [PATCH 2/2] drm/i915: Force reset on unready engine Date: Fri, 10 Aug 2018 17:00:36 +0300 Message-ID: <20180810140036.24240-2-mika.kuoppala@linux.intel.com> References: <20180810140036.24240-1-mika.kuoppala@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTPS id 8BCCB6E941 for ; Fri, 10 Aug 2018 14:01:39 +0000 (UTC) In-Reply-To: <20180810140036.24240-1-mika.kuoppala@linux.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 SWYgZW5naW5lIHJlcG9ydHMgdGhhdCBpdCBpcyBub3QgcmVhZHkgZm9yIHJlc2V0LCB3ZQpnaXZl IHVwLiBFdmlkZW5jZSBzaG93cyB0aGF0IGZvcmNpbmcgYSBwZXIgZW5naW5lIHJlc2V0Cm9uIGFu IGVuZ2luZSB3aGljaCBpcyBub3QgcmVwb3J0aW5nIHRvIGJlIHJlYWR5IGZvciByZXNldCwKY2Fu IGJyaW5nIGl0IGJhY2sgaW50byBhIHdvcmtpbmcgb3JkZXIuIFRoZXJlIGlzIHJpc2sgdGhhdAp3 ZSBjb3JydXB0IHRoZSBjb250ZXh0IGltYWdlIGN1cnJlbnRseSBleGVjdXRpbmcgb24gdGhhdApl bmdpbmUuIEJ1dCB0aGF0IGlzIGEgcmlzayB3b3J0aCB0YWtpbmcgYXMgaWYgd2UgdW5ibG9jawp0 aGUgZW5naW5lLCB3ZSBwcmV2ZW50IGEgd2hvbGUgZGV2aWNlIHdlZGdpbmcgaW4gYSBjYXNlCm9m IGZ1bGwgZ3B1IHJlc2V0LgoKUmVzZXQgaW5kaXZpZHVhbCBlbmdpbmUgZXZlbiBpZiBpdCByZXBv cnRzIHRoYXQgaXQgaXMgbm90CnByZXBhcmVkIGZvciByZXNldCwgYnV0IG9ubHkgaWYgd2UgYWlt IGZvciBmdWxsIGdwdSByZXNldAphbmQgbm90IG9uIGZpcnN0IHJlc2V0IGF0dGVtcHQuCgp2Mjog Zm9yY2UgcmVzZXQgb25seSBvbiBsYXRlciBhdHRlbXB0cywgcmVhZGFiaWxpdHkgKENocmlzKQoK Q2M6IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hyaXMtd2lsc29uLmNvLnVrPgpTaWduZWQtb2ZmLWJ5 OiBNaWthIEt1b3BwYWxhIDxtaWthLmt1b3BwYWxhQGxpbnV4LmludGVsLmNvbT4KLS0tCiBkcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF91bmNvcmUuYyB8IDQ5ICsrKysrKysrKysrKysrKysrKysr KysrLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMzkgaW5zZXJ0aW9ucygrKSwgMTAgZGVsZXRpb25z KC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfdW5jb3JlLmMgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF91bmNvcmUuYwppbmRleCAwMjdkMTQ1NzRiZmEuLmQy NDAyNjgzOWIxNyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfdW5jb3Jl LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfdW5jb3JlLmMKQEAgLTIwOTksOSAr MjA5OSw2IEBAIHN0YXRpYyBpbnQgZ2VuOF9yZXNldF9lbmdpbmVfc3RhcnQoc3RydWN0IGludGVs X2VuZ2luZV9jcyAqZW5naW5lKQogCQkJCQkgICBSRVNFVF9DVExfUkVBRFlfVE9fUkVTRVQsCiAJ CQkJCSAgIDcwMCwgMCwKIAkJCQkJICAgTlVMTCk7Ci0JaWYgKHJldCkKLQkJRFJNX0VSUk9SKCIl czogcmVzZXQgcmVxdWVzdCB0aW1lb3V0XG4iLCBlbmdpbmUtPm5hbWUpOwotCiAJcmV0dXJuIHJl dDsKIH0KIApAQCAtMjExMyw2ICsyMTEwLDQyIEBAIHN0YXRpYyB2b2lkIGdlbjhfcmVzZXRfZW5n aW5lX2NhbmNlbChzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpCiAJCSAgICAgIF9NQVNL RURfQklUX0RJU0FCTEUoUkVTRVRfQ1RMX1JFUVVFU1RfUkVTRVQpKTsKIH0KIAorc3RhdGljIGlu dCByZXNldF9lbmdpbmVzKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICppOTE1LAorCQkJIHVuc2ln bmVkIGludCBlbmdpbmVfbWFzaywKKwkJCSB1bnNpZ25lZCBpbnQgcmV0cnkpCit7CisJaWYgKElO VEVMX0dFTihpOTE1KSA+PSAxMSkKKwkJcmV0dXJuIGdlbjExX3Jlc2V0X2VuZ2luZXMoaTkxNSwg ZW5naW5lX21hc2spOworCWVsc2UKKwkJcmV0dXJuIGdlbjZfcmVzZXRfZW5naW5lcyhpOTE1LCBl bmdpbmVfbWFzaywgcmV0cnkpOworfQorCitzdGF0aWMgaW50IGdlbjhfcHJlcGFyZV9lbmdpbmVf Zm9yX3Jlc2V0KHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSwKKwkJCQkJIHVuc2lnbmVk IGludCByZXRyeSkKK3sKKwljb25zdCBib29sIGZvcmNlX3Jlc2V0X29uX25vbl9yZWFkeSA9IHJl dHJ5ID49IDE7CisJaW50IHJldDsKKworCXJldCA9IGdlbjhfcmVzZXRfZW5naW5lX3N0YXJ0KGVu Z2luZSk7CisKKwlpZiAocmV0ICYmIGZvcmNlX3Jlc2V0X29uX25vbl9yZWFkeSkgeworCQkvKgor CQkgKiBUcnkgdG8gdW5ibG9jayBhIHNpbmdsZSBub24tcmVhZHkgZW5naW5lIGJ5IHJpc2tpbmcK KwkJICogY29udGV4dCBjb3JydXB0aW9uLgorCQkgKi8KKwkJcmV0ID0gcmVzZXRfZW5naW5lcyhl bmdpbmUtPmk5MTUsCisJCQkJICAgIGludGVsX2VuZ2luZV9mbGFnKGVuZ2luZSksCisJCQkJICAg IHJldHJ5KTsKKwkJaWYgKCFyZXQpCisJCQlyZXQgPSBnZW44X3Jlc2V0X2VuZ2luZV9zdGFydChl bmdpbmUpOworCisJCURSTV9FUlJPUigiJXM6IHJlc2V0IHJlcXVlc3QgdGltZW91dCwgZm9yY2lu ZyByZXNldCAoJWQpXG4iLAorCQkJICBlbmdpbmUtPm5hbWUsIHJldCk7CisJfQorCisJcmV0dXJu IHJldDsKK30KKwogc3RhdGljIGludCBnZW44X3Jlc2V0X2VuZ2luZXMoc3RydWN0IGRybV9pOTE1 X3ByaXZhdGUgKmRldl9wcml2LAogCQkJICAgICAgdW5zaWduZWQgaW50IGVuZ2luZV9tYXNrLAog CQkJICAgICAgdW5zaWduZWQgaW50IHJldHJ5KQpAQCAtMjEyMiwxNiArMjE1NSwxMiBAQCBzdGF0 aWMgaW50IGdlbjhfcmVzZXRfZW5naW5lcyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3By aXYsCiAJaW50IHJldDsKIAogCWZvcl9lYWNoX2VuZ2luZV9tYXNrZWQoZW5naW5lLCBkZXZfcHJp diwgZW5naW5lX21hc2ssIHRtcCkgewotCQlpZiAoZ2VuOF9yZXNldF9lbmdpbmVfc3RhcnQoZW5n aW5lKSkgewotCQkJcmV0ID0gLUVJTzsKKwkJcmV0ID0gZ2VuOF9wcmVwYXJlX2VuZ2luZV9mb3Jf cmVzZXQoZW5naW5lLCByZXRyeSk7CisJCWlmIChyZXQpCiAJCQlnb3RvIG5vdF9yZWFkeTsKLQkJ fQogCX0KIAotCWlmIChJTlRFTF9HRU4oZGV2X3ByaXYpID49IDExKQotCQlyZXQgPSBnZW4xMV9y ZXNldF9lbmdpbmVzKGRldl9wcml2LCBlbmdpbmVfbWFzayk7Ci0JZWxzZQotCQlyZXQgPSBnZW42 X3Jlc2V0X2VuZ2luZXMoZGV2X3ByaXYsIGVuZ2luZV9tYXNrLCByZXRyeSk7CisJcmV0ID0gcmVz ZXRfZW5naW5lcyhkZXZfcHJpdiwgZW5naW5lX21hc2ssIHJldHJ5KTsKIAogbm90X3JlYWR5Ogog CWZvcl9lYWNoX2VuZ2luZV9tYXNrZWQoZW5naW5lLCBkZXZfcHJpdiwgZW5naW5lX21hc2ssIHRt cCkKLS0gCjIuMTcuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Au b3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwt Z2Z4Cg==