From: Michel Thierry Subject: [PATCH v8 05/20] drm/i915: Add engine reset count to error state Date: Mon, 22 May 2017 10:46:26 -0700 Message-ID: <20170522174641.25354-6-michel.thierry@intel.com> References: <20170522174641.25354-1-michel.thierry@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTPS id C06DC6E256 for ; Mon, 22 May 2017 17:46:46 +0000 (UTC) In-Reply-To: <20170522174641.25354-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 RHJpdmVyIG1haW50YWlucyBjb3VudCBvZiBob3cgbWFueSB0aW1lcyBhIGdpdmVuIGVuZ2luZSBp cyByZXNldCwgdXNlZnVsIHRvCmNhcHR1cmUgdGhpcyBpbiBlcnJvciBzdGF0ZSBhbHNvLiBJdCBn aXZlcyBhbiBpZGVhIG9mIGhvdyBlbmdpbmUgaXMgY29waW5nCnVwIHdpdGggdGhlIHdvcmtsb2Fk cyBpdCBpcyBleGVjdXRpbmcgYmVmb3JlIHRoaXMgZXJyb3Igc3RhdGUuCgpBIGZvbGxvdy11cCBw YXRjaCB3aWxsIHByb3ZpZGUgdGhpcyBpbmZvcm1hdGlvbiBpbiBkZWJ1Z2ZzLgoKdjI6IHMvZW5n aW5lX3Jlc2V0L3Jlc2V0X2VuZ2luZS8gKENocmlzKQogICAgRGVmaW5lIGNvdW50IGFzIHVuc2ln bmVkIGludCAoVHZydGtvKQoKQ2M6IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hyaXMtd2lsc29uLmNv LnVrPgpDYzogTWlrYSBLdW9wcGFsYSA8bWlrYS5rdW9wcGFsYUBsaW51eC5pbnRlbC5jb20+ClNp Z25lZC1vZmYtYnk6IEFydW4gU2lsdXZlcnkgPGFydW4uc2lsdXZlcnlAbGludXguaW50ZWwuY29t PgpTaWduZWQtb2ZmLWJ5OiBNaWNoZWwgVGhpZXJyeSA8bWljaGVsLnRoaWVycnlAaW50ZWwuY29t PgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMgICAgICAgfCAgMyArKysKIGRy aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggICAgICAgfCAxMCArKysrKysrKysrCiBkcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dwdV9lcnJvci5jIHwgIDMgKysrCiAzIGZpbGVzIGNoYW5n ZWQsIDE2IGluc2VydGlvbnMoKykKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2Rydi5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYwppbmRleCA3OTI1ZTEw M2M4YmQuLjUxNjYzYWJkYTVkYiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx NV9kcnYuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5jCkBAIC0xOTI1LDcg KzE5MjUsMTAgQEAgaW50IGk5MTVfcmVzZXRfZW5naW5lKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3Mg KmVuZ2luZSkKIAkgKiBwcm9jZXNzIHRvIHByb2dyYW0gUklOR19NT0RFLCBIV1NQIGFuZCByZS1l bmFibGUgc3VibWlzc2lvbi4KIAkgKi8KIAlyZXQgPSBlbmdpbmUtPmluaXRfaHcoZW5naW5lKTsK KwlpZiAocmV0KQorCQlnb3RvIG91dDsKIAorCWVycm9yLT5yZXNldF9lbmdpbmVfY291bnRbZW5n aW5lLT5pZF0rKzsKIG91dDoKIAlyZXR1cm4gcmV0OwogfQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgK aW5kZXggZjlmZDg0OWRhYjhiLi5hZGE5ZTJjYzk2OWMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYu aApAQCAtOTIwLDYgKzkyMCw3IEBAIHN0cnVjdCBpOTE1X2dwdV9zdGF0ZSB7CiAJCWVudW0gaW50 ZWxfZW5naW5lX2hhbmdjaGVja19hY3Rpb24gaGFuZ2NoZWNrX2FjdGlvbjsKIAkJc3RydWN0IGk5 MTVfYWRkcmVzc19zcGFjZSAqdm07CiAJCWludCBudW1fcmVxdWVzdHM7CisJCXUzMiByZXNldF9j b3VudDsKIAogCQkvKiBwb3NpdGlvbiBvZiBhY3RpdmUgcmVxdWVzdCBpbnNpZGUgdGhlIHJpbmcg Ki8KIAkJdTMyIHJxX2hlYWQsIHJxX3Bvc3QsIHJxX3RhaWw7CkBAIC0xNTYyLDYgKzE1NjMsOSBA QCBzdHJ1Y3QgaTkxNV9ncHVfZXJyb3IgewogI2RlZmluZSBJOTE1X1JFU0VUX0VOR0lORV9JTl9Q Uk9HUkVTUwkyCiAjZGVmaW5lIEk5MTVfV0VER0VECQkoQklUU19QRVJfTE9ORyAtIDEpCiAKKwkv KiogTnVtYmVyIG9mIHRpbWVzIGFuIGVuZ2luZSBoYXMgYmVlbiByZXNldCAqLworCXUzMiByZXNl dF9lbmdpbmVfY291bnRbSTkxNV9OVU1fRU5HSU5FU107CisKIAkvKioKIAkgKiBXYWl0cXVldWUg dG8gc2lnbmFsIHdoZW4gYSBoYW5nIGlzIGRldGVjdGVkLiBVc2VkIHRvIGZvciB3YWl0ZXJzCiAJ ICogdG8gcmVsZWFzZSB0aGUgc3RydWN0X211dGV4IGZvciB0aGUgcmVzZXQgdG8gcHJvY2VkZS4K QEAgLTM0MTcsNiArMzQyMSwxMiBAQCBzdGF0aWMgaW5saW5lIHUzMiBpOTE1X3Jlc2V0X2NvdW50 KHN0cnVjdCBpOTE1X2dwdV9lcnJvciAqZXJyb3IpCiAJcmV0dXJuIFJFQURfT05DRShlcnJvci0+ cmVzZXRfY291bnQpOwogfQogCitzdGF0aWMgaW5saW5lIHUzMiBpOTE1X3Jlc2V0X2VuZ2luZV9j b3VudChzdHJ1Y3QgaTkxNV9ncHVfZXJyb3IgKmVycm9yLAorCQkJCQkgIHN0cnVjdCBpbnRlbF9l bmdpbmVfY3MgKmVuZ2luZSkKK3sKKwlyZXR1cm4gUkVBRF9PTkNFKGVycm9yLT5yZXNldF9lbmdp bmVfY291bnRbZW5naW5lLT5pZF0pOworfQorCiBzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3Qg KgogaTkxNV9nZW1fcmVzZXRfcHJlcGFyZV9lbmdpbmUoc3RydWN0IGludGVsX2VuZ2luZV9jcyAq ZW5naW5lKTsKIGludCBpOTE1X2dlbV9yZXNldF9wcmVwYXJlKHN0cnVjdCBkcm1faTkxNV9wcml2 YXRlICpkZXZfcHJpdik7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dw dV9lcnJvci5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ncHVfZXJyb3IuYwppbmRleCA3 NjI2ODViYTg2ZGEuLmViZDU1MDFlYzEzNCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9ncHVfZXJyb3IuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dwdV9l cnJvci5jCkBAIC00NjMsNiArNDYzLDcgQEAgc3RhdGljIHZvaWQgZXJyb3JfcHJpbnRfZW5naW5l KHN0cnVjdCBkcm1faTkxNV9lcnJvcl9zdGF0ZV9idWYgKm0sCiAJZXJyX3ByaW50ZihtLCAiICBo YW5nY2hlY2sgYWN0aW9uIHRpbWVzdGFtcDogJWx1LCAldSBtcyBhZ29cbiIsCiAJCSAgIGVlLT5o YW5nY2hlY2tfdGltZXN0YW1wLAogCQkgICBqaWZmaWVzX3RvX21zZWNzKGppZmZpZXMgLSBlZS0+ aGFuZ2NoZWNrX3RpbWVzdGFtcCkpOworCWVycl9wcmludGYobSwgIiAgZW5naW5lIHJlc2V0IGNv dW50OiAldVxuIiwgZWUtPnJlc2V0X2NvdW50KTsKIAogCWVycm9yX3ByaW50X3JlcXVlc3QobSwg IiAgRUxTUFswXTogIiwgJmVlLT5leGVjbGlzdFswXSk7CiAJZXJyb3JfcHJpbnRfcmVxdWVzdCht LCAiICBFTFNQWzFdOiAiLCAmZWUtPmV4ZWNsaXN0WzFdKTsKQEAgLTEyNDQsNiArMTI0NSw4IEBA IHN0YXRpYyB2b2lkIGVycm9yX3JlY29yZF9lbmdpbmVfcmVnaXN0ZXJzKHN0cnVjdCBpOTE1X2dw dV9zdGF0ZSAqZXJyb3IsCiAJZWUtPmhhbmdjaGVja190aW1lc3RhbXAgPSBlbmdpbmUtPmhhbmdj aGVjay5hY3Rpb25fdGltZXN0YW1wOwogCWVlLT5oYW5nY2hlY2tfYWN0aW9uID0gZW5naW5lLT5o YW5nY2hlY2suYWN0aW9uOwogCWVlLT5oYW5nY2hlY2tfc3RhbGxlZCA9IGVuZ2luZS0+aGFuZ2No ZWNrLnN0YWxsZWQ7CisJZWUtPnJlc2V0X2NvdW50ID0gaTkxNV9yZXNldF9lbmdpbmVfY291bnQo JmRldl9wcml2LT5ncHVfZXJyb3IsCisJCQkJCQkgIGVuZ2luZSk7CiAKIAlpZiAoVVNFU19QUEdU VChkZXZfcHJpdikpIHsKIAkJaW50IGk7Ci0tIAoyLjExLjAKCl9fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwt Z2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9t YWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=