From: Michel Thierry Subject: [PATCH v5 07/18] drm/i915/tdr: Add engine reset count to error state Date: Fri, 24 Mar 2017 18:29:59 -0700 Message-ID: <20170325013010.36244-8-michel.thierry@intel.com> References: <20170325013010.36244-1-michel.thierry@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by gabe.freedesktop.org (Postfix) with ESMTPS id EF1406EC93 for ; Sat, 25 Mar 2017 01:30:14 +0000 (UTC) In-Reply-To: <20170325013010.36244-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 IGlzIGV4ZWN1dGluZyBiZWZvcmUgdGhpcyBlcnJvciBzdGF0ZS4KCkEgZm9sbG93LXVwIHBhdGNo IHdpbGwgcHJvdmlkZSB0aGlzIGluZm9ybWF0aW9uIGluIGRlYnVnZnMuCgp2Mjogcy9lbmdpbmVf cmVzZXQvcmVzZXRfZW5naW5lLyAoQ2hyaXMpCiAgICBEZWZpbmUgY291bnQgYXMgdW5zaWduZWQg aW50IChUdnJ0a28pCgpDYzogQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+ CkNjOiBNaWthIEt1b3BwYWxhIDxtaWthLmt1b3BwYWxhQGxpbnV4LmludGVsLmNvbT4KU2lnbmVk LW9mZi1ieTogQXJ1biBTaWx1dmVyeSA8YXJ1bi5zaWx1dmVyeUBsaW51eC5pbnRlbC5jb20+ClNp Z25lZC1vZmYtYnk6IE1pY2hlbCBUaGllcnJ5IDxtaWNoZWwudGhpZXJyeUBpbnRlbC5jb20+Ci0t LQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYyAgICAgICB8IDIgKysKIGRyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggICAgICAgfCA4ICsrKysrKysrCiBkcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2dwdV9lcnJvci5jIHwgMyArKysKIDMgZmlsZXMgY2hhbmdlZCwgMTMgaW5z ZXJ0aW9ucygrKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5jCmluZGV4IDljN2JkY2YwM2MxMy4uYTEx MWIzOWJiYzEyIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5jCisr KyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMKQEAgLTE5NjcsNiArMTk2Nyw4IEBA IGludCBpOTE1X3Jlc2V0X2VuZ2luZShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpCiAJ aWYgKHJldCkKIAkJZ290byBlcnJvcjsKIAorCWVycm9yLT5yZXNldF9lbmdpbmVfY291bnRbZW5n aW5lLT5pZF0rKzsKKwogd2FrZXVwOgogCWVuYWJsZV9pcnEoZGV2X3ByaXYtPmRybS5pcnEpOwog CWludGVsX3VuY29yZV9mb3JjZXdha2VfcHV0KGRldl9wcml2LCBGT1JDRVdBS0VfQUxMKTsKZGlm ZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2Rydi5oCmluZGV4IDY3MjAxZWNkOThlNS4uZmJiNGYyMDA3NTZhIDEwMDY0 NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZHJ2LmgKQEAgLTk5OSw2ICs5OTksNyBAQCBzdHJ1Y3QgaTkxNV9ncHVf c3RhdGUgewogCQllbnVtIGludGVsX2VuZ2luZV9oYW5nY2hlY2tfYWN0aW9uIGhhbmdjaGVja19h Y3Rpb247CiAJCXN0cnVjdCBpOTE1X2FkZHJlc3Nfc3BhY2UgKnZtOwogCQlpbnQgbnVtX3JlcXVl c3RzOworCQl1MzIgcmVzZXRfY291bnQ7CiAKIAkJLyogcG9zaXRpb24gb2YgYWN0aXZlIHJlcXVl c3QgaW5zaWRlIHRoZSByaW5nICovCiAJCXUzMiBycV9oZWFkLCBycV9wb3N0LCBycV90YWlsOwpA QCAtMTYzOSw2ICsxNjQwLDcgQEAgc3RydWN0IGk5MTVfZ3B1X2Vycm9yIHsKIAogCS8qIGlmIGF2 YWlsYWJsZSwgZW5naW5lLXNwZWNpZmljIHJlc2V0IGlzIHRyaWVkIGJlZm9yZSBmdWxsIGdwdSBy ZXNldCAqLwogCXUzMiByZXNldF9lbmdpbmVfbWFzazsKKwl1MzIgcmVzZXRfZW5naW5lX2NvdW50 W0k5MTVfTlVNX0VOR0lORVNdOwogCiAJLyoqCiAJICogV2FpdHF1ZXVlIHRvIHNpZ25hbCB3aGVu IGEgaGFuZyBpcyBkZXRlY3RlZC4gVXNlZCB0byBmb3Igd2FpdGVycwpAQCAtMzQ1MCw2ICszNDUy LDEyIEBAIHN0YXRpYyBpbmxpbmUgdTMyIGk5MTVfcmVzZXRfY291bnQoc3RydWN0IGk5MTVfZ3B1 X2Vycm9yICplcnJvcikKIAlyZXR1cm4gUkVBRF9PTkNFKGVycm9yLT5yZXNldF9jb3VudCk7CiB9 CiAKK3N0YXRpYyBpbmxpbmUgdTMyIGk5MTVfcmVzZXRfZW5naW5lX2NvdW50KHN0cnVjdCBpOTE1 X2dwdV9lcnJvciAqZXJyb3IsCisJCQkJCSAgc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5l KQoreworCXJldHVybiBSRUFEX09OQ0UoZXJyb3ItPnJlc2V0X2VuZ2luZV9jb3VudFtlbmdpbmUt PmlkXSk7Cit9CisKIGludCBpOTE1X2dlbV9yZXNldF9wcmVwYXJlKHN0cnVjdCBkcm1faTkxNV9w cml2YXRlICpkZXZfcHJpdiwKIAkJCSAgIHVuc2lnbmVkIGludCBlbmdpbmVfbWFzayk7CiB2b2lk IGk5MTVfZ2VtX3Jlc2V0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdik7CmRpZmYg LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dwdV9lcnJvci5jIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9ncHVfZXJyb3IuYwppbmRleCA1MDk5YjM1OTljMzQuLjVkMDE1YmNj NzQ4NCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ncHVfZXJyb3IuYwor KysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dwdV9lcnJvci5jCkBAIC00NjMsNiArNDYz LDcgQEAgc3RhdGljIHZvaWQgZXJyb3JfcHJpbnRfZW5naW5lKHN0cnVjdCBkcm1faTkxNV9lcnJv cl9zdGF0ZV9idWYgKm0sCiAJZXJyX3ByaW50ZihtLCAiICBoYW5nY2hlY2sgYWN0aW9uIHRpbWVz dGFtcDogJWx1LCAldSBtcyBhZ29cbiIsCiAJCSAgIGVlLT5oYW5nY2hlY2tfdGltZXN0YW1wLAog CQkgICBqaWZmaWVzX3RvX21zZWNzKGppZmZpZXMgLSBlZS0+aGFuZ2NoZWNrX3RpbWVzdGFtcCkp OworCWVycl9wcmludGYobSwgIiAgZW5naW5lIHJlc2V0IGNvdW50OiAldVxuIiwgZWUtPnJlc2V0 X2NvdW50KTsKIAogCWVycm9yX3ByaW50X3JlcXVlc3QobSwgIiAgRUxTUFswXTogIiwgJmVlLT5l eGVjbGlzdFswXSk7CiAJZXJyb3JfcHJpbnRfcmVxdWVzdChtLCAiICBFTFNQWzFdOiAiLCAmZWUt PmV4ZWNsaXN0WzFdKTsKQEAgLTEyMzYsNiArMTIzNyw4IEBAIHN0YXRpYyB2b2lkIGVycm9yX3Jl Y29yZF9lbmdpbmVfcmVnaXN0ZXJzKHN0cnVjdCBpOTE1X2dwdV9zdGF0ZSAqZXJyb3IsCiAJZWUt PmhhbmdjaGVja190aW1lc3RhbXAgPSBlbmdpbmUtPmhhbmdjaGVjay5hY3Rpb25fdGltZXN0YW1w OwogCWVlLT5oYW5nY2hlY2tfYWN0aW9uID0gZW5naW5lLT5oYW5nY2hlY2suYWN0aW9uOwogCWVl LT5oYW5nY2hlY2tfc3RhbGxlZCA9IGVuZ2luZS0+aGFuZ2NoZWNrLnN0YWxsZWQ7CisJZWUtPnJl c2V0X2NvdW50ID0gaTkxNV9yZXNldF9lbmdpbmVfY291bnQoJmRldl9wcml2LT5ncHVfZXJyb3Is CisJCQkJCQkgIGVuZ2luZSk7CiAKIAlpZiAoVVNFU19QUEdUVChkZXZfcHJpdikpIHsKIAkJaW50 IGk7Ci0tIAoyLjExLjAKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9w Lm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVs LWdmeAo=