From mboxrd@z Thu Jan  1 00:00:00 1970
From: Michel Thierry <michel.thierry@intel.com>
Subject: [PATCH 07/10] drm/i915/tdr: Add engine reset count to
	error state
Date: Wed, 11 Jan 2017 20:18:14 -0800
Message-ID: <20170112041817.1102-8-michel.thierry@intel.com>
References: <20170112041817.1102-1-michel.thierry@intel.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64
Return-path: <intel-gfx-bounces@lists.freedesktop.org>
Received: from mga04.intel.com (mga04.intel.com [192.55.52.120])
 by gabe.freedesktop.org (Postfix) with ESMTPS id 5E8A26EB11
 for <intel-gfx@lists.freedesktop.org>; Thu, 12 Jan 2017 04:18:19 +0000 (UTC)
In-Reply-To: <20170112041817.1102-1-michel.thierry@intel.com>
List-Unsubscribe: <https://lists.freedesktop.org/mailman/options/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <https://lists.freedesktop.org/archives/intel-gfx>
List-Post: <mailto:intel-gfx@lists.freedesktop.org>
List-Help: <mailto:intel-gfx-request@lists.freedesktop.org?subject=help>
List-Subscribe: <https://lists.freedesktop.org/mailman/listinfo/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=subscribe>
Errors-To: intel-gfx-bounces@lists.freedesktop.org
Sender: "Intel-gfx" <intel-gfx-bounces@lists.freedesktop.org>
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
LQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYyAgICAgICB8IDEgKwogZHJpdmVycy9n
cHUvZHJtL2k5MTUvaTkxNV9kcnYuaCAgICAgICB8IDggKysrKysrKysKIGRyaXZlcnMvZ3B1L2Ry
bS9pOTE1L2k5MTVfZ3B1X2Vycm9yLmMgfCAzICsrKwogMyBmaWxlcyBjaGFuZ2VkLCAxMiBpbnNl
cnRpb25zKCspCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYyBi
L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMKaW5kZXggNjBhN2E0ODc0ODQ4Li44Nzk5
NDI3YjBhNjYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMKKysr
IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYwpAQCAtMTg5NCw2ICsxODk0LDcgQEAg
aW50IGk5MTVfcmVzZXRfZW5naW5lKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKIAlp
ZiAocmV0KQogCQlnb3RvIGVycm9yOwogCisJZXJyb3ItPnJlc2V0X2VuZ2luZV9jb3VudFtlbmdp
bmUtPmlkXSsrOwogCWludGVsX3VuY29yZV9mb3JjZXdha2VfcHV0KGRldl9wcml2LCBGT1JDRVdB
S0VfQUxMKTsKIAlyZXR1cm4gMDsKIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv
aTkxNV9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKaW5kZXggMGM5Mzg2
OTA1MDExLi44NzJjNTk0M2QzYTcgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5
MTVfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaApAQCAtOTQxLDYg
Kzk0MSw3IEBAIHN0cnVjdCBkcm1faTkxNV9lcnJvcl9zdGF0ZSB7CiAJCWVudW0gaW50ZWxfZW5n
aW5lX2hhbmdjaGVja19hY3Rpb24gaGFuZ2NoZWNrX2FjdGlvbjsKIAkJc3RydWN0IGk5MTVfYWRk
cmVzc19zcGFjZSAqdm07CiAJCWludCBudW1fcmVxdWVzdHM7CisJCXUzMiByZXNldF9jb3VudDsK
IAogCQkvKiBwb3NpdGlvbiBvZiBhY3RpdmUgcmVxdWVzdCBpbnNpZGUgdGhlIHJpbmcgKi8KIAkJ
dTMyIHJxX2hlYWQsIHJxX3Bvc3QsIHJxX3RhaWw7CkBAIC0xNTU1LDYgKzE1NTYsNyBAQCBzdHJ1
Y3QgaTkxNV9ncHVfZXJyb3IgewogCiAJLyogaWYgYXZhaWxhYmxlLCBlbmdpbmUtc3BlY2lmaWMg
cmVzZXQgaXMgdHJpZWQgYmVmb3JlIGZ1bGwgZ3B1IHJlc2V0ICovCiAJdTMyIHJlc2V0X2VuZ2lu
ZV9tYXNrOworCXUzMiByZXNldF9lbmdpbmVfY291bnRbSTkxNV9OVU1fRU5HSU5FU107CiAKIAkv
KioKIAkgKiBXYWl0cXVldWUgdG8gc2lnbmFsIHdoZW4gYSBoYW5nIGlzIGRldGVjdGVkLiBVc2Vk
IHRvIGZvciB3YWl0ZXJzCkBAIC0zMzM3LDYgKzMzMzksMTIgQEAgc3RhdGljIGlubGluZSB1MzIg
aTkxNV9yZXNldF9jb3VudChzdHJ1Y3QgaTkxNV9ncHVfZXJyb3IgKmVycm9yKQogCXJldHVybiBS
RUFEX09OQ0UoZXJyb3ItPnJlc2V0X2NvdW50KTsKIH0KIAorc3RhdGljIGlubGluZSB1MzIgaTkx
NV9yZXNldF9lbmdpbmVfY291bnQoc3RydWN0IGk5MTVfZ3B1X2Vycm9yICplcnJvciwKKwkJCQkJ
ICBzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpCit7CisJcmV0dXJuIFJFQURfT05DRShl
cnJvci0+cmVzZXRfZW5naW5lX2NvdW50W2VuZ2luZS0+aWRdKTsKK30KKwogdm9pZCBpOTE1X2dl
bV9yZXNldF9wcmVwYXJlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdik7CiB2b2lk
IGk5MTVfZ2VtX3Jlc2V0X2ZpbmlzaChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYp
Owogdm9pZCBpOTE1X2dlbV9zZXRfd2VkZ2VkKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZf
cHJpdik7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dwdV9lcnJvci5j
IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ncHVfZXJyb3IuYwppbmRleCAzOTZjNmYwZmQw
MzMuLjk1ZGJjNTUxYmQ5MiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9n
cHVfZXJyb3IuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dwdV9lcnJvci5jCkBA
IC00NTMsNiArNDUzLDcgQEAgc3RhdGljIHZvaWQgZXJyb3JfcHJpbnRfZW5naW5lKHN0cnVjdCBk
cm1faTkxNV9lcnJvcl9zdGF0ZV9idWYgKm0sCiAJZXJyX3ByaW50ZihtLCAiICBoYW5nY2hlY2sg
YWN0aW9uIHRpbWVzdGFtcDogJWx1LCAldSBtcyBhZ29cbiIsCiAJCSAgIGVlLT5oYW5nY2hlY2tf
dGltZXN0YW1wLAogCQkgICBqaWZmaWVzX3RvX21zZWNzKGppZmZpZXMgLSBlZS0+aGFuZ2NoZWNr
X3RpbWVzdGFtcCkpOworCWVycl9wcmludGYobSwgIiAgZW5naW5lIHJlc2V0IGNvdW50OiAldVxu
IiwgZWUtPnJlc2V0X2NvdW50KTsKIAogCWVycm9yX3ByaW50X3JlcXVlc3QobSwgIiAgRUxTUFsw
XTogIiwgJmVlLT5leGVjbGlzdFswXSk7CiAJZXJyb3JfcHJpbnRfcmVxdWVzdChtLCAiICBFTFNQ
WzFdOiAiLCAmZWUtPmV4ZWNsaXN0WzFdKTsKQEAgLTExNzAsNiArMTE3MSw4IEBAIHN0YXRpYyB2
b2lkIGVycm9yX3JlY29yZF9lbmdpbmVfcmVnaXN0ZXJzKHN0cnVjdCBkcm1faTkxNV9lcnJvcl9z
dGF0ZSAqZXJyb3IsCiAJZWUtPmhhbmdjaGVja190aW1lc3RhbXAgPSBlbmdpbmUtPmhhbmdjaGVj
ay5hY3Rpb25fdGltZXN0YW1wOwogCWVlLT5oYW5nY2hlY2tfYWN0aW9uID0gZW5naW5lLT5oYW5n
Y2hlY2suYWN0aW9uOwogCWVlLT5oYW5nY2hlY2tfc3RhbGxlZCA9IGVuZ2luZS0+aGFuZ2NoZWNr
LnN0YWxsZWQ7CisJZWUtPnJlc2V0X2NvdW50ID0gaTkxNV9yZXNldF9lbmdpbmVfY291bnQoJmRl
dl9wcml2LT5ncHVfZXJyb3IsCisJCQkJCQkgIGVuZ2luZSk7CiAKIAlpZiAoVVNFU19QUEdUVChk
ZXZfcHJpdikpIHsKIAkJaW50IGk7Ci0tIAoyLjExLjAKCl9fX19fX19fX19fX19fX19fX19fX19f
X19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4
QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWls
bWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=