From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mika Kuoppala Subject: [PATCH 2/2] drm/i915: Handle catastrophic error on engine reset Date: Fri, 12 Apr 2019 19:16:29 +0300 Message-ID: <20190412161629.26005-2-mika.kuoppala@linux.intel.com> References: <20190412161629.26005-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 39AA5899A5 for ; Fri, 12 Apr 2019 16:16:38 +0000 (UTC) In-Reply-To: <20190412161629.26005-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 cmVzZXQuCgp2MjogYXZvaWQgZ290byAoQ2hyaXMpCgpCc3BlYzogMTI1NjcKQ2M6IENocmlzIFdp bHNvbiA8Y2hyaXNAY2hyaXMtd2lsc29uLmNvLnVrPgpTaWduZWQtb2ZmLWJ5OiBNaWthIEt1b3Bw YWxhIDxtaWthLmt1b3BwYWxhQGxpbnV4LmludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X3JlZy5oICAgfCAgNiArKysrLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf cmVzZXQuYyB8IDMyICsrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0KIDIgZmlsZXMgY2hh bmdlZCwgMjMgaW5zZXJ0aW9ucygrKSwgMTUgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9yZWcuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf cmVnLmgKaW5kZXggOGFkMmYwYTAzZjI4Li5jMWMwZjdhYjAzZTkgMTAwNjQ0Ci0tLSBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfcmVnLmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx NV9yZWcuaApAQCAtMjQ0Niw4ICsyNDQ2LDEwIEBAIGVudW0gaTkxNV9wb3dlcl93ZWxsX2lkIHsK ICNkZWZpbmUgUklOR19IV1NfUEdBKGJhc2UpCV9NTUlPKChiYXNlKSArIDB4ODApCiAjZGVmaW5l IFJJTkdfSFdTX1BHQV9HRU42KGJhc2UpCV9NTUlPKChiYXNlKSArIDB4MjA4MCkKICNkZWZpbmUg UklOR19SRVNFVF9DVEwoYmFzZSkJX01NSU8oKGJhc2UpICsgMHhkMCkKLSNkZWZpbmUgICBSRVNF VF9DVExfUkVRVUVTVF9SRVNFVCAgKDEgPDwgMCkKLSNkZWZpbmUgICBSRVNFVF9DVExfUkVBRFlf VE9fUkVTRVQgKDEgPDwgMSkKKyNkZWZpbmUgICBSRVNFVF9DVExfQ0FUX0VSUk9SCSAgIFJFR19C SVQoMikKKyNkZWZpbmUgICBSRVNFVF9DVExfUkVBRFlfVE9fUkVTRVQgUkVHX0JJVCgxKQorI2Rl ZmluZSAgIFJFU0VUX0NUTF9SRVFVRVNUX1JFU0VUICBSRUdfQklUKDApCisKICNkZWZpbmUgUklO R19TRU1BX1dBSVRfUE9MTChiYXNlKSBfTU1JTygoYmFzZSkgKyAweDI0YykKIAogI2RlZmluZSBI U1dfR1RUX0NBQ0hFX0VOCV9NTUlPKDB4NDAyNCkKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfcmVzZXQuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcmVzZXQuYwpp bmRleCBkODc0YTYyMTAzZTUuLjc1ZDY2YzQ3ZGI0OCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9yZXNldC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcmVz ZXQuYwpAQCAtNDkxLDI1ICs0OTEsMzEgQEAgc3RhdGljIGludCBnZW44X2VuZ2luZV9yZXNldF9w cmVwYXJlKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKIHsKIAlzdHJ1Y3QgaW50ZWxf dW5jb3JlICp1bmNvcmUgPSBlbmdpbmUtPnVuY29yZTsKIAljb25zdCBpOTE1X3JlZ190IHJlZyA9 IFJJTkdfUkVTRVRfQ1RMKGVuZ2luZS0+bW1pb19iYXNlKTsKLQl1MzIgY3RsOworCXUzMiBjdGws IGFjayA9IDAsIG1hc2sgPSAwLCByZXF1ZXN0ID0gMDsKIAlpbnQgcmV0OwogCiAJY3RsID0gaW50 ZWxfdW5jb3JlX3JlYWRfZncodW5jb3JlLCByZWcpOwotCWlmIChjdGwgJiBSRVNFVF9DVExfUkVB RFlfVE9fUkVTRVQpCisKKwlpZiAoY3RsICYgUkVTRVRfQ1RMX0NBVF9FUlJPUikgeworCQlyZXF1 ZXN0IHw9IFJFU0VUX0NUTF9DQVRfRVJST1I7CisJCW1hc2sgfD0gUkVTRVRfQ1RMX0NBVF9FUlJP UjsKKwkJLyogSEFTIzM5NjgxMzogQXZvaWQgcmVzZXQgcmVxdWVzdCBpZiBjYXQgZXJyb3IgKi8K Kwl9IGVsc2UgaWYgKCEoY3RsICYgUkVTRVRfQ1RMX1JFQURZX1RPX1JFU0VUKSkgeworCQlyZXF1 ZXN0IHw9IFJFU0VUX0NUTF9SRVFVRVNUX1JFU0VUOworCQltYXNrIHw9IFJFU0VUX0NUTF9SRUFE WV9UT19SRVNFVDsKKwkJYWNrIHw9IFJFU0VUX0NUTF9SRUFEWV9UT19SRVNFVDsKKwl9IGVsc2Ug ewogCQlyZXR1cm4gMDsKKwl9CiAKLQlpbnRlbF91bmNvcmVfd3JpdGVfZncodW5jb3JlLAotCQkJ ICAgICAgcmVnLAotCQkJICAgICAgX01BU0tFRF9CSVRfRU5BQkxFKFJFU0VUX0NUTF9SRVFVRVNU X1JFU0VUKSk7Ci0KLQlyZXQgPSBfX2ludGVsX3dhaXRfZm9yX3JlZ2lzdGVyX2Z3KHVuY29yZSwK LQkJCQkJICAgcmVnLAotCQkJCQkgICBSRVNFVF9DVExfUkVBRFlfVE9fUkVTRVQsCi0JCQkJCSAg IFJFU0VUX0NUTF9SRUFEWV9UT19SRVNFVCwKLQkJCQkJICAgNzAwLCAwLAotCQkJCQkgICBOVUxM KTsKKwlpbnRlbF91bmNvcmVfd3JpdGVfZncodW5jb3JlLCByZWcsIF9NQVNLRURfQklUX0VOQUJM RShyZXF1ZXN0KSk7CisKKwlyZXQgPSBfX2ludGVsX3dhaXRfZm9yX3JlZ2lzdGVyX2Z3KHVuY29y ZSwgcmVnLCBtYXNrLCBhY2ssCisJCQkJCSAgIDcwMCwgMCwgTlVMTCk7CiAJaWYgKHJldCkKLQkJ RFJNX0VSUk9SKCIlczogcmVzZXQgcmVxdWVzdCB0aW1lb3V0XG4iLCBlbmdpbmUtPm5hbWUpOwor CQlEUk1fRVJST1IoIiVzOiByZXNldCByZXF1ZXN0IDB4JTA4eCB0aW1lb3V0IDB4JTA4eFxuIiwK KwkJCSAgZW5naW5lLT5uYW1lLCByZXF1ZXN0LAorCQkJICBpbnRlbF91bmNvcmVfcmVhZF9mdyh1 bmNvcmUsIHJlZykpOwogCiAJcmV0dXJuIHJldDsKIH0KLS0gCjIuMTcuMQoKX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlz dApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0 b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4