From: Mika Kuoppala Subject: [PATCH 2/2] drm/i915: Force reset on unready engine Date: Mon, 13 Aug 2018 13:42:42 +0300 Message-ID: <20180813104242.32651-1-mika.kuoppala@linux.intel.com> References: <153415462753.23925.15492555505797705941@skylake-alporthouse-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 026BF89C51 for ; Mon, 13 Aug 2018 10:44:09 +0000 (UTC) In-Reply-To: <153415462753.23925.15492555505797705941@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 Mzogc2ltcGxpZnkgd2l0aCBhZGVxdWF0ZSBjYWZmZWluZSBsZXZlbHMgKENocmlzKQoKQ2M6IENo cmlzIFdpbHNvbiA8Y2hyaXNAY2hyaXMtd2lsc29uLmNvLnVrPgpTaWduZWQtb2ZmLWJ5OiBNaWth IEt1b3BwYWxhIDxtaWthLmt1b3BwYWxhQGxpbnV4LmludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF91bmNvcmUuYyB8IDM2ICsrKysrKysrKysrKysrKysrKy0tLS0tLS0t LS0tCiAxIGZpbGUgY2hhbmdlZCwgMjMgaW5zZXJ0aW9ucygrKSwgMTMgZGVsZXRpb25zKC0pCgpk aWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfdW5jb3JlLmMgYi9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF91bmNvcmUuYwppbmRleCAwMjdkMTQ1NzRiZmEuLjdjYmExNGFl ODJhMSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfdW5jb3JlLmMKKysr IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfdW5jb3JlLmMKQEAgLTIwODUsNyArMjA4NSw3 IEBAIGludCBfX2ludGVsX3dhaXRfZm9yX3JlZ2lzdGVyKHN0cnVjdCBkcm1faTkxNV9wcml2YXRl ICpkZXZfcHJpdiwKIAlyZXR1cm4gcmV0OwogfQogCi1zdGF0aWMgaW50IGdlbjhfcmVzZXRfZW5n aW5lX3N0YXJ0KHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKK3N0YXRpYyBpbnQgZ2Vu OF9lbmdpbmVfcmVzZXRfcHJlcGFyZShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpCiB7 CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZW5naW5lLT5pOTE1OwogCWlu dCByZXQ7CkBAIC0yMTA1LDcgKzIxMDUsNyBAQCBzdGF0aWMgaW50IGdlbjhfcmVzZXRfZW5naW5l X3N0YXJ0KHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKIAlyZXR1cm4gcmV0OwogfQog Ci1zdGF0aWMgdm9pZCBnZW44X3Jlc2V0X2VuZ2luZV9jYW5jZWwoc3RydWN0IGludGVsX2VuZ2lu ZV9jcyAqZW5naW5lKQorc3RhdGljIHZvaWQgZ2VuOF9lbmdpbmVfcmVzZXRfY2FuY2VsKHN0cnVj dCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKIHsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAq ZGV2X3ByaXYgPSBlbmdpbmUtPmk5MTU7CiAKQEAgLTIxMTMsMjkgKzIxMTMsMzYgQEAgc3RhdGlj IHZvaWQgZ2VuOF9yZXNldF9lbmdpbmVfY2FuY2VsKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVu Z2luZSkKIAkJICAgICAgX01BU0tFRF9CSVRfRElTQUJMRShSRVNFVF9DVExfUkVRVUVTVF9SRVNF VCkpOwogfQogCitzdGF0aWMgaW50IHJlc2V0X2VuZ2luZXMoc3RydWN0IGRybV9pOTE1X3ByaXZh dGUgKmk5MTUsCisJCQkgdW5zaWduZWQgaW50IGVuZ2luZV9tYXNrLAorCQkJIHVuc2lnbmVkIGlu dCByZXRyeSkKK3sKKwlpZiAoSU5URUxfR0VOKGk5MTUpID49IDExKQorCQlyZXR1cm4gZ2VuMTFf cmVzZXRfZW5naW5lcyhpOTE1LCBlbmdpbmVfbWFzayk7CisJZWxzZQorCQlyZXR1cm4gZ2VuNl9y ZXNldF9lbmdpbmVzKGk5MTUsIGVuZ2luZV9tYXNrLCByZXRyeSk7Cit9CisKIHN0YXRpYyBpbnQg Z2VuOF9yZXNldF9lbmdpbmVzKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAkJ CSAgICAgIHVuc2lnbmVkIGludCBlbmdpbmVfbWFzaywKIAkJCSAgICAgIHVuc2lnbmVkIGludCBy ZXRyeSkKIHsKIAlzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmU7CisJY29uc3QgYm9vbCBy ZXNldF9ub25fcmVhZHkgPSByZXRyeSA+PSAxOwogCXVuc2lnbmVkIGludCB0bXA7CiAJaW50IHJl dDsKIAogCWZvcl9lYWNoX2VuZ2luZV9tYXNrZWQoZW5naW5lLCBkZXZfcHJpdiwgZW5naW5lX21h c2ssIHRtcCkgewotCQlpZiAoZ2VuOF9yZXNldF9lbmdpbmVfc3RhcnQoZW5naW5lKSkgewotCQkJ cmV0ID0gLUVJTzsKLQkJCWdvdG8gbm90X3JlYWR5OwotCQl9CisJCXJldCA9IGdlbjhfZW5naW5l X3Jlc2V0X3ByZXBhcmUoZW5naW5lKTsKKwkJaWYgKHJldCAmJiAhcmVzZXRfbm9uX3JlYWR5KQor CQkJZ290byBza2lwX3Jlc2V0OwogCX0KIAotCWlmIChJTlRFTF9HRU4oZGV2X3ByaXYpID49IDEx KQotCQlyZXQgPSBnZW4xMV9yZXNldF9lbmdpbmVzKGRldl9wcml2LCBlbmdpbmVfbWFzayk7Ci0J ZWxzZQotCQlyZXQgPSBnZW42X3Jlc2V0X2VuZ2luZXMoZGV2X3ByaXYsIGVuZ2luZV9tYXNrLCBy ZXRyeSk7CisJcmV0ID0gcmVzZXRfZW5naW5lcyhkZXZfcHJpdiwgZW5naW5lX21hc2ssIHJldHJ5 KTsKIAotbm90X3JlYWR5Ogorc2tpcF9yZXNldDoKIAlmb3JfZWFjaF9lbmdpbmVfbWFza2VkKGVu Z2luZSwgZGV2X3ByaXYsIGVuZ2luZV9tYXNrLCB0bXApCi0JCWdlbjhfcmVzZXRfZW5naW5lX2Nh bmNlbChlbmdpbmUpOworCQlnZW44X2VuZ2luZV9yZXNldF9jYW5jZWwoZW5naW5lKTsKIAogCXJl dHVybiByZXQ7CiB9CkBAIC0yMTY0LDEyICsyMTcxLDE1IEBAIHN0YXRpYyByZXNldF9mdW5jIGlu dGVsX2dldF9ncHVfcmVzZXQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogCQly ZXR1cm4gTlVMTDsKIH0KIAotaW50IGludGVsX2dwdV9yZXNldChzdHJ1Y3QgZHJtX2k5MTVfcHJp dmF0ZSAqZGV2X3ByaXYsIHVuc2lnbmVkIGludCBlbmdpbmVfbWFzaykKK2ludCBpbnRlbF9ncHVf cmVzZXQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAorCQkgICAgY29uc3QgdW5z aWduZWQgaW50IGVuZ2luZV9tYXNrKQogewogCXJlc2V0X2Z1bmMgcmVzZXQgPSBpbnRlbF9nZXRf Z3B1X3Jlc2V0KGRldl9wcml2KTsKIAl1bnNpZ25lZCBpbnQgcmV0cnk7CiAJaW50IHJldDsKIAor CUdFTV9CVUdfT04oIWVuZ2luZV9tYXNrKTsKKwogCS8qCiAJICogV2Ugd2FudCB0byBwZXJmb3Jt IHBlci1lbmdpbmUgcmVzZXQgZnJvbSBhdG9taWMgY29udGV4dCAoZS5nLgogCSAqIHNvZnRpcnEp LCB3aGljaCBpbXBvc2VzIHRoZSBjb25zdHJhaW50IHRoYXQgd2UgY2Fubm90IHNsZWVwLgotLSAK Mi4xNy4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJ bnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0 cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK