From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mika Kuoppala Subject: [PATCH 2/3] drm/i915: Handle catastrophic error on engine reset Date: Fri, 12 Apr 2019 18:37:22 +0300 Message-ID: <20190412153723.31931-2-mika.kuoppala@linux.intel.com> References: <20190412153723.31931-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 mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTPS id 0E11689A59 for ; Fri, 12 Apr 2019 15:37:33 +0000 (UTC) In-Reply-To: <20190412153723.31931-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 SWYgY2F0IGVycm9yIGlzIHNldCwgd2UgbmVlZCB0byBjbGVhciBpdCBieSBhY2tpbmcgaXQuIEZ1 cnRoZXIsCmlmIGl0IGlzIHNldCwgd2UgbXVzdCBub3QgZG8gYSBub3JtYWwgcmVxdWVzdCBmb3Ig cmVzZXQuCgpCc3BlYzogMTI1NjcKU2lnbmVkLW9mZi1ieTogTWlrYSBLdW9wcGFsYSA8bWlrYS5r dW9wcGFsYUBsaW51eC5pbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9y ZWcuaCAgIHwgIDYgKysrLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcmVzZXQuYyB8IDM5 ICsrKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0KIDIgZmlsZXMgY2hhbmdlZCwgMzEgaW5z ZXJ0aW9ucygrKSwgMTQgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9yZWcuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcmVnLmgKaW5kZXgg OGFkMmYwYTAzZjI4Li5jMWMwZjdhYjAzZTkgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfcmVnLmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9yZWcuaApAQCAt MjQ0Niw4ICsyNDQ2LDEwIEBAIGVudW0gaTkxNV9wb3dlcl93ZWxsX2lkIHsKICNkZWZpbmUgUklO R19IV1NfUEdBKGJhc2UpCV9NTUlPKChiYXNlKSArIDB4ODApCiAjZGVmaW5lIFJJTkdfSFdTX1BH QV9HRU42KGJhc2UpCV9NTUlPKChiYXNlKSArIDB4MjA4MCkKICNkZWZpbmUgUklOR19SRVNFVF9D VEwoYmFzZSkJX01NSU8oKGJhc2UpICsgMHhkMCkKLSNkZWZpbmUgICBSRVNFVF9DVExfUkVRVUVT VF9SRVNFVCAgKDEgPDwgMCkKLSNkZWZpbmUgICBSRVNFVF9DVExfUkVBRFlfVE9fUkVTRVQgKDEg PDwgMSkKKyNkZWZpbmUgICBSRVNFVF9DVExfQ0FUX0VSUk9SCSAgIFJFR19CSVQoMikKKyNkZWZp bmUgICBSRVNFVF9DVExfUkVBRFlfVE9fUkVTRVQgUkVHX0JJVCgxKQorI2RlZmluZSAgIFJFU0VU X0NUTF9SRVFVRVNUX1JFU0VUICBSRUdfQklUKDApCisKICNkZWZpbmUgUklOR19TRU1BX1dBSVRf UE9MTChiYXNlKSBfTU1JTygoYmFzZSkgKyAweDI0YykKIAogI2RlZmluZSBIU1dfR1RUX0NBQ0hF X0VOCV9NTUlPKDB4NDAyNCkKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf cmVzZXQuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcmVzZXQuYwppbmRleCBjZGUxYTUz MDkzMzYuLjA2MzEwZWU1YTY4YSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx NV9yZXNldC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcmVzZXQuYwpAQCAtNDkw LDI1ICs0OTAsNDAgQEAgc3RhdGljIGludCBnZW4xMV9yZXNldF9lbmdpbmVzKHN0cnVjdCBkcm1f aTkxNV9wcml2YXRlICppOTE1LAogc3RhdGljIGludCBnZW44X2VuZ2luZV9yZXNldF9wcmVwYXJl KHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKIHsKIAlzdHJ1Y3QgaW50ZWxfdW5jb3Jl ICp1bmNvcmUgPSBlbmdpbmUtPnVuY29yZTsKLQl1MzIgY3RsOworCWNvbnN0IGk5MTVfcmVnX3Qg cmVnID0gUklOR19SRVNFVF9DVEwoZW5naW5lLT5tbWlvX2Jhc2UpOworCXUzMiBjdGwsIGFjayA9 IDAsIG1hc2sgPSAwLCByZXF1ZXN0ID0gMDsKIAlpbnQgcmV0OwogCi0JY3RsID0gaW50ZWxfdW5j b3JlX3JlYWRfZncodW5jb3JlLCBSSU5HX1JFU0VUX0NUTChlbmdpbmUtPm1taW9fYmFzZSkpOwot CWlmIChjdGwgJiBSRVNFVF9DVExfUkVBRFlfVE9fUkVTRVQpCisJY3RsID0gaW50ZWxfdW5jb3Jl X3JlYWRfZncodW5jb3JlLCByZWcpOworCisJaWYgKElOVEVMX0dFTihlbmdpbmUtPmk5MTUpID4g OSAmJiAoY3RsICYgUkVTRVRfQ1RMX0NBVF9FUlJPUikpIHsKKwkJcmVxdWVzdCB8PSBSRVNFVF9D VExfQ0FUX0VSUk9SOworCQltYXNrIHw9IFJFU0VUX0NUTF9DQVRfRVJST1I7CisKKwkJLyogSEFT IzM5NjgxMzogQXZvaWQgcmVzZXQgcmVxdWVzdCBpZiBjYXQgZXJyb3IgKi8KKwkJZ290byBza2lw X3JlYWR5X3JlcTsKKwl9CisKKwlpZiAoIShjdGwgJiBSRVNFVF9DVExfUkVBRFlfVE9fUkVTRVQp KSB7CisJCXJlcXVlc3QgfD0gUkVTRVRfQ1RMX1JFUVVFU1RfUkVTRVQ7CisKKwkJbWFzayB8PSBS RVNFVF9DVExfUkVBRFlfVE9fUkVTRVQ7CisJCWFjayB8PSBSRVNFVF9DVExfUkVBRFlfVE9fUkVT RVQ7CisJfQorCisJaWYgKCFyZXF1ZXN0KQogCQlyZXR1cm4gMDsKIAotCWludGVsX3VuY29yZV93 cml0ZV9mdyh1bmNvcmUsCi0JCQkgICAgICBSSU5HX1JFU0VUX0NUTChlbmdpbmUtPm1taW9fYmFz ZSksCi0JCQkgICAgICBfTUFTS0VEX0JJVF9FTkFCTEUoUkVTRVRfQ1RMX1JFUVVFU1RfUkVTRVQp KTsKK3NraXBfcmVhZHlfcmVxOgorCWludGVsX3VuY29yZV93cml0ZV9mdyh1bmNvcmUsIHJlZywg X01BU0tFRF9CSVRfRU5BQkxFKHJlcXVlc3QpKTsKIAogCXJldCA9IF9faW50ZWxfd2FpdF9mb3Jf cmVnaXN0ZXJfZncodW5jb3JlLAotCQkJCQkgICBSSU5HX1JFU0VUX0NUTChlbmdpbmUtPm1taW9f YmFzZSksCi0JCQkJCSAgIFJFU0VUX0NUTF9SRUFEWV9UT19SRVNFVCwKLQkJCQkJICAgUkVTRVRf Q1RMX1JFQURZX1RPX1JFU0VULAotCQkJCQkgICA3MDAsIDAsCi0JCQkJCSAgIE5VTEwpOworCQkJ CQkgICByZWcsIG1hc2ssIGFjaywKKwkJCQkJICAgNzAwLCAwLCBOVUxMKTsKIAlpZiAocmV0KQot CQlEUk1fRVJST1IoIiVzOiByZXNldCByZXF1ZXN0IHRpbWVvdXRcbiIsIGVuZ2luZS0+bmFtZSk7 CisJCURSTV9FUlJPUigiJXM6IHJlc2V0IHJlcXVlc3QgMHglMDh4IHRpbWVvdXQgMHglMDh4XG4i LAorCQkJICBlbmdpbmUtPm5hbWUsIHJlcXVlc3QsCisJCQkgIGludGVsX3VuY29yZV9yZWFkX2Z3 KHVuY29yZSwgcmVnKSk7CiAKIAlyZXR1cm4gcmV0OwogfQotLSAKMi4xNy4xCgpfX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBs aXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVz a3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZng=