From mboxrd@z Thu Jan  1 00:00:00 1970
From: Matthew Auld <matthew.auld@intel.com>
Subject: [PATCH 5/7] drm/i915/tdr: Add engine reset count to
	error state
Date: Mon, 19 Sep 2016 16:30:17 +0100
Message-ID: <1474299019-26430-5-git-send-email-matthew.auld@intel.com>
References: <1474299019-26430-1-git-send-email-matthew.auld@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 CFE316E48C
 for <intel-gfx@lists.freedesktop.org>; Mon, 19 Sep 2016 15:32:47 +0000 (UTC)
In-Reply-To: <1474299019-26430-1-git-send-email-matthew.auld@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

RnJvbTogImFydW4uc2lsdXZlcnlAbGludXguaW50ZWwuY29tIiA8YXJ1bi5zaWx1dmVyeUBsaW51
eC5pbnRlbC5jb20+CgpEcml2ZXIgbWFpbnRhaW5zIGNvdW50IG9mIGhvdyBtYW55IHRpbWVzIGEg
Z2l2ZW4gZW5naW5lIGlzIHJlc2V0LCB1c2VmdWwgdG8KY2FwdHVyZSB0aGlzIGluIGVycm9yIHN0
YXRlIGFsc28uIEl0IGdpdmVzIGFuIGlkZWEgb2YgaG93IGVuZ2luZSBpcyBjb3BpbmcKdXAgd2l0
aCB0aGUgd29ya2xvYWRzIGl0IGlzIGV4ZWN1dGluZyBiZWZvcmUgdGhpcyBlcnJvciBzdGF0ZS4K
CnYyCiAgLSByZWJhc2UKCkNjOiBDaHJpcyBXaWxzb24gPGNocmlzQGNocmlzLXdpbHNvbi5jby51
az4KQ2M6IE1pa2EgS3VvcHBhbGEgPG1pa2Eua3VvcHBhbGFAbGludXguaW50ZWwuY29tPgpTaWdu
ZWQtb2ZmLWJ5OiBBcnVuIFNpbHV2ZXJ5IDxhcnVuLnNpbHV2ZXJ5QGxpbnV4LmludGVsLmNvbT4K
U2lnbmVkLW9mZi1ieTogTWF0dGhldyBBdWxkIDxtYXR0aGV3LmF1bGRAaW50ZWwuY29tPgotLS0K
IGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMgICAgICAgfCAxICsKIGRyaXZlcnMvZ3B1
L2RybS9pOTE1L2k5MTVfZHJ2LmggICAgICAgfCA5ICsrKysrKysrKwogZHJpdmVycy9ncHUvZHJt
L2k5MTUvaTkxNV9ncHVfZXJyb3IuYyB8IDMgKysrCiAzIGZpbGVzIGNoYW5nZWQsIDEzIGluc2Vy
dGlvbnMoKykKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5jIGIv
ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYwppbmRleCA4NjI1MjA3Li4wMDE3YWI1IDEw
MDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5jCisrKyBiL2RyaXZlcnMv
Z3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMKQEAgLTE4NTcsNiArMTg1Nyw3IEBAIGludCBpOTE1X3Jl
c2V0X2VuZ2luZShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpCiAJaW50ZWxfZW5naW5l
X3Jlc2V0X2NhbmNlbChlbmdpbmUpOwogCWludGVsX2V4ZWNsaXN0c19yZXN0YXJ0X3N1Ym1pc3Np
b24oZW5naW5lKTsKIAorCWRldl9wcml2LT5ncHVfZXJyb3IuZW5naW5lX3Jlc2V0X2NvdW50W2Vu
Z2luZS0+aWRdKys7CiAJaW50ZWxfdW5jb3JlX2ZvcmNld2FrZV9wdXQoZGV2X3ByaXYsIEZPUkNF
V0FLRV9BTEwpOwogCXJldHVybiAwOwogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkx
NS9pOTE1X2Rydi5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAppbmRleCAzZGNm
M2Y2Li43MjJhZWEzIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5o
CisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKQEAgLTc3NCw2ICs3NzQsNyBA
QCBzdHJ1Y3QgZHJtX2k5MTVfZXJyb3Jfc3RhdGUgewogCQllbnVtIGludGVsX2VuZ2luZV9oYW5n
Y2hlY2tfYWN0aW9uIGhhbmdjaGVja19hY3Rpb247CiAJCXN0cnVjdCBpOTE1X2FkZHJlc3Nfc3Bh
Y2UgKnZtOwogCQlpbnQgbnVtX3JlcXVlc3RzOworCQl1MzIgcmVzZXRfY291bnQ7CiAKIAkJLyog
b3VyIG93biB0cmFja2luZyBvZiByaW5nIGhlYWQgYW5kIHRhaWwgKi8KIAkJdTMyIGNwdV9yaW5n
X2hlYWQ7CkBAIC0xNDMxLDYgKzE0MzIsOCBAQCBzdHJ1Y3QgaTkxNV9ncHVfZXJyb3IgewogI2Rl
ZmluZSBJOTE1X1JFU0VUX0lOX1BST0dSRVNTCTAKICNkZWZpbmUgSTkxNV9XRURHRUQJCShCSVRT
X1BFUl9MT05HIC0gMSkKIAorCXVuc2lnbmVkIGxvbmcgZW5naW5lX3Jlc2V0X2NvdW50W0k5MTVf
TlVNX0VOR0lORVNdOworCiAJLyoqCiAJICogV2FpdHF1ZXVlIHRvIHNpZ25hbCB3aGVuIGEgaGFu
ZyBpcyBkZXRlY3RlZC4gVXNlZCB0byBmb3Igd2FpdGVycwogCSAqIHRvIHJlbGVhc2UgdGhlIHN0
cnVjdF9tdXRleCBmb3IgdGhlIHJlc2V0IHRvIHByb2NlZGUuCkBAIC0zMjY4LDYgKzMyNzEsMTIg
QEAgc3RhdGljIGlubGluZSB1MzIgaTkxNV9yZXNldF9jb3VudChzdHJ1Y3QgaTkxNV9ncHVfZXJy
b3IgKmVycm9yKQogCXJldHVybiBSRUFEX09OQ0UoZXJyb3ItPnJlc2V0X2NvdW50KTsKIH0KIAor
c3RhdGljIGlubGluZSB1MzIgaTkxNV9lbmdpbmVfcmVzZXRfY291bnQoc3RydWN0IGk5MTVfZ3B1
X2Vycm9yICplcnJvciwKKwkJCQkJICBzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpCit7
CisJcmV0dXJuIFJFQURfT05DRShlcnJvci0+ZW5naW5lX3Jlc2V0X2NvdW50W2VuZ2luZS0+aWRd
KTsKK30KKwogdm9pZCBpOTE1X2dlbV9yZXNldChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2
X3ByaXYpOwogdm9pZCBpOTE1X2dlbV9zZXRfd2VkZ2VkKHN0cnVjdCBkcm1faTkxNV9wcml2YXRl
ICpkZXZfcHJpdik7CiB2b2lkIGk5MTVfZ2VtX3Jlc2V0X2VuZ2luZShzdHJ1Y3QgaW50ZWxfZW5n
aW5lX2NzICplbmdpbmUpOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9n
cHVfZXJyb3IuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3B1X2Vycm9yLmMKaW5kZXgg
MzM0ZjE1ZC4uOTA1YjY0OSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9n
cHVfZXJyb3IuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dwdV9lcnJvci5jCkBA
IC0yOTYsNiArMjk2LDcgQEAgc3RhdGljIHZvaWQgZXJyb3JfcHJpbnRfZW5naW5lKHN0cnVjdCBk
cm1faTkxNV9lcnJvcl9zdGF0ZV9idWYgKm0sCiAJZXJyX3ByaW50ZihtLCAiICBoYW5nY2hlY2s6
ICVzIFslZF1cbiIsCiAJCSAgIGhhbmdjaGVja19hY3Rpb25fdG9fc3RyKGVlLT5oYW5nY2hlY2tf
YWN0aW9uKSwKIAkJICAgZWUtPmhhbmdjaGVja19zY29yZSk7CisJZXJyX3ByaW50ZihtLCAiICBl
bmdpbmUgcmVzZXQgY291bnQ6ICV1XG4iLCBlZS0+cmVzZXRfY291bnQpOwogfQogCiB2b2lkIGk5
MTVfZXJyb3JfcHJpbnRmKHN0cnVjdCBkcm1faTkxNV9lcnJvcl9zdGF0ZV9idWYgKmUsIGNvbnN0
IGNoYXIgKmYsIC4uLikKQEAgLTEwNTYsNiArMTA1Nyw4IEBAIHN0YXRpYyB2b2lkIGVycm9yX3Jl
Y29yZF9lbmdpbmVfcmVnaXN0ZXJzKHN0cnVjdCBkcm1faTkxNV9lcnJvcl9zdGF0ZSAqZXJyb3Is
CiAKIAllZS0+aGFuZ2NoZWNrX3Njb3JlID0gZW5naW5lLT5oYW5nY2hlY2suc2NvcmU7CiAJZWUt
PmhhbmdjaGVja19hY3Rpb24gPSBlbmdpbmUtPmhhbmdjaGVjay5hY3Rpb247CisJZWUtPnJlc2V0
X2NvdW50ID0gaTkxNV9lbmdpbmVfcmVzZXRfY291bnQoJmRldl9wcml2LT5ncHVfZXJyb3IsCisJ
CQkJCQkgIGVuZ2luZSk7CiAKIAlpZiAoVVNFU19QUEdUVChkZXZfcHJpdikpIHsKIAkJaW50IGk7
Ci0tIAoyLjcuNAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f
X18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3Jn
Cmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4
Cg==