From mboxrd@z Thu Jan  1 00:00:00 1970
From: Tomas Elf <tomas.elf@intel.com>
Subject: [PATCH 16/20] drm/i915: Fix __i915_wait_request()
	behaviour during hang detection.
Date: Fri, 23 Oct 2015 02:32:38 +0100
Message-ID: <1445563962-20753-17-git-send-email-tomas.elf@intel.com>
References: <1445563962-20753-1-git-send-email-tomas.elf@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 mga09.intel.com (mga09.intel.com [134.134.136.24])
 by gabe.freedesktop.org (Postfix) with ESMTP id C81CA6E874
 for <Intel-GFX@lists.freedesktop.org>; Thu, 22 Oct 2015 18:33:49 -0700 (PDT)
In-Reply-To: <1445563962-20753-1-git-send-email-tomas.elf@intel.com>
List-Unsubscribe: <http://lists.freedesktop.org/mailman/options/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <http://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: <http://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

VXNlIGlzX2xvY2tlZCBwYXJhbWV0ZXIgaW4gX19pOTE1X3dhaXRfcmVxdWVzdCgpIHRvIGRldGVy
bWluZSBpZiBhIHRocmVhZApzaG91bGQgYmUgZm9yY2VkIHRvIGJhY2sgb2ZmIGFuZCByZXRyeSBv
ciBpZiBpdCBjYW4gY29udGludWUgc2xlZXBpbmcuIERvbid0CnJldHVybiAtRUlPIGZyb20gX19p
OTE1X3dhaXRfcmVxdWVzdCBzaW5jZSB0aGF0IGlzIGJhZCBmb3IgdGhlIHVwcGVyIGxheWVycywK
b25seSAtRUFHQUlOIHRvIHNpZ25pZnkgcmVzZXQgaW4gcHJvZ3Jlc3MuICh1bmxlc3MgdGhlIGRy
aXZlciBpcyB0ZXJtaW5hbGx5CndlZGdlZCwgaW4gd2hpY2ggY2FzZSB0aGVyZSdzIG5vIG1vZGUg
b2YgcmVjb3ZlcnkgbGVmdCB0byBhdHRlbXB0KQoKQWxzbywgdXNlIGlzX2xvY2tlZCBpbiB0cmFj
ZV9pOTE1X2dlbV9yZXF1ZXN0X3dhaXRfYmVnaW4oKSB0cmFjZSBwb2ludCBmb3IgbW9yZQphY2N1
cmF0ZSByZWZsZWN0aW9uIG9mIGN1cnJlbnQgdGhyZWFkJ3MgbG9jayBzdGF0ZS4KClNpZ25lZC1v
ZmYtYnk6IFRvbWFzIEVsZiA8dG9tYXMuZWxmQGludGVsLmNvbT4KQ2M6IENocmlzIFdpbHNvbiA8
Y2hyaXNAY2hyaXMtd2lsc29uLmNvLnVrPgpDYzogTWlrYSBLdW9wcGFsYSA8bWlrYS5rdW9wcGFs
YUBsaW51eC5pbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYyAg
IHwgODggKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKystLS0tLS0tCiBkcml2ZXJzL2dw
dS9kcm0vaTkxNS9pOTE1X3RyYWNlLmggfCAxNSArKy0tLS0tCiAyIGZpbGVzIGNoYW5nZWQsIDc4
IGluc2VydGlvbnMoKyksIDI1IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1
L2RybS9pOTE1L2k5MTVfZ2VtLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCmlu
ZGV4IGUzYTA2YWEuLjZhMTM1MjQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5
MTVfZ2VtLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYwpAQCAtMTIzNSw3
ICsxMjM1LDYgQEAgaW50IF9faTkxNV93YWl0X3JlcXVlc3Qoc3RydWN0IGRybV9pOTE1X2dlbV9y
ZXF1ZXN0ICpyZXEsCiAJdW5zaWduZWQgbG9uZyB0aW1lb3V0X2V4cGlyZTsKIAlzNjQgYmVmb3Jl
LCBub3c7CiAJaW50IHJldDsKLQlpbnQgcmVzZXRfaW5fcHJvZ3Jlc3MgPSAwOwogCiAJV0FSTigh
aW50ZWxfaXJxc19lbmFibGVkKGRldl9wcml2KSwgIklSUXMgZGlzYWJsZWQiKTsKIApAQCAtMTI1
Miw3ICsxMjUxLDcgQEAgaW50IF9faTkxNV93YWl0X3JlcXVlc3Qoc3RydWN0IGRybV9pOTE1X2dl
bV9yZXF1ZXN0ICpyZXEsCiAJCWdlbjZfcnBzX2Jvb3N0KGRldl9wcml2LCBycHMsIHJlcS0+ZW1p
dHRlZF9qaWZmaWVzKTsKIAogCS8qIFJlY29yZCBjdXJyZW50IHRpbWUgaW4gY2FzZSBpbnRlcnJ1
cHRlZCBieSBzaWduYWwsIG9yIHdlZGdlZCAqLwotCXRyYWNlX2k5MTVfZ2VtX3JlcXVlc3Rfd2Fp
dF9iZWdpbihyZXEpOworCXRyYWNlX2k5MTVfZ2VtX3JlcXVlc3Rfd2FpdF9iZWdpbihyZXEsIGlz
X2xvY2tlZCk7CiAJYmVmb3JlID0ga3RpbWVfZ2V0X3Jhd19ucygpOwogCiAJLyogT3B0aW1pc3Rp
YyBzcGluIGZvciB0aGUgbmV4dCBqaWZmaWUgYmVmb3JlIHRvdWNoaW5nIElSUXMgKi8KQEAgLTEy
NjcsMjQgKzEyNjYsODUgQEAgaW50IF9faTkxNV93YWl0X3JlcXVlc3Qoc3RydWN0IGRybV9pOTE1
X2dlbV9yZXF1ZXN0ICpyZXEsCiAKIAlmb3IgKDs7KSB7CiAJCXN0cnVjdCB0aW1lcl9saXN0IHRp
bWVyOworCQlib29sIGZ1bGxfZ3B1X3Jlc2V0X2NvbXBsZXRlZF91bmxvY2tlZCA9IGZhbHNlOwor
CQlib29sIHJlc2V0X2luX3Byb2dyZXNzX2xvY2tlZCA9IGZhbHNlOwogCiAJCXByZXBhcmVfdG9f
d2FpdCgmcmluZy0+aXJxX3F1ZXVlLCAmd2FpdCwKIAkJCQlpbnRlcnJ1cHRpYmxlID8gVEFTS19J
TlRFUlJVUFRJQkxFIDogVEFTS19VTklOVEVSUlVQVElCTEUpOwogCi0JCS8qIFdlIG5lZWQgdG8g
Y2hlY2sgd2hldGhlciBhbnkgZ3B1IHJlc2V0IGhhcHBlbmVkIGluIGJldHdlZW4KLQkJICogdGhl
IGNhbGxlciBncmFiYmluZyB0aGUgc2Vxbm8gYW5kIG5vdyAuLi4gKi8KLQkJcmVzZXRfaW5fcHJv
Z3Jlc3MgPQotCQkJaTkxNV9nZW1fY2hlY2tfd2VkZ2UocmluZy0+ZGV2LT5kZXZfcHJpdmF0ZSwg
TlVMTCwgaW50ZXJydXB0aWJsZSk7CisJCS8qCisJCSAqIFJ1bGVzIGZvciB3YWl0aW5nIHdpdGgv
d2l0aG91dCBzdHJ1Y3RfbXV0ZXggaGVsZCBkdXJpbmcKKwkJICogYXN5bmNocm9ub3VzIFREUiBo
YW5nIGRldGVjdGlvbi9yZWNvdmVyeToKKwkJICoKKwkJICogKCJyZXNldCBpbiBwcm9ncmVzcyIg
PSBURFIgaGFzIGRldGVjdGVkIGEgaGFuZywgaGFuZworCQkgKiByZWNvdmVyeSBtYXkgb3IgbWF5
IG5vdCBoYXZlIGNvbW1lbmNlZCkKKwkJICoKKwkJICogMS4gSXMgdGhlIGRyaXZlciB0ZXJtaW5h
bGx5IHdlZGdlZD8gSWYgc28sIHJldHVybiAtRUlPIHNpbmNlCisJCSAqICAgIHRoZXJlIGlzIG5v
IHBvaW50IGluIGhhdmluZyB0aGUgY2FsbGVyIHJldHJ5IC0gdGhlIGRyaXZlcgorCQkgKiAgICBp
cyBpcnJlY292ZXJhYmx5IHN0dWNrLgorCQkgKgorCQkgKiAyLiBJcyB0aGlzIHRocmVhZCBob2xk
aW5nIHRoZSBzdHJ1Y3RfbXV0ZXggYW5kIGlzIGFueSBvZiB0aGUKKwkJICogICAgZm9sbG93aW5n
IHRydWU/CisJCSAqCisJCSAqCWEpIElzIGFueSBraW5kIG9mIHJlc2V0IGluIHByb2dyZXNzPwor
CQkgKgliKSBIYXMgYSBmdWxsIEdQVSByZXNldCBoYXBwZW5lZCB3aGlsZSB0aGlzIHRocmVhZCB3
ZXJlCisJCSAqCSAgIHNsZWVwaW5nPworCQkgKgorCQkgKiAgICBJZiBzbzoKKwkJICoJUmV0dXJu
IC1FQUdBSU4uIFRoZSBjYWxsZXIgc2hvdWxkIGludGVycHJldCB0aGlzIGFzOgorCQkgKglSZWxl
YXNlIHN0cnVjdF9tdXRleCwgdHJ5IHRvIGFjcXVpcmUgc3RydWN0X211dGV4CisJCSAqCSh0aHJv
dWdoIGk5MTVfbXV0ZXhfbG9ja19pbnRlcnJ1cHRpYmxlKCksIHdoaWNoIHdpbGwKKwkJICoJZmFp
bCBhcyBsb25nIGFzIGFueSByZXNldCBpcyBpbiBwcm9ncmVzcykgYW5kIHJldHJ5IHRoZQorCQkg
KgljYWxsIHRvIF9faTkxNV93YWl0X3JlcXVlc3QoKSwgd2hpY2ggaG9wZWZ1bGx5IHdpbGwgZ28K
KwkJICoJYmV0dGVyIGFzIHNvb24gYXMgdGhlIGhhbmcgaGFzIGJlZW4gcmVzb2x2ZWQuCisJCSAq
CisJCSAqIDMuIElzIHRoaXMgdGhyZWFkIG5vdCBob2xkaW5nIHRoZSBzdHJ1Y3RfbXV0ZXggYW5k
IGhhcyBhCisJCSAqICAgIGZ1bGwgR1BVIHJlc2V0IGNvbXBsZXRlZD8gKHRoYXQgaXMsIHRoZSBy
ZXNldCBjb3VudCBoYXMKKwkJICogICAgY2hhbmdlZCBidXQgdGhlcmUgaXMgY3VycmVubHkgbm8g
ZnVsbCBHUFUgcmVzZXQgaW4KKwkJICogICAgcHJvZ3Jlc3M/KQorCQkgKgorCQkgKiAgICBJZiBz
bzoKKwkJICoJUmV0dXJuIDAuIFNpbmNlIHRoZSByZXF1ZXN0IGhhcyBiZWVuIHB1cmdlZCB0aGVy
ZSBpcyBubworCQkgKglyZXF1ZXN0cyBsZWZ0IHRvIHdhaXQgZm9yLiBKdXN0IGdvIGhvbWUuCisJ
CSAqCisJCSAqIDQuIElzIHRoaXMgdGhyZWFkIG5vdCBob2xkaW5nIHRoZSBzdHJ1Y3RfbXV0ZXgg
YW5kIGlzIGFueQorCQkgKiAgICBraW5kIG9mIHJlc2V0IGluIHByb2dyZXNzPworCQkgKgorCQkg
KiAgICBJZiBzbzoKKwkJICoJVGhpcyB0aHJlYWQgbWF5IGtlZXAgb24gd2FpdGluZy4KKwkJICov
CisKKwkJaWYgKGk5MTVfdGVybWluYWxseV93ZWRnZWQoJmRldl9wcml2LT5ncHVfZXJyb3IpKSB7
CisJCQlyZXQgPSAtRUlPOworCQkJYnJlYWs7CisJCX0KIAotCQlpZiAoKHJlc2V0X2NvdW50ZXIg
IT0gYXRvbWljX3JlYWQoJmRldl9wcml2LT5ncHVfZXJyb3IucmVzZXRfY291bnRlcikpIHx8Ci0J
CSAgICAgcmVzZXRfaW5fcHJvZ3Jlc3MpIHsKKwkJcmVzZXRfaW5fcHJvZ3Jlc3NfbG9ja2VkID0K
KwkJCSgoKGk5MTVfZ2VtX2NoZWNrX3dlZGdlKHJpbmctPmRldi0+ZGV2X3ByaXZhdGUsIE5VTEws
IGludGVycnVwdGlibGUpKSB8fAorCQkJICAocmVzZXRfY291bnRlciAhPSBhdG9taWNfcmVhZCgm
ZGV2X3ByaXYtPmdwdV9lcnJvci5yZXNldF9jb3VudGVyKSkpICYmCisJCQkgIGlzX2xvY2tlZCk7
CiAKLQkJCS8qIC4uLiBidXQgdXBncmFkZSB0aGUgLUVBR0FJTiB0byBhbiAtRUlPIGlmIHRoZSBn
cHUKLQkJCSAqIGlzIHRydWVseSBnb25lLiAqLwotCQkJaWYgKHJlc2V0X2luX3Byb2dyZXNzKQot
CQkJCXJldCA9IHJlc2V0X2luX3Byb2dyZXNzOwotCQkJZWxzZQotCQkJCXJldCA9IC1FQUdBSU47
CisJCWlmIChyZXNldF9pbl9wcm9ncmVzc19sb2NrZWQpIHsKKwkJCS8qCisJCQkgKiBJZiB0aGUg
Y2FsbGVyIGlzIGhvbGRpbmcgdGhlIHN0cnVjdF9tdXRleCB0aHJvdyB0aGVtCisJCQkgKiBvdXQg
c2luY2UgVERSIG5lZWRzIGFjY2VzcyB0byBpdC4KKwkJCSAqLworCQkJcmV0ID0gLUVBR0FJTjsK
KwkJCWJyZWFrOworCQl9CisKKwkJZnVsbF9ncHVfcmVzZXRfY29tcGxldGVkX3VubG9ja2VkID0K
KwkJCSgoKHJlc2V0X2NvdW50ZXIgIT0gYXRvbWljX3JlYWQoJmRldl9wcml2LT5ncHVfZXJyb3Iu
cmVzZXRfY291bnRlcikpICYmCisJCQkoIWk5MTVfcmVzZXRfaW5fcHJvZ3Jlc3MoJmRldl9wcml2
LT5ncHVfZXJyb3IpKSkpOworCisJCWlmIChmdWxsX2dwdV9yZXNldF9jb21wbGV0ZWRfdW5sb2Nr
ZWQpIHsKKwkJCS8qCisJCQkgKiBGdWxsIEdQVSByZXNldCB3aXRob3V0IGhvbGRpbmcgdGhlIHN0
cnVjdF9tdXRleCBoYXMKKwkJCSAqIGNvbXBsZXRlZCAtIGp1c3QgcmV0dXJuLiBJZiByZWNvdmVy
eSBpcyBzdGlsbCBpbgorCQkJICogcHJvZ3Jlc3MgdGhlIHRocmVhZCB3aWxsIGtlZXAgb24gc2xl
ZXBpbmcgdW50aWwKKwkJCSAqIHJlY292ZXJ5IGlzIGNvbXBsZXRlLgorCQkJICovCisJCQlyZXQg
PSAwOwogCQkJYnJlYWs7CiAJCX0KIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv
aTkxNV90cmFjZS5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV90cmFjZS5oCmluZGV4IDhk
ODZhN2QuLmI2YTQ1NzYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfdHJh
Y2UuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3RyYWNlLmgKQEAgLTU5MSw4ICs1
OTEsOCBAQCBERUZJTkVfRVZFTlQoaTkxNV9nZW1fcmVxdWVzdCwgaTkxNV9nZW1fcmVxdWVzdF9j
b21wbGV0ZSwKICk7CiAKIFRSQUNFX0VWRU5UKGk5MTVfZ2VtX3JlcXVlc3Rfd2FpdF9iZWdpbiwK
LQkgICAgVFBfUFJPVE8oc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEpLAotCSAgICBU
UF9BUkdTKHJlcSksCisJICAgIFRQX1BST1RPKHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAq
cmVxLCBib29sIGJsb2NraW5nKSwKKwkgICAgVFBfQVJHUyhyZXEsIGJsb2NraW5nKSwKIAogCSAg
ICBUUF9TVFJVQ1RfX2VudHJ5KAogCQkJICAgICBfX2ZpZWxkKHUzMiwgZGV2KQpAQCAtNjAxLDI1
ICs2MDEsMTggQEAgVFJBQ0VfRVZFTlQoaTkxNV9nZW1fcmVxdWVzdF93YWl0X2JlZ2luLAogCQkJ
ICAgICBfX2ZpZWxkKGJvb2wsIGJsb2NraW5nKQogCQkJICAgICApLAogCi0JICAgIC8qIE5COiB0
aGUgYmxvY2tpbmcgaW5mb3JtYXRpb24gaXMgcmFjeSBzaW5jZSBtdXRleF9pc19sb2NrZWQKLQkg
ICAgICogZG9lc24ndCBjaGVjayB0aGF0IHRoZSBjdXJyZW50IHRocmVhZCBob2xkcyB0aGUgbG9j
ay4gVGhlIG9ubHkKLQkgICAgICogb3RoZXIgb3B0aW9uIHdvdWxkIGJlIHRvIHBhc3MgdGhlIGJv
b2xlYW4gaW5mb3JtYXRpb24gb2Ygd2hldGhlcgotCSAgICAgKiBvciBub3QgdGhlIGNsYXNzIHdh
cyBibG9ja2luZyBkb3duIHRocm91Z2ggdGhlIHN0YWNrIHdoaWNoIGlzCi0JICAgICAqIGxlc3Mg
ZGVzaXJhYmxlLgotCSAgICAgKi8KIAkgICAgVFBfZmFzdF9hc3NpZ24oCiAJCQkgICBzdHJ1Y3Qg
aW50ZWxfZW5naW5lX2NzICpyaW5nID0KIAkJCQkJCWk5MTVfZ2VtX3JlcXVlc3RfZ2V0X3Jpbmco
cmVxKTsKIAkJCSAgIF9fZW50cnktPmRldiA9IHJpbmctPmRldi0+cHJpbWFyeS0+aW5kZXg7CiAJ
CQkgICBfX2VudHJ5LT5yaW5nID0gcmluZy0+aWQ7CiAJCQkgICBfX2VudHJ5LT5zZXFubyA9IGk5
MTVfZ2VtX3JlcXVlc3RfZ2V0X3NlcW5vKHJlcSk7Ci0JCQkgICBfX2VudHJ5LT5ibG9ja2luZyA9
Ci0JCQkJICAgICBtdXRleF9pc19sb2NrZWQoJnJpbmctPmRldi0+c3RydWN0X211dGV4KTsKKwkJ
CSAgIF9fZW50cnktPmJsb2NraW5nID0gYmxvY2tpbmc7CiAJCQkgICApLAogCiAJICAgIFRQX3By
aW50aygiZGV2PSV1LCByaW5nPSV1LCBzZXFubz0ldSwgYmxvY2tpbmc9JXMiLAogCQkgICAgICBf
X2VudHJ5LT5kZXYsIF9fZW50cnktPnJpbmcsCi0JCSAgICAgIF9fZW50cnktPnNlcW5vLCBfX2Vu
dHJ5LT5ibG9ja2luZyA/ICAieWVzIChOQikiIDogIm5vIikKKwkJICAgICAgX19lbnRyeS0+c2Vx
bm8sIF9fZW50cnktPmJsb2NraW5nID8gICJ5ZXMiIDogIm5vIikKICk7CiAKIERFRklORV9FVkVO
VChpOTE1X2dlbV9yZXF1ZXN0LCBpOTE1X2dlbV9yZXF1ZXN0X3dhaXRfZW5kLAotLSAKMS45LjEK
Cl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdm
eCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlz
dHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==