From mboxrd@z Thu Jan  1 00:00:00 1970
From: Chris Wilson <chris@chris-wilson.co.uk>
Subject: [PATCH 11/21] drm/i915: Perform a direct reset of the
	GPU from the waiter
Date: Mon,  5 Sep 2016 14:04:28 +0100
Message-ID: <20160905130438.31046-12-chris@chris-wilson.co.uk>
References: <20160905130438.31046-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 mail-wm0-x242.google.com (mail-wm0-x242.google.com
 [IPv6:2a00:1450:400c:c09::242])
 by gabe.freedesktop.org (Postfix) with ESMTPS id 7E25F6E3B4
 for <intel-gfx@lists.freedesktop.org>; Mon,  5 Sep 2016 13:04:58 +0000 (UTC)
Received: by mail-wm0-x242.google.com with SMTP id a6so2075237wmc.2
 for <intel-gfx@lists.freedesktop.org>; Mon, 05 Sep 2016 06:04:58 -0700 (PDT)
In-Reply-To: <20160905130438.31046-1-chris@chris-wilson.co.uk>
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
Cc: mika.kuoppala@intel.com
List-Id: intel-gfx@lists.freedesktop.org

SWYgYSB3YWl0ZXIgaXMgaG9sZGluZyB0aGUgc3RydWN0X211dGV4LCB0aGVuIHRoZSByZXNldCB3
b3JrZXIgY2Fubm90CnJlc2V0IHRoZSBHUFUgdW50aWwgdGhlIHdhaXRlciByZXR1cm5zLiBXZSBk
byBub3Qgd2FudCB0byByZXR1cm4gLUVBR0FJTgpmb3JtIGk5MTVfd2FpdF9yZXF1ZXN0IGFzIHRo
YXQgYnJlYWtzIGRlbGljYXRlIG9wZXJhdGlvbnMgbGlrZQppOTE1X3ZtYV91bmJpbmQoKSB3aGlj
aCBvZnRlbiBjYW5ub3QgYmUgcmVzdGFydGVkIGVhc2lseSwgYW5kIHJldHVybmluZwotRUlPIGlz
IGp1c3QgYXMgdXNlbGVzcyAoYW5kIGhhcyBpbiB0aGUgcGFzdCBwcm92ZW4gZGFuZ2Vyb3VzKS4g
VGhlCnJlbWFpbmluZyBXQVJOX09OKGk5MTVfd2FpdF9yZXF1ZXN0KSBzZXJ2ZSBhcyBhIHZhbHVh
YmxlIHJlbWluZGVyIHRoYXQKaGFuZGxpbmcgZXJyb3JzIGZyb20gYW4gaW5kZWZpbml0ZSB3YWl0
IGFyZSB0cmlja3kuCgpXZSBjYW4ga2VlcCB0aGUgY3VycmVudCBzZW1hbnRpYyB0aGF0IGtub3dp
bmcgYWZ0ZXIgYSByZXNldCBpcyBjb21wbGV0ZSwKc28gaXMgdGhlIHJlcXVlc3QsIGJ5IHBlcmZv
cm1pbmcgdGhlIHJlc2V0IG91cnNlbHZlcyBpZiB3ZSBob2xkIHRoZQptdXRleC4KCnVldmVudCBl
bWlzc2lvbiBpcyBzdGlsbCBoYW5kbGVkIGJ5IHRoZSByZXNldCB3b3JrZXIsIHNvIGl0IG1heSBh
cHBlYXIKc2xpZ2h0bHkgb3V0IG9mIG9yZGVyIHdpdGggcmVzcGVjdCB0byB0aGUgYWN0dWFsIHJl
c2V0IChhbmQgY29uY3VycmVudAp1c2Ugb2YgdGhlIGRldmljZSkuCgpTaWduZWQtb2ZmLWJ5OiBD
aHJpcyBXaWxzb24gPGNocmlzQGNocmlzLXdpbHNvbi5jby51az4KLS0tCiBkcml2ZXJzL2dwdS9k
cm0vaTkxNS9pOTE1X2Rydi5jICAgICAgICAgfCAxMSArKysrKystLS0tLQogZHJpdmVycy9ncHUv
ZHJtL2k5MTUvaTkxNV9kcnYuaCAgICAgICAgIHwgMTUgKysrLS0tLS0tLS0tLS0tCiBkcml2ZXJz
L2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9yZXF1ZXN0LmMgfCAxNyArKysrKysrKysrKysrKysrKwog
ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9pcnEuYyAgICAgICAgIHwgIDIgKysKIGRyaXZlcnMv
Z3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuYyB8ICAzIC0tLQogNSBmaWxlcyBjaGFuZ2Vk
LCAyOCBpbnNlcnRpb25zKCspLCAyMCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJz
L2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYu
YwppbmRleCA0N2E2NzZkODU5ZGIuLmZmNDE3M2U2ZTI5OCAxMDA2NDQKLS0tIGEvZHJpdmVycy9n
cHUvZHJtL2k5MTUvaTkxNV9kcnYuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Ry
di5jCkBAIC0xNzI5LDYgKzE3MjksOCBAQCBpbnQgaTkxNV9yZXN1bWVfc3dpdGNoZXJvbyhzdHJ1
Y3QgZHJtX2RldmljZSAqZGV2KQogICogUmVzZXQgdGhlIGNoaXAuICBVc2VmdWwgaWYgYSBoYW5n
IGlzIGRldGVjdGVkLiBSZXR1cm5zIHplcm8gb24gc3VjY2Vzc2Z1bAogICogcmVzZXQgb3Igb3Ro
ZXJ3aXNlIGFuIGVycm9yIGNvZGUuCiAgKgorICogQ2FsbGVyIG11c3QgaG9sZCB0aGUgc3RydWN0
X211dGV4LgorICoKICAqIFByb2NlZHVyZSBpcyBmYWlybHkgc2ltcGxlOgogICogICAtIHJlc2V0
IHRoZSBjaGlwIHVzaW5nIHRoZSByZXNldCByZWcKICAqICAgLSByZS1pbml0IGNvbnRleHQgc3Rh
dGUKQEAgLTE3NDMsNyArMTc0NSwxMCBAQCBpbnQgaTkxNV9yZXNldChzdHJ1Y3QgZHJtX2k5MTVf
cHJpdmF0ZSAqZGV2X3ByaXYpCiAJc3RydWN0IGk5MTVfZ3B1X2Vycm9yICplcnJvciA9ICZkZXZf
cHJpdi0+Z3B1X2Vycm9yOwogCWludCByZXQ7CiAKLQltdXRleF9sb2NrKCZkZXYtPnN0cnVjdF9t
dXRleCk7CisJbG9ja2RlcF9hc3NlcnRfaGVsZCgmZGV2LT5zdHJ1Y3RfbXV0ZXgpOworCisJaWYg
KCF0ZXN0X2FuZF9jbGVhcl9iaXQoSTkxNV9SRVNFVF9JTl9QUk9HUkVTUywgJmVycm9yLT5mbGFn
cykpCisJCXJldHVybiB0ZXN0X2JpdChJOTE1X1dFREdFRCwgJmVycm9yLT5mbGFncykgPyAtRUlP
IDogMDsKIAogCS8qIENsZWFyIGFueSBwcmV2aW91cyBmYWlsZWQgYXR0ZW1wdHMgYXQgcmVjb3Zl
cnkuIFRpbWUgdG8gdHJ5IGFnYWluLiAqLwogCV9fY2xlYXJfYml0KEk5MTVfV0VER0VELCAmZXJy
b3ItPmZsYWdzKTsKQEAgLTE3ODQsOSArMTc4OSw2IEBAIGludCBpOTE1X3Jlc2V0KHN0cnVjdCBk
cm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAkJZ290byBlcnJvcjsKIAl9CiAKLQljbGVhcl9i
aXQoSTkxNV9SRVNFVF9JTl9QUk9HUkVTUywgJmVycm9yLT5mbGFncyk7Ci0JbXV0ZXhfdW5sb2Nr
KCZkZXYtPnN0cnVjdF9tdXRleCk7Ci0KIAkvKgogCSAqIHJwcy9yYzYgcmUtaW5pdCBpcyBuZWNl
c3NhcnkgdG8gcmVzdG9yZSBzdGF0ZSBsb3N0IGFmdGVyIHRoZQogCSAqIHJlc2V0IGFuZCB0aGUg
cmUtaW5zdGFsbCBvZiBndCBpcnFzLiBTa2lwIGZvciBpcm9ubGFrZSBwZXIKQEAgLTE4MDAsNyAr
MTgwMiw2IEBAIGludCBpOTE1X3Jlc2V0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJp
dikKIAogZXJyb3I6CiAJc2V0X2JpdChJOTE1X1dFREdFRCwgJmVycm9yLT5mbGFncyk7Ci0JbXV0
ZXhfdW5sb2NrKCZkZXYtPnN0cnVjdF9tdXRleCk7CiAJcmV0dXJuIHJldDsKIH0KIApkaWZmIC0t
Z2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9p
OTE1L2k5MTVfZHJ2LmgKaW5kZXggMzE0ZDQxNWM4NzhkLi4wZDBhZDU2MjY0NTMgMTAwNjQ0Ci0t
LSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJt
L2k5MTUvaTkxNV9kcnYuaApAQCAtMzg1Nyw3ICszODU3LDkgQEAgd2FpdF9yZW1haW5pbmdfbXNf
ZnJvbV9qaWZmaWVzKHVuc2lnbmVkIGxvbmcgdGltZXN0YW1wX2ppZmZpZXMsIGludCB0b193YWl0
X21zKQogCQkJICAgIHNjaGVkdWxlX3RpbWVvdXRfdW5pbnRlcnJ1cHRpYmxlKHJlbWFpbmluZ19q
aWZmaWVzKTsKIAl9CiB9Ci1zdGF0aWMgaW5saW5lIGJvb2wgX19pOTE1X3JlcXVlc3RfaXJxX2Nv
bXBsZXRlKHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxKQorCitzdGF0aWMgaW5saW5l
IGJvb2wKK19faTkxNV9yZXF1ZXN0X2lycV9jb21wbGV0ZShzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3Jl
cXVlc3QgKnJlcSkKIHsKIAlzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUgPSByZXEtPmVu
Z2luZTsKIApAQCAtMzkxOSwxNyArMzkyMSw2IEBAIHN0YXRpYyBpbmxpbmUgYm9vbCBfX2k5MTVf
cmVxdWVzdF9pcnFfY29tcGxldGUoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEpCiAJ
CQlyZXR1cm4gdHJ1ZTsKIAl9CiAKLQkvKiBXZSBuZWVkIHRvIGNoZWNrIHdoZXRoZXIgYW55IGdw
dSByZXNldCBoYXBwZW5lZCBpbiBiZXR3ZWVuCi0JICogdGhlIHJlcXVlc3QgYmVpbmcgc3VibWl0
dGVkIGFuZCBub3cuIElmIGEgcmVzZXQgaGFzIG9jY3VycmVkLAotCSAqIHRoZSBzZXFubyB3aWxs
IGhhdmUgYmVlbiBhZHZhbmNlIHBhc3Qgb3VycyBhbmQgb3VyIHJlcXVlc3QKLQkgKiBpcyBjb21w
bGV0ZS4gSWYgd2UgYXJlIGluIHRoZSBwcm9jZXNzIG9mIGhhbmRsaW5nIGEgcmVzZXQsCi0JICog
dGhlIHJlcXVlc3QgaXMgZWZmZWN0aXZlbHkgY29tcGxldGUgYXMgdGhlIHJlbmRlcmluZyB3aWxs
Ci0JICogYmUgZGlzY2FyZGVkLCBidXQgd2UgbmVlZCB0byByZXR1cm4gaW4gb3JkZXIgdG8gZHJv
cCB0aGUKLQkgKiBzdHJ1Y3RfbXV0ZXguCi0JICovCi0JaWYgKGk5MTVfcmVzZXRfaW5fcHJvZ3Jl
c3MoJnJlcS0+aTkxNS0+Z3B1X2Vycm9yKSkKLQkJcmV0dXJuIHRydWU7Ci0KIAlyZXR1cm4gZmFs
c2U7CiB9CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX3JlcXVl
c3QuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX3JlcXVlc3QuYwppbmRleCBmODU4
OWVmZWMzMTAuLmEyZGNiODU1OTQzNSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv
aTkxNV9nZW1fcmVxdWVzdC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX3Jl
cXVlc3QuYwpAQCAtNzEwLDYgKzcxMCwyMyBAQCB3YWtldXA6CiAJCWlmIChfX2k5MTVfcmVxdWVz
dF9pcnFfY29tcGxldGUocmVxKSkKIAkJCWJyZWFrOwogCisJCS8qIElmIHRoZSBHUFUgaXMgaHVu
ZywgYW5kIHdlIGhvbGQgdGhlIGxvY2ssIHJlc2V0IHRoZSBHUFUKKwkJICogYW5kIHRoZW4gY2hl
Y2sgZm9yIGNvbXBsZXRpb24uIE9uIGEgZnVsbCByZXNldCwgdGhlIGVuZ2luZSdzCisJCSAqIEhX
IHNlcW5vIHdpbGwgYmUgYWR2YW5jZWQgcGFzc2VkIHVzIGFuZCB3ZSBhcmUgY29tcGxldGUuCisJ
CSAqIElmIHdlIGRvIGEgcGFydGlhbCByZXNldCwgd2UgaGF2ZSB0byB3YWl0IGZvciB0aGUgR1BV
IHRvCisJCSAqIHJlc3VtZSBhbmQgdXBkYXRlIHRoZSBicmVhZGNydW1iLgorCQkgKgorCQkgKiBJ
ZiB3ZSBkb24ndCBob2xkIHRoZSBtdXRleCwgd2UgY2FuIGp1c3Qgd2FpdCBmb3IgdGhlIHdvcmtl
cgorCQkgKiB0byBjb21lIGFsb25nIGFuZCB1cGRhdGUgdGhlIGJyZWFkY3J1bWIgKGVpdGhlciBk
aXJlY3RseQorCQkgKiBpdHNlbGYsIG9yIGluZGlyZWN0bHkgYnkgcmVjb3ZlcmluZyB0aGUgR1BV
KS4KKwkJICovCisJCWlmIChmbGFncyAmIEk5MTVfV0FJVF9MT0NLRUQgJiYKKwkJICAgIGk5MTVf
cmVzZXRfaW5fcHJvZ3Jlc3MoJnJlcS0+aTkxNS0+Z3B1X2Vycm9yKSkgeworCQkJX19zZXRfY3Vy
cmVudF9zdGF0ZShUQVNLX1JVTk5JTkcpOworCQkJaTkxNV9yZXNldChyZXEtPmk5MTUpOworCQkJ
Y29udGludWU7CisJCX0KKwogCQkvKiBPbmx5IHNwaW4gaWYgd2Uga25vdyB0aGUgR1BVIGlzIHBy
b2Nlc3NpbmcgdGhpcyByZXF1ZXN0ICovCiAJCWlmIChpOTE1X3NwaW5fcmVxdWVzdChyZXEsIHN0
YXRlLCAyKSkKIAkJCWJyZWFrOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx
NV9pcnEuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfaXJxLmMKaW5kZXggZWQxNzJkN2Jl
ZWNiLi4yYzdjYjUwNDE1MTEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf
aXJxLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9pcnEuYwpAQCAtMjUyMSw3ICsy
NTIxLDkgQEAgc3RhdGljIHZvaWQgaTkxNV9yZXNldF9hbmRfd2FrZXVwKHN0cnVjdCBkcm1faTkx
NV9wcml2YXRlICpkZXZfcHJpdikKIAkgKiBwZW5kaW5nIHN0YXRlIGFuZCBub3QgcHJvcGVybHkg
ZHJvcCBsb2NrcywgcmVzdWx0aW5nIGluCiAJICogZGVhZGxvY2tzIHdpdGggdGhlIHJlc2V0IHdv
cmsuCiAJICovCisJbXV0ZXhfbG9jaygmZGV2X3ByaXYtPmRybS5zdHJ1Y3RfbXV0ZXgpOwogCXJl
dCA9IGk5MTVfcmVzZXQoZGV2X3ByaXYpOworCW11dGV4X3VubG9jaygmZGV2X3ByaXYtPmRybS5z
dHJ1Y3RfbXV0ZXgpOwogCiAJaW50ZWxfZmluaXNoX3Jlc2V0KGRldl9wcml2KTsKIApkaWZmIC0t
Z2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jIGIvZHJpdmVycy9n
cHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jCmluZGV4IGVhZTI2MWU2MmI4Yi4uZTA0YjU4
YThhYTBhIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVy
LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jCkBAIC0yMjI5
LDkgKzIyMjksNiBAQCBzdGF0aWMgaW50IHdhaXRfZm9yX3NwYWNlKHN0cnVjdCBkcm1faTkxNV9n
ZW1fcmVxdWVzdCAqcmVxLCBpbnQgYnl0ZXMpCiAJaWYgKHJldCkKIAkJcmV0dXJuIHJldDsKIAot
CWlmIChpOTE1X3Jlc2V0X2luX3Byb2dyZXNzKCZ0YXJnZXQtPmk5MTUtPmdwdV9lcnJvcikpCi0J
CXJldHVybiAtRUFHQUlOOwotCiAJaTkxNV9nZW1fcmVxdWVzdF9yZXRpcmVfdXB0byh0YXJnZXQp
OwogCiAJaW50ZWxfcmluZ191cGRhdGVfc3BhY2UocmluZyk7Ci0tIAoyLjkuMwoKX19fX19fX19f
X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcg
bGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRl
c2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==