From mboxrd@z Thu Jan  1 00:00:00 1970
From: Chris Wilson <chris@chris-wilson.co.uk>
Subject: [PATCH] drm/i915/selftests: Wait for idle between idle
 resets as well
Date: Wed, 11 Apr 2018 13:03:46 +0100
Message-ID: <20180411120346.27618-1-chris@chris-wilson.co.uk>
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 fireflyinternet.com (mail.fireflyinternet.com [109.228.58.192])
 by gabe.freedesktop.org (Postfix) with ESMTPS id 2779B6E5B0
 for <intel-gfx@lists.freedesktop.org>; Wed, 11 Apr 2018 12:04:01 +0000 (UTC)
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

RXZlbiB0aG91Z2ggd2Ugd2VyZW4ndCBpbmplY3RpbmcgZ3VpbHR5IHJlcXVlc3RzIHRvIGJlIHJl
c2V0LCB3ZSBjb3VsZApzdGlsbCBmYWxsIG92ZXIgdGhlIGlzc3VlIG9mIHJlc2V0dGluZyB0aGUg
c2FtZSByZXF1ZXN0IHRvbyBmYXN0IC0tIHdoZXJlCnRoZSBHUFUgcmVmdXNlcyB0byBzdGFydCBh
Z2Fpbi4gKEFsdGhvdWdoIGl0IGlzIGludGVyZXN0aW5nIHRvIG5vdGUgdGhhdApyZWxvYWRpbmcg
dGhlIGRyaXZlciBpcyBzdWZmaWNpZW50LCBzdWdnZXN0aW5nIHRoYXQgd2UgY291bGQgcmVjb3Zl
ciBpZgp3ZSBkZWxheWVkIHRoZSBzZXR1cCBhZnRlciByZXNldD8pIENvbnRpbnVlIHRvIHBhcGVy
IG92ZXIgdGhlIHByb2JsZW0gYnkKYWRkaW5nIGEgc21hbGwgZGVsYXkgYnkgd2FpdGluZyBmb3Ig
dGhlIGVuZ2luZSB0byBpZGxlIGJldHdlZW4gdGVzdHMsCmFuZCBlbnN1cmUgdGhhdCB0aGUgZW5n
aW5lcyBhcmUgaWRsZSBiZWZvcmUgc3RhcnRpbmcgdGhlIGlkbGUgdGVzdHMuCgpSZWZlcmVuY2Vz
OiAwMjg2NjY3OTNhMDIgKCJkcm0vaTkxNS9zZWxmdGVzdHM6IEF2b2lkIHJlcGVhdGVkbHkgaGFy
bWluZyB0aGUgc2FtZSBpbm5vY2VudCBjb250ZXh0IikKU2lnbmVkLW9mZi1ieTogQ2hyaXMgV2ls
c29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+CkNjOiBNaWthIEt1b3BwYWxhIDxtaWthLmt1
b3BwYWxhQGxpbnV4LmludGVsLmNvbT4KQ2M6IE1pY2hhxYIgV2luaWFyc2tpIDxtaWNoYWwud2lu
aWFyc2tpQGludGVsLmNvbT4KQ2M6IE1pY2hlbCBUaGllcnJ5IDxtaWNoZWwudGhpZXJyeUBpbnRl
bC5jb20+CkNjOiBUdnJ0a28gVXJzdWxpbiA8dHZydGtvLnVyc3VsaW5AaW50ZWwuY29tPgotLS0K
IC4uLi9ncHUvZHJtL2k5MTUvc2VsZnRlc3RzL2ludGVsX2hhbmdjaGVjay5jICB8IDQ4ICsrKysr
KysrKysrKysrKysrKy0KIDEgZmlsZSBjaGFuZ2VkLCA0NyBpbnNlcnRpb25zKCspLCAxIGRlbGV0
aW9uKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvc2VsZnRlc3RzL2ludGVs
X2hhbmdjaGVjay5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvc2VsZnRlc3RzL2ludGVsX2hhbmdj
aGVjay5jCmluZGV4IDI0ZjkxM2YyNmE3Yi4uN2UyM2U2YTY3MTljIDEwMDY0NAotLS0gYS9kcml2
ZXJzL2dwdS9kcm0vaTkxNS9zZWxmdGVzdHMvaW50ZWxfaGFuZ2NoZWNrLmMKKysrIGIvZHJpdmVy
cy9ncHUvZHJtL2k5MTUvc2VsZnRlc3RzL2ludGVsX2hhbmdjaGVjay5jCkBAIC00NTQsNiArNDU0
LDExIEBAIHN0YXRpYyBpbnQgaWd0X2dsb2JhbF9yZXNldCh2b2lkICphcmcpCiAJcmV0dXJuIGVy
cjsKIH0KIAorc3RhdGljIGJvb2wgd2FpdF9mb3JfaWRsZShzdHJ1Y3QgaW50ZWxfZW5naW5lX2Nz
ICplbmdpbmUpCit7CisJcmV0dXJuIHdhaXRfZm9yKGludGVsX2VuZ2luZV9pc19pZGxlKGVuZ2lu
ZSksIDUwKSA9PSAwOworfQorCiBzdGF0aWMgaW50IF9faWd0X3Jlc2V0X2VuZ2luZShzdHJ1Y3Qg
ZHJtX2k5MTVfcHJpdmF0ZSAqaTkxNSwgYm9vbCBhY3RpdmUpCiB7CiAJc3RydWN0IGludGVsX2Vu
Z2luZV9jcyAqZW5naW5lOwpAQCAtNDgxLDYgKzQ4NiwxMyBAQCBzdGF0aWMgaW50IF9faWd0X3Jl
c2V0X2VuZ2luZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqaTkxNSwgYm9vbCBhY3RpdmUpCiAJ
CWlmIChhY3RpdmUgJiYgIWludGVsX2VuZ2luZV9jYW5fc3RvcmVfZHdvcmQoZW5naW5lKSkKIAkJ
CWNvbnRpbnVlOwogCisJCWlmICghd2FpdF9mb3JfaWRsZShlbmdpbmUpKSB7CisJCQlwcl9lcnIo
IiVzIGZhaWxlZCB0byBpZGxlIGJlZm9yZSByZXNldFxuIiwKKwkJCSAgICAgICBlbmdpbmUtPm5h
bWUpOworCQkJZXJyID0gLUVJTzsKKwkJCWJyZWFrOworCQl9CisKIAkJcmVzZXRfY291bnQgPSBp
OTE1X3Jlc2V0X2NvdW50KCZpOTE1LT5ncHVfZXJyb3IpOwogCQlyZXNldF9lbmdpbmVfY291bnQg
PSBpOTE1X3Jlc2V0X2VuZ2luZV9jb3VudCgmaTkxNS0+Z3B1X2Vycm9yLAogCQkJCQkJCSAgICAg
ZW5naW5lKTsKQEAgLTU0Miw2ICs1NTQsMTkgQEAgc3RhdGljIGludCBfX2lndF9yZXNldF9lbmdp
bmUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmk5MTUsIGJvb2wgYWN0aXZlKQogCQkJCWVyciA9
IC1FSU5WQUw7CiAJCQkJYnJlYWs7CiAJCQl9CisKKwkJCWlmICghd2FpdF9mb3JfaWRsZShlbmdp
bmUpKSB7CisJCQkJc3RydWN0IGRybV9wcmludGVyIHAgPQorCQkJCQlkcm1faW5mb19wcmludGVy
KGk5MTUtPmRybS5kZXYpOworCisJCQkJcHJfZXJyKCIlcyBmYWlsZWQgdG8gaWRsZSBhZnRlciBy
ZXNldFxuIiwKKwkJCQkgICAgICAgZW5naW5lLT5uYW1lKTsKKwkJCQlpbnRlbF9lbmdpbmVfZHVt
cChlbmdpbmUsICZwLAorCQkJCQkJICAiJXNcbiIsIGVuZ2luZS0+bmFtZSk7CisKKwkJCQllcnIg
PSAtRUlPOworCQkJCWJyZWFrOworCQkJfQogCQl9IHdoaWxlICh0aW1lX2JlZm9yZShqaWZmaWVz
LCBlbmRfdGltZSkpOwogCQljbGVhcl9iaXQoSTkxNV9SRVNFVF9FTkdJTkUgKyBpZCwgJmk5MTUt
PmdwdV9lcnJvci5mbGFncyk7CiAKQEAgLTY5Niw2ICs3MjEsMTMgQEAgc3RhdGljIGludCBfX2ln
dF9yZXNldF9lbmdpbmVzKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICppOTE1LAogCQkgICAgIWlu
dGVsX2VuZ2luZV9jYW5fc3RvcmVfZHdvcmQoZW5naW5lKSkKIAkJCWNvbnRpbnVlOwogCisJCWlm
ICghd2FpdF9mb3JfaWRsZShlbmdpbmUpKSB7CisJCQlwcl9lcnIoImk5MTVfcmVzZXRfZW5naW5l
KCVzOiVzKTogZmFpbGVkIHRvIGlkbGUgYmVmb3JlIHJlc2V0XG4iLAorCQkJICAgICAgIGVuZ2lu
ZS0+bmFtZSwgdGVzdF9uYW1lKTsKKwkJCWVyciA9IC1FSU87CisJCQlicmVhazsKKwkJfQorCiAJ
CW1lbXNldCh0aHJlYWRzLCAwLCBzaXplb2YodGhyZWFkcykpOwogCQlmb3JfZWFjaF9lbmdpbmUo
b3RoZXIsIGk5MTUsIHRtcCkgewogCQkJc3RydWN0IHRhc2tfc3RydWN0ICp0c2s7CkBAIC03NzIs
NiArODA0LDIwIEBAIHN0YXRpYyBpbnQgX19pZ3RfcmVzZXRfZW5naW5lcyhzdHJ1Y3QgZHJtX2k5
MTVfcHJpdmF0ZSAqaTkxNSwKIAkJCQlpOTE1X3JlcXVlc3Rfd2FpdChycSwgMCwgTUFYX1NDSEVE
VUxFX1RJTUVPVVQpOwogCQkJCWk5MTVfcmVxdWVzdF9wdXQocnEpOwogCQkJfQorCisJCQlpZiAo
IShmbGFncyAmIFRFU1RfU0VMRikgJiYgIXdhaXRfZm9yX2lkbGUoZW5naW5lKSkgeworCQkJCXN0
cnVjdCBkcm1fcHJpbnRlciBwID0KKwkJCQkJZHJtX2luZm9fcHJpbnRlcihpOTE1LT5kcm0uZGV2
KTsKKworCQkJCXByX2VycigiaTkxNV9yZXNldF9lbmdpbmUoJXM6JXMpOiIKKwkJCQkgICAgICAg
IiBmYWlsZWQgdG8gaWRsZSBhZnRlciByZXNldFxuIiwKKwkJCQkgICAgICAgZW5naW5lLT5uYW1l
LCB0ZXN0X25hbWUpOworCQkJCWludGVsX2VuZ2luZV9kdW1wKGVuZ2luZSwgJnAsCisJCQkJCQkg
ICIlc1xuIiwgZW5naW5lLT5uYW1lKTsKKworCQkJCWVyciA9IC1FSU87CisJCQkJYnJlYWs7CisJ
CQl9CiAJCX0gd2hpbGUgKHRpbWVfYmVmb3JlKGppZmZpZXMsIGVuZF90aW1lKSk7CiAJCWNsZWFy
X2JpdChJOTE1X1JFU0VUX0VOR0lORSArIGlkLCAmaTkxNS0+Z3B1X2Vycm9yLmZsYWdzKTsKIAkJ
cHJfaW5mbygiaTkxNV9yZXNldF9lbmdpbmUoJXM6JXMpOiAlbHUgcmVzZXRzXG4iLApAQCAtOTgx
LDcgKzEwMjcsNyBAQCBzdGF0aWMgaW50IHdhaXRfZm9yX290aGVycyhzdHJ1Y3QgZHJtX2k5MTVf
cHJpdmF0ZSAqaTkxNSwKIAkJaWYgKGVuZ2luZSA9PSBleGNsdWRlKQogCQkJY29udGludWU7CiAK
LQkJaWYgKHdhaXRfZm9yKGludGVsX2VuZ2luZV9pc19pZGxlKGVuZ2luZSksIDEwKSkKKwkJaWYg
KCF3YWl0X2Zvcl9pZGxlKGVuZ2luZSkpCiAJCQlyZXR1cm4gLUVJTzsKIAl9CiAKLS0gCjIuMTcu
MAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwt
Z2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8v
bGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==