From mboxrd@z Thu Jan  1 00:00:00 1970
From: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
Subject: [PATCH 2/2] drm/i915/selftests: Fix live_workarounds to
 actually do resets
Date: Fri, 30 Nov 2018 08:02:54 +0000
Message-ID: <20181130080254.15383-2-tvrtko.ursulin@linux.intel.com>
References: <20181130080254.15383-1-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 mga05.intel.com (mga05.intel.com [192.55.52.43])
 by gabe.freedesktop.org (Postfix) with ESMTPS id 0D99E6E586
 for <Intel-gfx@lists.freedesktop.org>; Fri, 30 Nov 2018 08:03:01 +0000 (UTC)
In-Reply-To: <20181130080254.15383-1-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
bWFnaWMuCgpTaWduZWQtb2ZmLWJ5OiBUdnJ0a28gVXJzdWxpbiA8dHZydGtvLnVyc3VsaW5AaW50
ZWwuY29tPgpDYzogQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+Ci0tLQog
Li4uL2RybS9pOTE1L3NlbGZ0ZXN0cy9pbnRlbF93b3JrYXJvdW5kcy5jICAgIHwgNTggKysrKysr
KysrKysrKysrLS0tLQogMSBmaWxlIGNoYW5nZWQsIDQ4IGluc2VydGlvbnMoKyksIDEwIGRlbGV0
aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L3NlbGZ0ZXN0cy9pbnRl
bF93b3JrYXJvdW5kcy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvc2VsZnRlc3RzL2ludGVsX3dv
cmthcm91bmRzLmMKaW5kZXggZDFhMDkyM2QyZjM4Li44ZTQ5YzAwNWQ0ZGIgMTAwNjQ0Ci0tLSBh
L2RyaXZlcnMvZ3B1L2RybS9pOTE1L3NlbGZ0ZXN0cy9pbnRlbF93b3JrYXJvdW5kcy5jCisrKyBi
L2RyaXZlcnMvZ3B1L2RybS9pOTE1L3NlbGZ0ZXN0cy9pbnRlbF93b3JrYXJvdW5kcy5jCkBAIC02
LDYgKzYsNyBAQAogCiAjaW5jbHVkZSAiLi4vaTkxNV9zZWxmdGVzdC5oIgogCisjaW5jbHVkZSAi
aWd0X3NwaW5uZXIuaCIKICNpbmNsdWRlICJpZ3Rfd2VkZ2VfbWUuaCIKICNpbmNsdWRlICJtb2Nr
X2NvbnRleHQuaCIKIApAQCAtMTU5LDM1ICsxNjAsNTcgQEAgc3RhdGljIGludCBjaGVja193aGl0
ZWxpc3QoY29uc3Qgc3RydWN0IHdoaXRlbGlzdCAqdywKIAogc3RhdGljIGludCBkb19kZXZpY2Vf
cmVzZXQoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKQogewotCWk5MTVfcmVzZXQoZW5n
aW5lLT5pOTE1LCBFTkdJTkVfTUFTSyhlbmdpbmUtPmlkKSwgTlVMTCk7CisJc2V0X2JpdChJOTE1
X1JFU0VUX0hBTkRPRkYsICZlbmdpbmUtPmk5MTUtPmdwdV9lcnJvci5mbGFncyk7CisJaTkxNV9y
ZXNldChlbmdpbmUtPmk5MTUsIEVOR0lORV9NQVNLKGVuZ2luZS0+aWQpLCAibGl2ZV93b3JrYXJv
dW5kcyIpOwogCXJldHVybiAwOwogfQogCiBzdGF0aWMgaW50IGRvX2VuZ2luZV9yZXNldChzdHJ1
Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpCiB7Ci0JcmV0dXJuIGk5MTVfcmVzZXRfZW5naW5l
KGVuZ2luZSwgTlVMTCk7CisJcmV0dXJuIGk5MTVfcmVzZXRfZW5naW5lKGVuZ2luZSwgImxpdmVf
d29ya2Fyb3VuZHMiKTsKIH0KIAotc3RhdGljIGludCBzd2l0Y2hfdG9fc2NyYXRjaF9jb250ZXh0
KHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKK3N0YXRpYyBpbnQKK3N3aXRjaF90b19z
Y3JhdGNoX2NvbnRleHQoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lLAorCQkJICBzdHJ1
Y3QgaWd0X3NwaW5uZXIgKnNwaW4pCiB7CiAJc3RydWN0IGk5MTVfZ2VtX2NvbnRleHQgKmN0eDsK
IAlzdHJ1Y3QgaTkxNV9yZXF1ZXN0ICpycTsKKwlpbnQgZXJyID0gMDsKIAogCWN0eCA9IGtlcm5l
bF9jb250ZXh0KGVuZ2luZS0+aTkxNSk7CiAJaWYgKElTX0VSUihjdHgpKQogCQlyZXR1cm4gUFRS
X0VSUihjdHgpOwogCiAJaW50ZWxfcnVudGltZV9wbV9nZXQoZW5naW5lLT5pOTE1KTsKLQlycSA9
IGk5MTVfcmVxdWVzdF9hbGxvYyhlbmdpbmUsIGN0eCk7CisKKwlpZiAoc3BpbikKKwkJcnEgPSBp
Z3Rfc3Bpbm5lcl9jcmVhdGVfcmVxdWVzdChzcGluLCBjdHgsIGVuZ2luZSwgTUlfTk9PUCk7CisJ
ZWxzZQorCQlycSA9IGk5MTVfcmVxdWVzdF9hbGxvYyhlbmdpbmUsIGN0eCk7CisKIAlpbnRlbF9y
dW50aW1lX3BtX3B1dChlbmdpbmUtPmk5MTUpOwogCiAJa2VybmVsX2NvbnRleHRfY2xvc2UoY3R4
KTsKLQlpZiAoSVNfRVJSKHJxKSkKLQkJcmV0dXJuIFBUUl9FUlIocnEpOworCisJaWYgKElTX0VS
UihycSkpIHsKKwkJc3BpbiA9IE5VTEw7CisJCWVyciA9IFBUUl9FUlIocnEpOworCQlnb3RvIGVy
cjsKKwl9CiAKIAlpOTE1X3JlcXVlc3RfYWRkKHJxKTsKIAotCXJldHVybiAwOworCWlmIChzcGlu
ICYmICFpZ3Rfd2FpdF9mb3Jfc3Bpbm5lcihzcGluLCBycSkpIHsKKwkJcHJfZXJyKCJTcGlubmVy
IGZhaWxlZCB0byBzdGFydFxuIik7CisJCWVyciA9IC1FVElNRURPVVQ7CisJfQorCitlcnI6CisJ
aWYgKGVyciAmJiBzcGluKQorCQlpZ3Rfc3Bpbm5lcl9lbmQoc3Bpbik7CisKKwlyZXR1cm4gZXJy
OwogfQogCiBzdGF0aWMgaW50IGNoZWNrX3doaXRlbGlzdF9hY3Jvc3NfcmVzZXQoc3RydWN0IGlu
dGVsX2VuZ2luZV9jcyAqZW5naW5lLApAQCAtMTk1LDkgKzIxOCwyMCBAQCBzdGF0aWMgaW50IGNo
ZWNrX3doaXRlbGlzdF9hY3Jvc3NfcmVzZXQoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5l
LAogCQkJCQljb25zdCBzdHJ1Y3Qgd2hpdGVsaXN0ICp3LAogCQkJCQljb25zdCBjaGFyICpuYW1l
KQogeworCWJvb2wgd2FudF9zcGluID0gcmVzZXQgPT0gZG9fZW5naW5lX3Jlc2V0OwogCXN0cnVj
dCBpOTE1X2dlbV9jb250ZXh0ICpjdHg7CisJc3RydWN0IGlndF9zcGlubmVyIHNwaW47CiAJaW50
IGVycjsKIAorCXByX2luZm8oIkNoZWNraW5nICVkIHdoaXRlbGlzdGVkIHJlZ2lzdGVycyAoUklO
R19OT05QUklWKSBbJXNdXG4iLAorCQl3LT5jb3VudCwgbmFtZSk7CisKKwlpZiAod2FudF9zcGlu
KSB7CisJCWVyciA9IGlndF9zcGlubmVyX2luaXQoJnNwaW4sIGVuZ2luZS0+aTkxNSk7CisJCWlm
IChlcnIpCisJCQlyZXR1cm4gZXJyOworCX0KKwogCWN0eCA9IGtlcm5lbF9jb250ZXh0KGVuZ2lu
ZS0+aTkxNSk7CiAJaWYgKElTX0VSUihjdHgpKQogCQlyZXR1cm4gUFRSX0VSUihjdHgpOwpAQCAt
MjA4LDExICsyNDIsMTcgQEAgc3RhdGljIGludCBjaGVja193aGl0ZWxpc3RfYWNyb3NzX3Jlc2V0
KHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSwKIAkJZ290byBvdXQ7CiAJfQogCi0JZXJy
ID0gc3dpdGNoX3RvX3NjcmF0Y2hfY29udGV4dChlbmdpbmUpOworCWVyciA9IHN3aXRjaF90b19z
Y3JhdGNoX2NvbnRleHQoZW5naW5lLCB3YW50X3NwaW4gPyAmc3BpbiA6IE5VTEwpOwogCWlmIChl
cnIpCiAJCWdvdG8gb3V0OwogCiAJZXJyID0gcmVzZXQoZW5naW5lKTsKKworCWlmICh3YW50X3Nw
aW4pIHsKKwkJaWd0X3NwaW5uZXJfZW5kKCZzcGluKTsKKwkJaWd0X3NwaW5uZXJfZmluaSgmc3Bp
bik7CisJfQorCiAJaWYgKGVycikgewogCQlwcl9lcnIoIiVzIHJlc2V0IGZhaWxlZFxuIiwgbmFt
ZSk7CiAJCWdvdG8gb3V0OwpAQCAtMjU5LDggKzI5OSw2IEBAIHN0YXRpYyBpbnQgbGl2ZV9yZXNl
dF93aGl0ZWxpc3Qodm9pZCAqYXJnKQogCWlmICghd2hpdGVsaXN0X2J1aWxkKGVuZ2luZSwgJncp
KQogCQlyZXR1cm4gMDsKIAotCXByX2luZm8oIkNoZWNraW5nICVkIHdoaXRlbGlzdGVkIHJlZ2lz
dGVycyAoUklOR19OT05QUklWKVxuIiwgdy5jb3VudCk7Ci0KIAlzZXRfYml0KEk5MTVfUkVTRVRf
QkFDS09GRiwgJmVycm9yLT5mbGFncyk7CiAJc2V0X2JpdChJOTE1X1JFU0VUX0VOR0lORSArIGVu
Z2luZS0+aWQsICZlcnJvci0+ZmxhZ3MpOwogCi0tIAoyLjE5LjEKCl9fX19fX19fX19fX19fX19f
X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50
ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9y
Zy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=