From mboxrd@z Thu Jan  1 00:00:00 1970
From: Michel Thierry <michel.thierry@intel.com>
Subject: [PATCH v9 06/21] drm/i915: Add engine reset count to
	error state
Date: Thu, 15 Jun 2017 13:18:13 -0700
Message-ID: <20170615201828.23144-7-michel.thierry@intel.com>
References: <20170615201828.23144-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 mga14.intel.com (mga14.intel.com [192.55.52.115])
 by gabe.freedesktop.org (Postfix) with ESMTPS id 9259A6E80C
 for <intel-gfx@lists.freedesktop.org>; Thu, 15 Jun 2017 20:18:31 +0000 (UTC)
In-Reply-To: <20170615201828.23144-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

RHJpdmVyIG1haW50YWlucyBjb3VudCBvZiBob3cgbWFueSB0aW1lcyBhIGdpdmVuIGVuZ2luZSBp
cyByZXNldCwgdXNlZnVsIHRvCmNhcHR1cmUgdGhpcyBpbiBlcnJvciBzdGF0ZSBhbHNvLiBJdCBn
aXZlcyBhbiBpZGVhIG9mIGhvdyBlbmdpbmUgaXMgY29waW5nCnVwIHdpdGggdGhlIHdvcmtsb2Fk
cyBpdCBpcyBleGVjdXRpbmcgYmVmb3JlIHRoaXMgZXJyb3Igc3RhdGUuCgpBIGZvbGxvdy11cCBw
YXRjaCB3aWxsIHByb3ZpZGUgdGhpcyBpbmZvcm1hdGlvbiBpbiBkZWJ1Z2ZzLgoKdjI6IHMvZW5n
aW5lX3Jlc2V0L3Jlc2V0X2VuZ2luZS8gKENocmlzKQogICAgRGVmaW5lIGNvdW50IGFzIHVuc2ln
bmVkIGludCAoVHZydGtvKQoKQ2M6IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hyaXMtd2lsc29uLmNv
LnVrPgpDYzogTWlrYSBLdW9wcGFsYSA8bWlrYS5rdW9wcGFsYUBsaW51eC5pbnRlbC5jb20+ClNp
Z25lZC1vZmYtYnk6IEFydW4gU2lsdXZlcnkgPGFydW4uc2lsdXZlcnlAbGludXguaW50ZWwuY29t
PgpTaWduZWQtb2ZmLWJ5OiBNaWNoZWwgVGhpZXJyeSA8bWljaGVsLnRoaWVycnlAaW50ZWwuY29t
PgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMgICAgICAgfCAgMyArKysKIGRy
aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggICAgICAgfCAxMCArKysrKysrKysrCiBkcml2
ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dwdV9lcnJvci5jIHwgIDMgKysrCiAzIGZpbGVzIGNoYW5n
ZWQsIDE2IGluc2VydGlvbnMoKykKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p
OTE1X2Rydi5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYwppbmRleCBlOGNiNDYx
N2VjYzAuLjc4ZGYxNDc3MDgwYSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx
NV9kcnYuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5jCkBAIC0xOTU1LDcg
KzE5NTUsMTAgQEAgaW50IGk5MTVfcmVzZXRfZW5naW5lKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3Mg
KmVuZ2luZSkKIAkgKiBwcm9jZXNzIHRvIHByb2dyYW0gUklOR19NT0RFLCBIV1NQIGFuZCByZS1l
bmFibGUgc3VibWlzc2lvbi4KIAkgKi8KIAlyZXQgPSBlbmdpbmUtPmluaXRfaHcoZW5naW5lKTsK
KwlpZiAocmV0KQorCQlnb3RvIG91dDsKIAorCWVycm9yLT5yZXNldF9lbmdpbmVfY291bnRbZW5n
aW5lLT5pZF0rKzsKIG91dDoKIAlyZXR1cm4gcmV0OwogfQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9n
cHUvZHJtL2k5MTUvaTkxNV9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgK
aW5kZXggMTYxMmY0ZDk3NDYzLi42ZTk4YWI1M2Y1NWUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1
L2RybS9pOTE1L2k5MTVfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYu
aApAQCAtOTIzLDYgKzkyMyw3IEBAIHN0cnVjdCBpOTE1X2dwdV9zdGF0ZSB7CiAJCWVudW0gaW50
ZWxfZW5naW5lX2hhbmdjaGVja19hY3Rpb24gaGFuZ2NoZWNrX2FjdGlvbjsKIAkJc3RydWN0IGk5
MTVfYWRkcmVzc19zcGFjZSAqdm07CiAJCWludCBudW1fcmVxdWVzdHM7CisJCXUzMiByZXNldF9j
b3VudDsKIAogCQkvKiBwb3NpdGlvbiBvZiBhY3RpdmUgcmVxdWVzdCBpbnNpZGUgdGhlIHJpbmcg
Ki8KIAkJdTMyIHJxX2hlYWQsIHJxX3Bvc3QsIHJxX3RhaWw7CkBAIC0xNTY2LDYgKzE1NjcsOSBA
QCBzdHJ1Y3QgaTkxNV9ncHVfZXJyb3IgewogI2RlZmluZSBJOTE1X1dFREdFRAkJKEJJVFNfUEVS
X0xPTkcgLSAxKQogI2RlZmluZSBJOTE1X1JFU0VUX0VOR0lORQkoSTkxNV9XRURHRUQgLSBJOTE1
X05VTV9FTkdJTkVTKQogCisJLyoqIE51bWJlciBvZiB0aW1lcyBhbiBlbmdpbmUgaGFzIGJlZW4g
cmVzZXQgKi8KKwl1MzIgcmVzZXRfZW5naW5lX2NvdW50W0k5MTVfTlVNX0VOR0lORVNdOworCiAJ
LyoqCiAJICogV2FpdHF1ZXVlIHRvIHNpZ25hbCB3aGVuIGEgaGFuZyBpcyBkZXRlY3RlZC4gVXNl
ZCB0byBmb3Igd2FpdGVycwogCSAqIHRvIHJlbGVhc2UgdGhlIHN0cnVjdF9tdXRleCBmb3IgdGhl
IHJlc2V0IHRvIHByb2NlZGUuCkBAIC0zNDY4LDYgKzM0NzIsMTIgQEAgc3RhdGljIGlubGluZSB1
MzIgaTkxNV9yZXNldF9jb3VudChzdHJ1Y3QgaTkxNV9ncHVfZXJyb3IgKmVycm9yKQogCXJldHVy
biBSRUFEX09OQ0UoZXJyb3ItPnJlc2V0X2NvdW50KTsKIH0KIAorc3RhdGljIGlubGluZSB1MzIg
aTkxNV9yZXNldF9lbmdpbmVfY291bnQoc3RydWN0IGk5MTVfZ3B1X2Vycm9yICplcnJvciwKKwkJ
CQkJICBzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpCit7CisJcmV0dXJuIFJFQURfT05D
RShlcnJvci0+cmVzZXRfZW5naW5lX2NvdW50W2VuZ2luZS0+aWRdKTsKK30KKwogc3RydWN0IGRy
bV9pOTE1X2dlbV9yZXF1ZXN0ICoKIGk5MTVfZ2VtX3Jlc2V0X3ByZXBhcmVfZW5naW5lKHN0cnVj
dCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSk7CiBpbnQgaTkxNV9nZW1fcmVzZXRfcHJlcGFyZShz
dHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9n
cHUvZHJtL2k5MTUvaTkxNV9ncHVfZXJyb3IuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf
Z3B1X2Vycm9yLmMKaW5kZXggNzYyNjg1YmE4NmRhLi5lYmQ1NTAxZWMxMzQgMTAwNjQ0Ci0tLSBh
L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3B1X2Vycm9yLmMKKysrIGIvZHJpdmVycy9ncHUv
ZHJtL2k5MTUvaTkxNV9ncHVfZXJyb3IuYwpAQCAtNDYzLDYgKzQ2Myw3IEBAIHN0YXRpYyB2b2lk
IGVycm9yX3ByaW50X2VuZ2luZShzdHJ1Y3QgZHJtX2k5MTVfZXJyb3Jfc3RhdGVfYnVmICptLAog
CWVycl9wcmludGYobSwgIiAgaGFuZ2NoZWNrIGFjdGlvbiB0aW1lc3RhbXA6ICVsdSwgJXUgbXMg
YWdvXG4iLAogCQkgICBlZS0+aGFuZ2NoZWNrX3RpbWVzdGFtcCwKIAkJICAgamlmZmllc190b19t
c2VjcyhqaWZmaWVzIC0gZWUtPmhhbmdjaGVja190aW1lc3RhbXApKTsKKwllcnJfcHJpbnRmKG0s
ICIgIGVuZ2luZSByZXNldCBjb3VudDogJXVcbiIsIGVlLT5yZXNldF9jb3VudCk7CiAKIAllcnJv
cl9wcmludF9yZXF1ZXN0KG0sICIgIEVMU1BbMF06ICIsICZlZS0+ZXhlY2xpc3RbMF0pOwogCWVy
cm9yX3ByaW50X3JlcXVlc3QobSwgIiAgRUxTUFsxXTogIiwgJmVlLT5leGVjbGlzdFsxXSk7CkBA
IC0xMjQ0LDYgKzEyNDUsOCBAQCBzdGF0aWMgdm9pZCBlcnJvcl9yZWNvcmRfZW5naW5lX3JlZ2lz
dGVycyhzdHJ1Y3QgaTkxNV9ncHVfc3RhdGUgKmVycm9yLAogCWVlLT5oYW5nY2hlY2tfdGltZXN0
YW1wID0gZW5naW5lLT5oYW5nY2hlY2suYWN0aW9uX3RpbWVzdGFtcDsKIAllZS0+aGFuZ2NoZWNr
X2FjdGlvbiA9IGVuZ2luZS0+aGFuZ2NoZWNrLmFjdGlvbjsKIAllZS0+aGFuZ2NoZWNrX3N0YWxs
ZWQgPSBlbmdpbmUtPmhhbmdjaGVjay5zdGFsbGVkOworCWVlLT5yZXNldF9jb3VudCA9IGk5MTVf
cmVzZXRfZW5naW5lX2NvdW50KCZkZXZfcHJpdi0+Z3B1X2Vycm9yLAorCQkJCQkJICBlbmdpbmUp
OwogCiAJaWYgKFVTRVNfUFBHVFQoZGV2X3ByaXYpKSB7CiAJCWludCBpOwotLSAKMi4xMS4wCgpf
X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZngg
bWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0
cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK