From mboxrd@z Thu Jan  1 00:00:00 1970
From: Chris Wilson <chris@chris-wilson.co.uk>
Subject: [PATCH 05/21] drm/i915: Separate GPU hang waitqueue
	from advance
Date: Fri,  3 Jun 2016 17:08:37 +0100
Message-ID: <1464970133-29859-6-git-send-email-chris@chris-wilson.co.uk>
References: <1464970133-29859-1-git-send-email-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-x243.google.com (mail-wm0-x243.google.com
 [IPv6:2a00:1450:400c:c09::243])
 by gabe.freedesktop.org (Postfix) with ESMTPS id 115D56EE02
 for <intel-gfx@lists.freedesktop.org>; Fri,  3 Jun 2016 16:09:07 +0000 (UTC)
Received: by mail-wm0-x243.google.com with SMTP id e3so436448wme.2
 for <intel-gfx@lists.freedesktop.org>; Fri, 03 Jun 2016 09:09:06 -0700 (PDT)
In-Reply-To: <1464970133-29859-1-git-send-email-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
List-Id: intel-gfx@lists.freedesktop.org

Q3VycmVudGx5IF9faTkxNV93YWl0X3JlcXVlc3QgdXNlcyBhIHBlci1lbmdpbmUgd2FpdF9xdWV1
ZV90IGZvciB0aGUgZHVhbApwdXJwb3NlIG9mIHdha2luZyBhZnRlciB0aGUgR1BVIGFkdmFuY2Vz
IG9yIGZvciB3YWtpbmcgYWZ0ZXIgYW4gZXJyb3IuCkluIHRoZSBmdXR1cmUsIHdlIG1heSBhZGQg
ZXZlbiBtb3JlIHdha2Ugc291cmNlcyBhbmQgcmVxdWlyZSBncmVhdGVyCnNlcGFyYXRpb24sIGJ1
dCBmb3Igbm93IHdlIGNhbiBjb25jZXB0dWFsbHkgc2ltcGxpZnkgd2FrZXVwcyBieSBzZXBhcmF0
aW5nCnRoZSB0d28gc291cmNlcy4gSW4gcGFydGljdWxhciwgdGhpcyBhbGxvd3MgdXMgdG8gdXNl
IGRpZmZlcmVudCB3YWl0LXF1ZXVlcwooZS5nLiBvbmUgb24gdGhlIGVuZ2luZSBhZHZhbmNlbWVu
dCwgYSBnbG9iYWwgb25lIGZvciBlcnJvcnMgYW5kIG9uZSBvbgplYWNoIHJlcXVlc3RzKSB3aXRo
b3V0IGFueSBoYXNzbGUuCgpTaWduZWQtb2ZmLWJ5OiBDaHJpcyBXaWxzb24gPGNocmlzQGNocmlz
LXdpbHNvbi5jby51az4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oIHwgIDYg
KysrKysrCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jIHwgIDUgKysrKysKIGRyaXZl
cnMvZ3B1L2RybS9pOTE1L2k5MTVfaXJxLmMgfCAxOSArKysrLS0tLS0tLS0tLS0tLS0tCiAzIGZp
bGVzIGNoYW5nZWQsIDE1IGluc2VydGlvbnMoKyksIDE1IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdp
dCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkx
NS9pOTE1X2Rydi5oCmluZGV4IGNlY2NjNmQ2YjExOS4uZTM5OWU5Nzk2NWUwIDEwMDY0NAotLS0g
YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9p
OTE1L2k5MTVfZHJ2LmgKQEAgLTE0MDEsNiArMTQwMSwxMiBAQCBzdHJ1Y3QgaTkxNV9ncHVfZXJy
b3IgewogI2RlZmluZSBJOTE1X1dFREdFRAkJCSgxIDw8IDMxKQogCiAJLyoqCisJICogV2FpdHF1
ZXVlIHRvIHNpZ25hbCB3aGVuIGEgaGFuZyBpcyBkZXRlY3RlZC4gVXNlZCB0byBmb3Igd2FpdGVy
cworCSAqIHRvIHJlbGVhc2UgdGhlIHN0cnVjdF9tdXRleCBmb3IgdGhlIHJlc2V0IHRvIHByb2Nl
ZGUuCisJICovCisJd2FpdF9xdWV1ZV9oZWFkX3Qgd2FpdF9xdWV1ZTsKKworCS8qKgogCSAqIFdh
aXRxdWV1ZSB0byBzaWduYWwgd2hlbiB0aGUgcmVzZXQgaGFzIGNvbXBsZXRlZC4gVXNlZCBieSBj
bGllbnRzCiAJICogdGhhdCB3YWl0IGZvciBkZXZfcHJpdi0+bW0ud2VkZ2VkIHRvIHNldHRsZS4K
IAkgKi8KZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMgYi9kcml2
ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCmluZGV4IDAzMjU2ZjA5NmFiNi4uZGU0ZmIzOTMx
MmE0IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCisrKyBiL2Ry
aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKQEAgLTEyMzQsNiArMTIzNCw3IEBAIGludCBf
X2k5MTVfd2FpdF9yZXF1ZXN0KHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxLAogCWNv
bnN0IGJvb2wgaXJxX3Rlc3RfaW5fcHJvZ3Jlc3MgPQogCQlBQ0NFU1NfT05DRShkZXZfcHJpdi0+
Z3B1X2Vycm9yLnRlc3RfaXJxX3JpbmdzKSAmIGludGVsX2VuZ2luZV9mbGFnKGVuZ2luZSk7CiAJ
aW50IHN0YXRlID0gaW50ZXJydXB0aWJsZSA/IFRBU0tfSU5URVJSVVBUSUJMRSA6IFRBU0tfVU5J
TlRFUlJVUFRJQkxFOworCURFRklORV9XQUlUKHJlc2V0KTsKIAlERUZJTkVfV0FJVCh3YWl0KTsK
IAl1bnNpZ25lZCBsb25nIHRpbWVvdXRfZXhwaXJlOwogCXM2NCBiZWZvcmUgPSAwOyAvKiBPbmx5
IHRvIHNpbGVuY2UgYSBjb21waWxlciB3YXJuaW5nLiAqLwpAQCAtMTI3OCw2ICsxMjc5LDcgQEAg
aW50IF9faTkxNV93YWl0X3JlcXVlc3Qoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEs
CiAJCWdvdG8gb3V0OwogCX0KIAorCWFkZF93YWl0X3F1ZXVlKCZkZXZfcHJpdi0+Z3B1X2Vycm9y
LndhaXRfcXVldWUsICZyZXNldCk7CiAJZm9yICg7OykgewogCQlzdHJ1Y3QgdGltZXJfbGlzdCB0
aW1lcjsKIApAQCAtMTMyOSw2ICsxMzMxLDggQEAgaW50IF9faTkxNV93YWl0X3JlcXVlc3Qoc3Ry
dWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEsCiAJCQlkZXN0cm95X3RpbWVyX29uX3N0YWNr
KCZ0aW1lcik7CiAJCX0KIAl9CisJcmVtb3ZlX3dhaXRfcXVldWUoJmRldl9wcml2LT5ncHVfZXJy
b3Iud2FpdF9xdWV1ZSwgJnJlc2V0KTsKKwogCWlmICghaXJxX3Rlc3RfaW5fcHJvZ3Jlc3MpCiAJ
CWVuZ2luZS0+aXJxX3B1dChlbmdpbmUpOwogCkBAIC01MDI2LDYgKzUwMzAsNyBAQCBpOTE1X2dl
bV9sb2FkX2luaXQoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAkJCSAgaTkxNV9nZW1fcmV0aXJl
X3dvcmtfaGFuZGxlcik7CiAJSU5JVF9ERUxBWUVEX1dPUksoJmRldl9wcml2LT5tbS5pZGxlX3dv
cmssCiAJCQkgIGk5MTVfZ2VtX2lkbGVfd29ya19oYW5kbGVyKTsKKwlpbml0X3dhaXRxdWV1ZV9o
ZWFkKCZkZXZfcHJpdi0+Z3B1X2Vycm9yLndhaXRfcXVldWUpOwogCWluaXRfd2FpdHF1ZXVlX2hl
YWQoJmRldl9wcml2LT5ncHVfZXJyb3IucmVzZXRfcXVldWUpOwogCiAJZGV2X3ByaXYtPnJlbGF0
aXZlX2NvbnN0YW50c19tb2RlID0gSTkxNV9FWEVDX0NPTlNUQU5UU19SRUxfR0VORVJBTDsKZGlm
ZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfaXJxLmMgYi9kcml2ZXJzL2dwdS9k
cm0vaTkxNS9pOTE1X2lycS5jCmluZGV4IDgzY2FiMTQ2MzliMi4uMzAxMjdiOTRmMjZlIDEwMDY0
NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2lycS5jCisrKyBiL2RyaXZlcnMvZ3B1
L2RybS9pOTE1L2k5MTVfaXJxLmMKQEAgLTI0ODgsMTEgKzI0ODgsOCBAQCBzdGF0aWMgaXJxcmV0
dXJuX3QgZ2VuOF9pcnFfaGFuZGxlcihpbnQgaXJxLCB2b2lkICphcmcpCiAJcmV0dXJuIHJldDsK
IH0KIAotc3RhdGljIHZvaWQgaTkxNV9lcnJvcl93YWtlX3VwKHN0cnVjdCBkcm1faTkxNV9wcml2
YXRlICpkZXZfcHJpdiwKLQkJCSAgICAgICBib29sIHJlc2V0X2NvbXBsZXRlZCkKK3N0YXRpYyB2
b2lkIGk5MTVfZXJyb3Jfd2FrZV91cChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYp
CiB7Ci0Jc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lOwotCiAJLyoKIAkgKiBOb3RpZnkg
YWxsIHdhaXRlcnMgZm9yIEdQVSBjb21wbGV0aW9uIGV2ZW50cyB0aGF0IHJlc2V0IHN0YXRlIGhh
cwogCSAqIGJlZW4gY2hhbmdlZCwgYW5kIHRoYXQgdGhleSBuZWVkIHRvIHJlc3RhcnQgdGhlaXIg
d2FpdCBhZnRlcgpAQCAtMjUwMSwxOCArMjQ5OCwxMCBAQCBzdGF0aWMgdm9pZCBpOTE1X2Vycm9y
X3dha2VfdXAoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogCSAqLwogCiAJLyog
V2FrZSB1cCBfX3dhaXRfc2Vxbm8sIHBvdGVudGlhbGx5IGhvbGRpbmcgZGV2LT5zdHJ1Y3RfbXV0
ZXguICovCi0JZm9yX2VhY2hfZW5naW5lKGVuZ2luZSwgZGV2X3ByaXYpCi0JCXdha2VfdXBfYWxs
KCZlbmdpbmUtPmlycV9xdWV1ZSk7CisJd2FrZV91cF9hbGwoJmRldl9wcml2LT5ncHVfZXJyb3Iu
d2FpdF9xdWV1ZSk7CiAKIAkvKiBXYWtlIHVwIGludGVsX2NydGNfd2FpdF9mb3JfcGVuZGluZ19m
bGlwcywgaG9sZGluZyBjcnRjLT5tdXRleC4gKi8KIAl3YWtlX3VwX2FsbCgmZGV2X3ByaXYtPnBl
bmRpbmdfZmxpcF9xdWV1ZSk7Ci0KLQkvKgotCSAqIFNpZ25hbCB0YXNrcyBibG9ja2VkIGluIGk5
MTVfZ2VtX3dhaXRfZm9yX2Vycm9yIHRoYXQgdGhlIHBlbmRpbmcKLQkgKiByZXNldCBzdGF0ZSBp
cyBjbGVhcmVkLgotCSAqLwotCWlmIChyZXNldF9jb21wbGV0ZWQpCi0JCXdha2VfdXBfYWxsKCZk
ZXZfcHJpdi0+Z3B1X2Vycm9yLnJlc2V0X3F1ZXVlKTsKIH0KIAogLyoqCkBAIC0yNTc3LDcgKzI1
NjYsNyBAQCBzdGF0aWMgdm9pZCBpOTE1X3Jlc2V0X2FuZF93YWtldXAoc3RydWN0IGRybV9pOTE1
X3ByaXZhdGUgKmRldl9wcml2KQogCQkgKiBOb3RlOiBUaGUgd2FrZV91cCBhbHNvIHNlcnZlcyBh
cyBhIG1lbW9yeSBiYXJyaWVyIHNvIHRoYXQKIAkJICogd2FpdGVycyBzZWUgdGhlIHVwZGF0ZSB2
YWx1ZSBvZiB0aGUgcmVzZXQgY291bnRlciBhdG9taWNfdC4KIAkJICovCi0JCWk5MTVfZXJyb3Jf
d2FrZV91cChkZXZfcHJpdiwgdHJ1ZSk7CisJCXdha2VfdXBfYWxsKCZkZXZfcHJpdi0+Z3B1X2Vy
cm9yLnJlc2V0X3F1ZXVlKTsKIAl9CiB9CiAKQEAgLTI3MTMsNyArMjcwMiw3IEBAIHZvaWQgaTkx
NV9oYW5kbGVfZXJyb3Ioc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogCQkgKiBl
bnN1cmUgdGhhdCB0aGUgd2FpdGVycyBzZWUgdGhlIHVwZGF0ZWQgdmFsdWUgb2YgdGhlIHJlc2V0
CiAJCSAqIGNvdW50ZXIgYXRvbWljX3QuCiAJCSAqLwotCQlpOTE1X2Vycm9yX3dha2VfdXAoZGV2
X3ByaXYsIGZhbHNlKTsKKwkJaTkxNV9lcnJvcl93YWtlX3VwKGRldl9wcml2KTsKIAl9CiAKIAlp
OTE1X3Jlc2V0X2FuZF93YWtldXAoZGV2X3ByaXYpOwotLSAKMi44LjEKCl9fX19fX19fX19fX19f
X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QK
SW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9w
Lm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=