From mboxrd@z Thu Jan  1 00:00:00 1970
From: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
Subject: [PATCH v2 2/2] drm/i915/selftests: Fix live_workarounds
 to actually do resets
Date: Fri, 30 Nov 2018 09:52:11 +0000
Message-ID: <20181130095211.23849-1-tvrtko.ursulin@linux.intel.com>
References: <20181130080254.15383-2-tvrtko.ursulin@linux.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 mga07.intel.com (mga07.intel.com [134.134.136.100])
 by gabe.freedesktop.org (Postfix) with ESMTPS id B4CE76E5E8
 for <Intel-gfx@lists.freedesktop.org>; Fri, 30 Nov 2018 09:52:15 +0000 (UTC)
In-Reply-To: <20181130080254.15383-2-tvrtko.ursulin@linux.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

RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KClRoZSB0ZXN0
IHdhcyBtaXNzaW5nIHNvbWUgbWFnaWMgaW5ncmVkaWVudHMgdG8gYWN0dWFsbHkgdHJpZ2dlciB0
aGUKcmVzZXRzLgoKSW4gY2FzZSBvZiB0aGUgZnVsbCByZXNldCB3ZSBuZWVkIHRoZSBJOTE1X1JF
U0VUX0hBTkRPRkYgZmxhZyBzZXQsIGFuZCBpbgpjYXNlIG9mIGVuZ2luZSByZXNldCB3ZSBuZWVk
IGEgYnVzeSByZXF1ZXN0LgoKVGhhbmtzIHRvIENocmlzIGZvciBoZWxwaW5nIHdpdGggcmVzZXQg
bWFnaWMuCgp2MjoKICogR3JhYiBSUE0gcmVmIG92ZXIgcmVzZXQuCgpTaWduZWQtb2ZmLWJ5OiBU
dnJ0a28gVXJzdWxpbiA8dHZydGtvLnVyc3VsaW5AaW50ZWwuY29tPgpDYzogQ2hyaXMgV2lsc29u
IDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+Ci0tLQogLi4uL2RybS9pOTE1L3NlbGZ0ZXN0cy9p
bnRlbF93b3JrYXJvdW5kcy5jICAgIHwgNjUgKysrKysrKysrKysrKysrLS0tLQogMSBmaWxlIGNo
YW5nZWQsIDUzIGluc2VydGlvbnMoKyksIDEyIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2Ry
aXZlcnMvZ3B1L2RybS9pOTE1L3NlbGZ0ZXN0cy9pbnRlbF93b3JrYXJvdW5kcy5jIGIvZHJpdmVy
cy9ncHUvZHJtL2k5MTUvc2VsZnRlc3RzL2ludGVsX3dvcmthcm91bmRzLmMKaW5kZXggZDFhMDky
M2QyZjM4Li44MDM5NmIzNTkyZjUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L3Nl
bGZ0ZXN0cy9pbnRlbF93b3JrYXJvdW5kcy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L3Nl
bGZ0ZXN0cy9pbnRlbF93b3JrYXJvdW5kcy5jCkBAIC02LDYgKzYsNyBAQAogCiAjaW5jbHVkZSAi
Li4vaTkxNV9zZWxmdGVzdC5oIgogCisjaW5jbHVkZSAiaWd0X3NwaW5uZXIuaCIKICNpbmNsdWRl
ICJpZ3Rfd2VkZ2VfbWUuaCIKICNpbmNsdWRlICJtb2NrX2NvbnRleHQuaCIKIApAQCAtMTU5LDM1
ICsxNjAsNTcgQEAgc3RhdGljIGludCBjaGVja193aGl0ZWxpc3QoY29uc3Qgc3RydWN0IHdoaXRl
bGlzdCAqdywKIAogc3RhdGljIGludCBkb19kZXZpY2VfcmVzZXQoc3RydWN0IGludGVsX2VuZ2lu
ZV9jcyAqZW5naW5lKQogewotCWk5MTVfcmVzZXQoZW5naW5lLT5pOTE1LCBFTkdJTkVfTUFTSyhl
bmdpbmUtPmlkKSwgTlVMTCk7CisJc2V0X2JpdChJOTE1X1JFU0VUX0hBTkRPRkYsICZlbmdpbmUt
Pmk5MTUtPmdwdV9lcnJvci5mbGFncyk7CisJaTkxNV9yZXNldChlbmdpbmUtPmk5MTUsIEVOR0lO
RV9NQVNLKGVuZ2luZS0+aWQpLCAibGl2ZV93b3JrYXJvdW5kcyIpOwogCXJldHVybiAwOwogfQog
CiBzdGF0aWMgaW50IGRvX2VuZ2luZV9yZXNldChzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdp
bmUpCiB7Ci0JcmV0dXJuIGk5MTVfcmVzZXRfZW5naW5lKGVuZ2luZSwgTlVMTCk7CisJcmV0dXJu
IGk5MTVfcmVzZXRfZW5naW5lKGVuZ2luZSwgImxpdmVfd29ya2Fyb3VuZHMiKTsKIH0KIAotc3Rh
dGljIGludCBzd2l0Y2hfdG9fc2NyYXRjaF9jb250ZXh0KHN0cnVjdCBpbnRlbF9lbmdpbmVfY3Mg
KmVuZ2luZSkKK3N0YXRpYyBpbnQKK3N3aXRjaF90b19zY3JhdGNoX2NvbnRleHQoc3RydWN0IGlu
dGVsX2VuZ2luZV9jcyAqZW5naW5lLAorCQkJICBzdHJ1Y3QgaWd0X3NwaW5uZXIgKnNwaW4pCiB7
CiAJc3RydWN0IGk5MTVfZ2VtX2NvbnRleHQgKmN0eDsKIAlzdHJ1Y3QgaTkxNV9yZXF1ZXN0ICpy
cTsKKwlpbnQgZXJyID0gMDsKIAogCWN0eCA9IGtlcm5lbF9jb250ZXh0KGVuZ2luZS0+aTkxNSk7
CiAJaWYgKElTX0VSUihjdHgpKQogCQlyZXR1cm4gUFRSX0VSUihjdHgpOwogCiAJaW50ZWxfcnVu
dGltZV9wbV9nZXQoZW5naW5lLT5pOTE1KTsKLQlycSA9IGk5MTVfcmVxdWVzdF9hbGxvYyhlbmdp
bmUsIGN0eCk7CisKKwlpZiAoc3BpbikKKwkJcnEgPSBpZ3Rfc3Bpbm5lcl9jcmVhdGVfcmVxdWVz
dChzcGluLCBjdHgsIGVuZ2luZSwgTUlfTk9PUCk7CisJZWxzZQorCQlycSA9IGk5MTVfcmVxdWVz
dF9hbGxvYyhlbmdpbmUsIGN0eCk7CisKIAlpbnRlbF9ydW50aW1lX3BtX3B1dChlbmdpbmUtPmk5
MTUpOwogCiAJa2VybmVsX2NvbnRleHRfY2xvc2UoY3R4KTsKLQlpZiAoSVNfRVJSKHJxKSkKLQkJ
cmV0dXJuIFBUUl9FUlIocnEpOworCisJaWYgKElTX0VSUihycSkpIHsKKwkJc3BpbiA9IE5VTEw7
CisJCWVyciA9IFBUUl9FUlIocnEpOworCQlnb3RvIGVycjsKKwl9CiAKIAlpOTE1X3JlcXVlc3Rf
YWRkKHJxKTsKIAotCXJldHVybiAwOworCWlmIChzcGluICYmICFpZ3Rfd2FpdF9mb3Jfc3Bpbm5l
cihzcGluLCBycSkpIHsKKwkJcHJfZXJyKCJTcGlubmVyIGZhaWxlZCB0byBzdGFydFxuIik7CisJ
CWVyciA9IC1FVElNRURPVVQ7CisJfQorCitlcnI6CisJaWYgKGVyciAmJiBzcGluKQorCQlpZ3Rf
c3Bpbm5lcl9lbmQoc3Bpbik7CisKKwlyZXR1cm4gZXJyOwogfQogCiBzdGF0aWMgaW50IGNoZWNr
X3doaXRlbGlzdF9hY3Jvc3NfcmVzZXQoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lLApA
QCAtMTk1LDEwICsyMTgsMjIgQEAgc3RhdGljIGludCBjaGVja193aGl0ZWxpc3RfYWNyb3NzX3Jl
c2V0KHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSwKIAkJCQkJY29uc3Qgc3RydWN0IHdo
aXRlbGlzdCAqdywKIAkJCQkJY29uc3QgY2hhciAqbmFtZSkKIHsKKwlzdHJ1Y3QgZHJtX2k5MTVf
cHJpdmF0ZSAqaTkxNSA9IGVuZ2luZS0+aTkxNTsKKwlib29sIHdhbnRfc3BpbiA9IHJlc2V0ID09
IGRvX2VuZ2luZV9yZXNldDsKIAlzdHJ1Y3QgaTkxNV9nZW1fY29udGV4dCAqY3R4OworCXN0cnVj
dCBpZ3Rfc3Bpbm5lciBzcGluOwogCWludCBlcnI7CiAKLQljdHggPSBrZXJuZWxfY29udGV4dChl
bmdpbmUtPmk5MTUpOworCXByX2luZm8oIkNoZWNraW5nICVkIHdoaXRlbGlzdGVkIHJlZ2lzdGVy
cyAoUklOR19OT05QUklWKSBbJXNdXG4iLAorCQl3LT5jb3VudCwgbmFtZSk7CisKKwlpZiAod2Fu
dF9zcGluKSB7CisJCWVyciA9IGlndF9zcGlubmVyX2luaXQoJnNwaW4sIGk5MTUpOworCQlpZiAo
ZXJyKQorCQkJcmV0dXJuIGVycjsKKwl9CisKKwljdHggPSBrZXJuZWxfY29udGV4dChpOTE1KTsK
IAlpZiAoSVNfRVJSKGN0eCkpCiAJCXJldHVybiBQVFJfRVJSKGN0eCk7CiAKQEAgLTIwOCwxMSAr
MjQzLDE5IEBAIHN0YXRpYyBpbnQgY2hlY2tfd2hpdGVsaXN0X2Fjcm9zc19yZXNldChzdHJ1Y3Qg
aW50ZWxfZW5naW5lX2NzICplbmdpbmUsCiAJCWdvdG8gb3V0OwogCX0KIAotCWVyciA9IHN3aXRj
aF90b19zY3JhdGNoX2NvbnRleHQoZW5naW5lKTsKKwllcnIgPSBzd2l0Y2hfdG9fc2NyYXRjaF9j
b250ZXh0KGVuZ2luZSwgd2FudF9zcGluID8gJnNwaW4gOiBOVUxMKTsKIAlpZiAoZXJyKQogCQln
b3RvIG91dDsKIAorCWludGVsX3J1bnRpbWVfcG1fZ2V0KGk5MTUpOwogCWVyciA9IHJlc2V0KGVu
Z2luZSk7CisJaW50ZWxfcnVudGltZV9wbV9wdXQoaTkxNSk7CisKKwlpZiAod2FudF9zcGluKSB7
CisJCWlndF9zcGlubmVyX2VuZCgmc3Bpbik7CisJCWlndF9zcGlubmVyX2ZpbmkoJnNwaW4pOwor
CX0KKwogCWlmIChlcnIpIHsKIAkJcHJfZXJyKCIlcyByZXNldCBmYWlsZWRcbiIsIG5hbWUpOwog
CQlnb3RvIG91dDsKQEAgLTIyNyw3ICsyNzAsNyBAQCBzdGF0aWMgaW50IGNoZWNrX3doaXRlbGlz
dF9hY3Jvc3NfcmVzZXQoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lLAogCiAJa2VybmVs
X2NvbnRleHRfY2xvc2UoY3R4KTsKIAotCWN0eCA9IGtlcm5lbF9jb250ZXh0KGVuZ2luZS0+aTkx
NSk7CisJY3R4ID0ga2VybmVsX2NvbnRleHQoaTkxNSk7CiAJaWYgKElTX0VSUihjdHgpKQogCQly
ZXR1cm4gUFRSX0VSUihjdHgpOwogCkBAIC0yNTksOCArMzAyLDYgQEAgc3RhdGljIGludCBsaXZl
X3Jlc2V0X3doaXRlbGlzdCh2b2lkICphcmcpCiAJaWYgKCF3aGl0ZWxpc3RfYnVpbGQoZW5naW5l
LCAmdykpCiAJCXJldHVybiAwOwogCi0JcHJfaW5mbygiQ2hlY2tpbmcgJWQgd2hpdGVsaXN0ZWQg
cmVnaXN0ZXJzIChSSU5HX05PTlBSSVYpXG4iLCB3LmNvdW50KTsKLQogCXNldF9iaXQoSTkxNV9S
RVNFVF9CQUNLT0ZGLCAmZXJyb3ItPmZsYWdzKTsKIAlzZXRfYml0KEk5MTVfUkVTRVRfRU5HSU5F
ICsgZW5naW5lLT5pZCwgJmVycm9yLT5mbGFncyk7CiAKLS0gCjIuMTkuMQoKX19fX19fX19fX19f
X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlz
dApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0
b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==