From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michel Thierry Subject: [PATCH 6/9] drm/i915/tdr: Add engine reset count to error state Date: Fri, 16 Dec 2016 12:20:07 -0800 Message-ID: <20161216202010.7983-7-michel.thierry@intel.com> References: <20161216202010.7983-1-michel.thierry@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by gabe.freedesktop.org (Postfix) with ESMTPS id E68396ED32 for ; Fri, 16 Dec 2016 20:20:11 +0000 (UTC) In-Reply-To: <20161216202010.7983-1-michel.thierry@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 RnJvbTogQXJ1biBTaWx1dmVyeSA8YXJ1bi5zaWx1dmVyeUBsaW51eC5pbnRlbC5jb20+CgpEcml2 ZXIgbWFpbnRhaW5zIGNvdW50IG9mIGhvdyBtYW55IHRpbWVzIGEgZ2l2ZW4gZW5naW5lIGlzIHJl c2V0LCB1c2VmdWwgdG8KY2FwdHVyZSB0aGlzIGluIGVycm9yIHN0YXRlIGFsc28uIEl0IGdpdmVz IGFuIGlkZWEgb2YgaG93IGVuZ2luZSBpcyBjb3BpbmcKdXAgd2l0aCB0aGUgd29ya2xvYWRzIGl0 IGlzIGV4ZWN1dGluZyBiZWZvcmUgdGhpcyBlcnJvciBzdGF0ZS4KCkNjOiBDaHJpcyBXaWxzb24g PGNocmlzQGNocmlzLXdpbHNvbi5jby51az4KQ2M6IE1pa2EgS3VvcHBhbGEgPG1pa2Eua3VvcHBh bGFAbGludXguaW50ZWwuY29tPgpTaWduZWQtb2ZmLWJ5OiBBcnVuIFNpbHV2ZXJ5IDxhcnVuLnNp bHV2ZXJ5QGxpbnV4LmludGVsLmNvbT4KU2lnbmVkLW9mZi1ieTogTWljaGVsIFRoaWVycnkgPG1p Y2hlbC50aGllcnJ5QGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Ry di5jICAgICAgIHwgMSArCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oICAgICAgIHwg OSArKysrKysrKysKIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3B1X2Vycm9yLmMgfCAzICsr KwogMyBmaWxlcyBjaGFuZ2VkLCAxMyBpbnNlcnRpb25zKCspCgpkaWZmIC0tZ2l0IGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2 LmMKaW5kZXggYTAzNDc5M2JjMjQ2Li4xYzcwNmEwODJkNjAgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9k cnYuYwpAQCAtMTg3Nyw2ICsxODc3LDcgQEAgaW50IGk5MTVfcmVzZXRfZW5naW5lKHN0cnVjdCBp bnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKIAlpbnRlbF9lbmdpbmVfcmVzZXRfY2FuY2VsKGVuZ2lu ZSk7CiAJaW50ZWxfZXhlY2xpc3RzX3Jlc3RhcnRfc3VibWlzc2lvbihlbmdpbmUpOwogCisJZGV2 X3ByaXYtPmdwdV9lcnJvci5lbmdpbmVfcmVzZXRfY291bnRbZW5naW5lLT5pZF0rKzsKIAlpbnRl bF91bmNvcmVfZm9yY2V3YWtlX3B1dChkZXZfcHJpdiwgRk9SQ0VXQUtFX0FMTCk7CiAJcmV0dXJu IDA7CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCmluZGV4IGE5N2NjOGY1MGFkZS4uMjUxODM3NjJl ZDk0IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCisrKyBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKQEAgLTkzNyw2ICs5MzcsNyBAQCBzdHJ1Y3Qg ZHJtX2k5MTVfZXJyb3Jfc3RhdGUgewogCQllbnVtIGludGVsX2VuZ2luZV9oYW5nY2hlY2tfYWN0 aW9uIGhhbmdjaGVja19hY3Rpb247CiAJCXN0cnVjdCBpOTE1X2FkZHJlc3Nfc3BhY2UgKnZtOwog CQlpbnQgbnVtX3JlcXVlc3RzOworCQl1MzIgcmVzZXRfY291bnQ7CiAKIAkJLyogcG9zaXRpb24g b2YgYWN0aXZlIHJlcXVlc3QgaW5zaWRlIHRoZSByaW5nICovCiAJCXUzMiBycV9oZWFkLCBycV9w b3N0LCBycV90YWlsOwpAQCAtMTYyOSw2ICsxNjMwLDggQEAgc3RydWN0IGk5MTVfZ3B1X2Vycm9y IHsKICNkZWZpbmUgSTkxNV9SRVNFVF9JTl9QUk9HUkVTUwkwCiAjZGVmaW5lIEk5MTVfV0VER0VE CQkoQklUU19QRVJfTE9ORyAtIDEpCiAKKwl1bnNpZ25lZCBsb25nIGVuZ2luZV9yZXNldF9jb3Vu dFtJOTE1X05VTV9FTkdJTkVTXTsKKwogCS8qKgogCSAqIFdhaXRxdWV1ZSB0byBzaWduYWwgd2hl biBhIGhhbmcgaXMgZGV0ZWN0ZWQuIFVzZWQgdG8gZm9yIHdhaXRlcnMKIAkgKiB0byByZWxlYXNl IHRoZSBzdHJ1Y3RfbXV0ZXggZm9yIHRoZSByZXNldCB0byBwcm9jZWRlLgpAQCAtMzM5Nyw2ICsz NDAwLDEyIEBAIHN0YXRpYyBpbmxpbmUgdTMyIGk5MTVfcmVzZXRfY291bnQoc3RydWN0IGk5MTVf Z3B1X2Vycm9yICplcnJvcikKIAlyZXR1cm4gUkVBRF9PTkNFKGVycm9yLT5yZXNldF9jb3VudCk7 CiB9CiAKK3N0YXRpYyBpbmxpbmUgdTMyIGk5MTVfZW5naW5lX3Jlc2V0X2NvdW50KHN0cnVjdCBp OTE1X2dwdV9lcnJvciAqZXJyb3IsCisJCQkJCSAgc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5n aW5lKQoreworCXJldHVybiBSRUFEX09OQ0UoZXJyb3ItPmVuZ2luZV9yZXNldF9jb3VudFtlbmdp bmUtPmlkXSk7Cit9CisKIHZvaWQgaTkxNV9nZW1fcmVzZXQoc3RydWN0IGRybV9pOTE1X3ByaXZh dGUgKmRldl9wcml2KTsKIHZvaWQgaTkxNV9nZW1fc2V0X3dlZGdlZChzdHJ1Y3QgZHJtX2k5MTVf cHJpdmF0ZSAqZGV2X3ByaXYpOwogdm9pZCBpOTE1X2dlbV9yZXNldF9lbmdpbmUoc3RydWN0IGlu dGVsX2VuZ2luZV9jcyAqZW5naW5lKTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZ3B1X2Vycm9yLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dwdV9lcnJvci5j CmluZGV4IGUxNjAzN2QxYjBiYS4uZjE2OGFkODczNTIxIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2dwdV9lcnJvci5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZ3B1X2Vycm9yLmMKQEAgLTQ1Myw2ICs0NTMsNyBAQCBzdGF0aWMgdm9pZCBlcnJvcl9wcmlu dF9lbmdpbmUoc3RydWN0IGRybV9pOTE1X2Vycm9yX3N0YXRlX2J1ZiAqbSwKIAllcnJfcHJpbnRm KG0sICIgIGhhbmdjaGVjayBhY3Rpb24gdGltZXN0YW1wOiAlbHUsICV1IG1zIGFnb1xuIiwKIAkJ ICAgZWUtPmhhbmdjaGVja190aW1lc3RhbXAsCiAJCSAgIGppZmZpZXNfdG9fbXNlY3MoamlmZmll cyAtIGVlLT5oYW5nY2hlY2tfdGltZXN0YW1wKSk7CisJZXJyX3ByaW50ZihtLCAiICBlbmdpbmUg cmVzZXQgY291bnQ6ICV1XG4iLCBlZS0+cmVzZXRfY291bnQpOwogCiAJZXJyb3JfcHJpbnRfcmVx dWVzdChtLCAiICBFTFNQWzBdOiAiLCAmZWUtPmV4ZWNsaXN0WzBdKTsKIAllcnJvcl9wcmludF9y ZXF1ZXN0KG0sICIgIEVMU1BbMV06ICIsICZlZS0+ZXhlY2xpc3RbMV0pOwpAQCAtMTE3MCw2ICsx MTcxLDggQEAgc3RhdGljIHZvaWQgZXJyb3JfcmVjb3JkX2VuZ2luZV9yZWdpc3RlcnMoc3RydWN0 IGRybV9pOTE1X2Vycm9yX3N0YXRlICplcnJvciwKIAllZS0+aGFuZ2NoZWNrX3RpbWVzdGFtcCA9 IGVuZ2luZS0+aGFuZ2NoZWNrLmFjdGlvbl90aW1lc3RhbXA7CiAJZWUtPmhhbmdjaGVja19hY3Rp b24gPSBlbmdpbmUtPmhhbmdjaGVjay5hY3Rpb247CiAJZWUtPmhhbmdjaGVja19zdGFsbGVkID0g ZW5naW5lLT5oYW5nY2hlY2suc3RhbGxlZDsKKwllZS0+cmVzZXRfY291bnQgPSBpOTE1X2VuZ2lu ZV9yZXNldF9jb3VudCgmZGV2X3ByaXYtPmdwdV9lcnJvciwKKwkJCQkJCSAgZW5naW5lKTsKIAog CWlmIChVU0VTX1BQR1RUKGRldl9wcml2KSkgewogCQlpbnQgaTsKLS0gCjIuMTEuMAoKX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxp bmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJl ZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==