From: Michel Thierry Subject: [PATCH v6 07/20] drm/i915/tdr: Add engine reset count to error state Date: Tue, 18 Apr 2017 13:23:22 -0700 Message-ID: <20170418202335.35232-8-michel.thierry@intel.com> References: <20170418202335.35232-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 A58426E0C4 for ; Tue, 18 Apr 2017 20:23:36 +0000 (UTC) In-Reply-To: <20170418202335.35232-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 Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5jCmluZGV4IDYzNDg5M2NkOTNiMy4uOTc0 YmUxZmE3N2Y5IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5jCisr KyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMKQEAgLTE5MzUsNiArMTkzNSw4IEBA IGludCBpOTE1X3Jlc2V0X2VuZ2luZShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpCiAJ aWYgKHJldCkKIAkJZ290byBlcnJvcjsKIAorCWVycm9yLT5yZXNldF9lbmdpbmVfY291bnRbZW5n aW5lLT5pZF0rKzsKKwogd2FrZXVwOgogCWVuYWJsZV9pcnEoZGV2X3ByaXYtPmRybS5pcnEpOwog CWludGVsX3VuY29yZV9mb3JjZXdha2VfcHV0KGRldl9wcml2LCBGT1JDRVdBS0VfQUxMKTsKZGlm ZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2Rydi5oCmluZGV4IGViM2U1YmNkYTQ3OC4uNzFjMzRmMTViZTY0IDEwMDY0 NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZHJ2LmgKQEAgLTk4Miw2ICs5ODIsNyBAQCBzdHJ1Y3QgaTkxNV9ncHVf c3RhdGUgewogCQllbnVtIGludGVsX2VuZ2luZV9oYW5nY2hlY2tfYWN0aW9uIGhhbmdjaGVja19h Y3Rpb247CiAJCXN0cnVjdCBpOTE1X2FkZHJlc3Nfc3BhY2UgKnZtOwogCQlpbnQgbnVtX3JlcXVl c3RzOworCQl1MzIgcmVzZXRfY291bnQ7CiAKIAkJLyogcG9zaXRpb24gb2YgYWN0aXZlIHJlcXVl c3QgaW5zaWRlIHRoZSByaW5nICovCiAJCXUzMiBycV9oZWFkLCBycV9wb3N0LCBycV90YWlsOwpA QCAtMTYxOSw2ICsxNjIwLDcgQEAgc3RydWN0IGk5MTVfZ3B1X2Vycm9yIHsKIAogCS8qIGlmIGF2 YWlsYWJsZSwgZW5naW5lLXNwZWNpZmljIHJlc2V0IGlzIHRyaWVkIGJlZm9yZSBmdWxsIGdwdSBy ZXNldCAqLwogCXUzMiByZXNldF9lbmdpbmVfbWFzazsKKwl1MzIgcmVzZXRfZW5naW5lX2NvdW50 W0k5MTVfTlVNX0VOR0lORVNdOwogCiAJLyoqCiAJICogV2FpdHF1ZXVlIHRvIHNpZ25hbCB3aGVu IGEgaGFuZyBpcyBkZXRlY3RlZC4gVXNlZCB0byBmb3Igd2FpdGVycwpAQCAtMzQ0Miw2ICszNDQ0 LDEyIEBAIHN0YXRpYyBpbmxpbmUgdTMyIGk5MTVfcmVzZXRfY291bnQoc3RydWN0IGk5MTVfZ3B1 X2Vycm9yICplcnJvcikKIAlyZXR1cm4gUkVBRF9PTkNFKGVycm9yLT5yZXNldF9jb3VudCk7CiB9 CiAKK3N0YXRpYyBpbmxpbmUgdTMyIGk5MTVfcmVzZXRfZW5naW5lX2NvdW50KHN0cnVjdCBpOTE1 X2dwdV9lcnJvciAqZXJyb3IsCisJCQkJCSAgc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5l KQoreworCXJldHVybiBSRUFEX09OQ0UoZXJyb3ItPnJlc2V0X2VuZ2luZV9jb3VudFtlbmdpbmUt PmlkXSk7Cit9CisKIGludCBpOTE1X2dlbV9yZXNldF9wcmVwYXJlX2VuZ2luZShzdHJ1Y3QgaW50 ZWxfZW5naW5lX2NzICplbmdpbmUpOwogaW50IGk5MTVfZ2VtX3Jlc2V0X3ByZXBhcmUoc3RydWN0 IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogCQkJICAgdW5zaWduZWQgaW50IGVuZ2luZV9t YXNrKTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3B1X2Vycm9yLmMg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dwdV9lcnJvci5jCmluZGV4IDE0ZTIwNjRiNzY1 My4uYTJmZmIxZWYyY2ZhIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dw dV9lcnJvci5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3B1X2Vycm9yLmMKQEAg LTQ2Myw2ICs0NjMsNyBAQCBzdGF0aWMgdm9pZCBlcnJvcl9wcmludF9lbmdpbmUoc3RydWN0IGRy bV9pOTE1X2Vycm9yX3N0YXRlX2J1ZiAqbSwKIAllcnJfcHJpbnRmKG0sICIgIGhhbmdjaGVjayBh Y3Rpb24gdGltZXN0YW1wOiAlbHUsICV1IG1zIGFnb1xuIiwKIAkJICAgZWUtPmhhbmdjaGVja190 aW1lc3RhbXAsCiAJCSAgIGppZmZpZXNfdG9fbXNlY3MoamlmZmllcyAtIGVlLT5oYW5nY2hlY2tf dGltZXN0YW1wKSk7CisJZXJyX3ByaW50ZihtLCAiICBlbmdpbmUgcmVzZXQgY291bnQ6ICV1XG4i LCBlZS0+cmVzZXRfY291bnQpOwogCiAJZXJyb3JfcHJpbnRfcmVxdWVzdChtLCAiICBFTFNQWzBd OiAiLCAmZWUtPmV4ZWNsaXN0WzBdKTsKIAllcnJvcl9wcmludF9yZXF1ZXN0KG0sICIgIEVMU1Bb MV06ICIsICZlZS0+ZXhlY2xpc3RbMV0pOwpAQCAtMTI0NCw2ICsxMjQ1LDggQEAgc3RhdGljIHZv aWQgZXJyb3JfcmVjb3JkX2VuZ2luZV9yZWdpc3RlcnMoc3RydWN0IGk5MTVfZ3B1X3N0YXRlICpl cnJvciwKIAllZS0+aGFuZ2NoZWNrX3RpbWVzdGFtcCA9IGVuZ2luZS0+aGFuZ2NoZWNrLmFjdGlv bl90aW1lc3RhbXA7CiAJZWUtPmhhbmdjaGVja19hY3Rpb24gPSBlbmdpbmUtPmhhbmdjaGVjay5h Y3Rpb247CiAJZWUtPmhhbmdjaGVja19zdGFsbGVkID0gZW5naW5lLT5oYW5nY2hlY2suc3RhbGxl ZDsKKwllZS0+cmVzZXRfY291bnQgPSBpOTE1X3Jlc2V0X2VuZ2luZV9jb3VudCgmZGV2X3ByaXYt PmdwdV9lcnJvciwKKwkJCQkJCSAgZW5naW5lKTsKIAogCWlmIChVU0VTX1BQR1RUKGRldl9wcml2 KSkgewogCQlpbnQgaTsKLS0gCjIuMTEuMAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMu ZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlz dGluZm8vaW50ZWwtZ2Z4Cg==