From mboxrd@z Thu Jan  1 00:00:00 1970
From: Tomas Elf <tomas.elf@intel.com>
Subject: [RFCv2 11/12] drm/i915: Fix __i915_wait_request()
	behaviour during hang detection.
Date: Tue, 21 Jul 2015 14:58:54 +0100
Message-ID: <1437487135-32520-12-git-send-email-tomas.elf@intel.com>
References: <1437487135-32520-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 mga14.intel.com (mga14.intel.com [192.55.52.115])
 by gabe.freedesktop.org (Postfix) with ESMTP id 10D106E931
 for <Intel-GFX@lists.freedesktop.org>; Tue, 21 Jul 2015 07:00:28 -0700 (PDT)
In-Reply-To: <1437487135-32520-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
b25seSAtRUFHQUlOIHRvIHNpZ25pZnkgcmVzZXQgaW4gcHJvZ3Jlc3MuCgpBbHNvLCB1c2UgaXNf
bG9ja2VkIGluIHRyYWNlX2k5MTVfZ2VtX3JlcXVlc3Rfd2FpdF9iZWdpbigpIHRyYWNlIHBvaW50
IGZvciBtb3JlCmFjY3VyYXRlIHJlZmxlY3Rpb24gb2YgY3VycmVudCB0aHJlYWQncyBsb2NrIHN0
YXRlLgoKU2lnbmVkLW9mZi1ieTogVG9tYXMgRWxmIDx0b21hcy5lbGZAaW50ZWwuY29tPgpDYzog
Q2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+CkNjOiBNaWthIEt1b3BwYWxh
IDxtaWthLmt1b3BwYWxhQGxpbnV4LmludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkx
NS9pOTE1X2dlbS5jICAgfCA2NiArKysrKysrKysrKysrKysrKysrKysrKysrKysrKystLS0tLS0t
LS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfdHJhY2UuaCB8IDE1ICsrKy0tLS0tLQogMiBm
aWxlcyBjaGFuZ2VkLCA1NiBpbnNlcnRpb25zKCspLCAyNSBkZWxldGlvbnMoLSkKCmRpZmYgLS1n
aXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5
MTUvaTkxNV9nZW0uYwppbmRleCAzNDA0MThiLi4zMzM5MzY1IDEwMDY0NAotLS0gYS9kcml2ZXJz
L2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf
Z2VtLmMKQEAgLTEyNDUsNyArMTI0NSw2IEBAIGludCBfX2k5MTVfd2FpdF9yZXF1ZXN0KHN0cnVj
dCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxLAogCXVuc2lnbmVkIGxvbmcgdGltZW91dF9leHBp
cmU7CiAJczY0IGJlZm9yZSwgbm93OwogCWludCByZXQ7Ci0JaW50IHJlc2V0X2luX3Byb2dyZXNz
ID0gMDsKIAogCVdBUk4oIWludGVsX2lycXNfZW5hYmxlZChkZXZfcHJpdiksICJJUlFzIGRpc2Fi
bGVkIik7CiAKQEAgLTEyNjIsMjggKzEyNjEsNjcgQEAgaW50IF9faTkxNV93YWl0X3JlcXVlc3Qo
c3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEsCiAJCXJldHVybiAtRU5PREVWOwogCiAJ
LyogUmVjb3JkIGN1cnJlbnQgdGltZSBpbiBjYXNlIGludGVycnVwdGVkIGJ5IHNpZ25hbCwgb3Ig
d2VkZ2VkICovCi0JdHJhY2VfaTkxNV9nZW1fcmVxdWVzdF93YWl0X2JlZ2luKHJlcSk7CisJdHJh
Y2VfaTkxNV9nZW1fcmVxdWVzdF93YWl0X2JlZ2luKHJlcSwgaXNfbG9ja2VkKTsKIAliZWZvcmUg
PSBrdGltZV9nZXRfcmF3X25zKCk7CiAJZm9yICg7OykgewogCQlzdHJ1Y3QgdGltZXJfbGlzdCB0
aW1lcjsKKwkJYm9vbCBmdWxsX2dwdV9yZXNldF9jb21wbGV0ZWRfdW5sb2NrZWQgPSBmYWxzZTsK
KwkJYm9vbCByZXNldF9pbl9wcm9ncmVzc19sb2NrZWQgPSBmYWxzZTsKIAogCQlwcmVwYXJlX3Rv
X3dhaXQoJnJpbmctPmlycV9xdWV1ZSwgJndhaXQsCiAJCQkJaW50ZXJydXB0aWJsZSA/IFRBU0tf
SU5URVJSVVBUSUJMRSA6IFRBU0tfVU5JTlRFUlJVUFRJQkxFKTsKIAotCQkvKiBXZSBuZWVkIHRv
IGNoZWNrIHdoZXRoZXIgYW55IGdwdSByZXNldCBoYXBwZW5lZCBpbiBiZXR3ZWVuCi0JCSAqIHRo
ZSBjYWxsZXIgZ3JhYmJpbmcgdGhlIHNlcW5vIGFuZCBub3cgLi4uICovCi0JCXJlc2V0X2luX3By
b2dyZXNzID0KLQkJCWk5MTVfZ2VtX2NoZWNrX3dlZGdlKHJpbmctPmRldi0+ZGV2X3ByaXZhdGUs
IE5VTEwsIGludGVycnVwdGlibGUpOworCQkvKgorCQkgKiBSdWxlcyBmb3Igd2FpdGluZyB3aXRo
L3dpdGhvdXQgc3RydWN0X211dGV4IGhlbGQgaW4gdGhlIGZhY2UKKwkJICogb2YgYXN5bmNocm9u
b3VzIFREUiBoYW5nIGRldGVjdGlvbi9yZWNvdmVyeToKKwkJICoKKwkJICogKCJyZXNldCBpbiBw
cm9ncmVzcyIgPSBURFIgaGFzIGRldGVjdGVkIGEgaGFuZywgaGFuZworCQkgKiByZWNvdmVyeSBt
YXkgb3IgbWF5IG5vdCBoYXZlIGNvbW1lbmNlZCkKKwkJICoKKwkJICogMS4gSXMgdGhpcyB0aHJl
YWQgaG9sZGluZyB0aGUgc3RydWN0X211dGV4IGFuZCBpcyBhbnkgb2YgdGhlCisJCSAqICAgIGZv
bGxvd2luZyB0cnVlPworCQkgKgorCQkgKglhKSBJcyBhbnkga2luZCBvZiByZXNldCBpbiBwcm9n
cmVzcz8KKwkJICoJYikgSGFzIGEgZnVsbCBHUFUgcmVzZXQgaGFwcGVuZWQgd2hpbGUgdGhpcyB0
aHJlYWQgd2VyZQorCQkgKgkgICBzbGVlcGluZz8KKwkJICoKKwkJICogICAgSWYgc286CisJCSAq
CVJldHVybiAtRUFHQUlOLiBUaGUgY2FsbGVyIHNob3VsZCBpbnRlcnByZXQgdGhpcyBhczoKKwkJ
ICoJUmVsZWFzZSBzdHJ1Y3RfbXV0ZXgsIHRyeSB0byBhY3F1aXJlIHN0cnVjdF9tdXRleAorCQkg
KgkodGhyb3VnaCBpOTE1X211dGV4X2xvY2tfaW50ZXJydXB0aWJsZSgpLCB3aGljaCB3aWxsCisJ
CSAqCWZhaWwgYXMgbG9uZyBhcyBhbnkgcmVzZXQgaXMgaW4gcHJvZ3Jlc3MpIGFuZCByZXRyeSB0
aGUKKwkJICoJY2FsbCB0byBfX2k5MTVfd2FpdF9yZXF1ZXN0KCksIHdoaWNoIGhvcGVmdWxseSB3
aWxsIGdvCisJCSAqCWJldHRlciBhcyBzb29uIGFzIHRoZSBoYW5nIGhhcyBiZWVuIHJlc29sdmVk
LgorCQkgKgorCQkgKiAyLiBJcyB0aGlzIHRocmVhZCBub3QgaG9sZGluZyB0aGUgc3RydWN0X211
dGV4IGFuZCBoYXMgYQorCQkgKiAgICBmdWxsIEdQVSByZXNldCBjb21wbGV0ZWQ/CisJCSAqCisJ
CSAqICAgIElmIHNvOgorCQkgKglSZXR1cm4gMC4gU2luY2UgdGhlIHJlcXVlc3QgaGFzIGJlZW4g
cHVyZ2VkIHRoZXJlIGlzIG5vCisJCSAqCXJlcXVlc3RzIGxlZnQgdG8gd2FpdCBmb3IuIEp1c3Qg
Z28gaG9tZS4KKwkJICoKKwkJICogMy4gSXMgdGhpcyB0aHJlYWQgbm90IGhvbGRpbmcgdGhlIHN0
cnVjdF9tdXRleCBhbmQgaXMgYW55CisJCSAqICAgIGtpbmQgb2YgcmVzZXQgaW4gcHJvZ3Jlc3M/
CisJCSAqCisJCSAqICAgSWYgc286CisJCSAqCVRoaXMgdGhyZWFkIG1heSBrZWVwIG9uIHdhaXRp
bmcuCisJCSAqLwogCi0JCWlmICgocmVzZXRfY291bnRlciAhPSBhdG9taWNfcmVhZCgmZGV2X3By
aXYtPmdwdV9lcnJvci5yZXNldF9jb3VudGVyKSkgfHwKLQkJICAgICByZXNldF9pbl9wcm9ncmVz
cykgeworCQlyZXNldF9pbl9wcm9ncmVzc19sb2NrZWQgPQorCQkJKCgoaTkxNV9nZW1fY2hlY2tf
d2VkZ2UocmluZy0+ZGV2LT5kZXZfcHJpdmF0ZSwgTlVMTCwgaW50ZXJydXB0aWJsZSkpIHx8CisJ
CQkgIChyZXNldF9jb3VudGVyICE9IGF0b21pY19yZWFkKCZkZXZfcHJpdi0+Z3B1X2Vycm9yLnJl
c2V0X2NvdW50ZXIpKSkgJiYKKwkJCSAgaXNfbG9ja2VkKTsKIAotCQkJLyogLi4uIGJ1dCB1cGdy
YWRlIHRoZSAtRUFHQUlOIHRvIGFuIC1FSU8gaWYgdGhlIGdwdQotCQkJICogaXMgdHJ1ZWx5IGdv
bmUuICovCi0JCQlpZiAocmVzZXRfaW5fcHJvZ3Jlc3MpCi0JCQkJcmV0ID0gcmVzZXRfaW5fcHJv
Z3Jlc3M7Ci0JCQllbHNlCi0JCQkJcmV0ID0gLUVBR0FJTjsKKwkJaWYgKHJlc2V0X2luX3Byb2dy
ZXNzX2xvY2tlZCkgeworCQkJcmV0ID0gLUVBR0FJTjsKKwkJCWJyZWFrOworCQl9CisKKwkJZnVs
bF9ncHVfcmVzZXRfY29tcGxldGVkX3VubG9ja2VkID0KKwkJCShyZXNldF9jb3VudGVyICE9IGF0
b21pY19yZWFkKCZkZXZfcHJpdi0+Z3B1X2Vycm9yLnJlc2V0X2NvdW50ZXIpKTsKKworCQlpZiAo
ZnVsbF9ncHVfcmVzZXRfY29tcGxldGVkX3VubG9ja2VkKSB7CisJCQlyZXQgPSAwOwogCQkJYnJl
YWs7CiAJCX0KIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV90cmFjZS5o
IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV90cmFjZS5oCmluZGV4IGI5NzAyNTkuLmZlMDUy
NGUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfdHJhY2UuaAorKysgYi9k
cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3RyYWNlLmgKQEAgLTU1Niw4ICs1NTYsOCBAQCBERUZJ
TkVfRVZFTlQoaTkxNV9nZW1fcmVxdWVzdCwgaTkxNV9nZW1fcmVxdWVzdF9jb21wbGV0ZSwKICk7
CiAKIFRSQUNFX0VWRU5UKGk5MTVfZ2VtX3JlcXVlc3Rfd2FpdF9iZWdpbiwKLQkgICAgVFBfUFJP
VE8oc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEpLAotCSAgICBUUF9BUkdTKHJlcSks
CisJICAgIFRQX1BST1RPKHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxLCBib29sIGJs
b2NraW5nKSwKKwkgICAgVFBfQVJHUyhyZXEsIGJsb2NraW5nKSwKIAogCSAgICBUUF9TVFJVQ1Rf
X2VudHJ5KAogCQkJICAgICBfX2ZpZWxkKHUzMiwgZGV2KQpAQCAtNTY2LDI1ICs1NjYsMTggQEAg
VFJBQ0VfRVZFTlQoaTkxNV9nZW1fcmVxdWVzdF93YWl0X2JlZ2luLAogCQkJICAgICBfX2ZpZWxk
KGJvb2wsIGJsb2NraW5nKQogCQkJICAgICApLAogCi0JICAgIC8qIE5COiB0aGUgYmxvY2tpbmcg
aW5mb3JtYXRpb24gaXMgcmFjeSBzaW5jZSBtdXRleF9pc19sb2NrZWQKLQkgICAgICogZG9lc24n
dCBjaGVjayB0aGF0IHRoZSBjdXJyZW50IHRocmVhZCBob2xkcyB0aGUgbG9jay4gVGhlIG9ubHkK
LQkgICAgICogb3RoZXIgb3B0aW9uIHdvdWxkIGJlIHRvIHBhc3MgdGhlIGJvb2xlYW4gaW5mb3Jt
YXRpb24gb2Ygd2hldGhlcgotCSAgICAgKiBvciBub3QgdGhlIGNsYXNzIHdhcyBibG9ja2luZyBk
b3duIHRocm91Z2ggdGhlIHN0YWNrIHdoaWNoIGlzCi0JICAgICAqIGxlc3MgZGVzaXJhYmxlLgot
CSAgICAgKi8KIAkgICAgVFBfZmFzdF9hc3NpZ24oCiAJCQkgICBzdHJ1Y3QgaW50ZWxfZW5naW5l
X2NzICpyaW5nID0KIAkJCQkJCWk5MTVfZ2VtX3JlcXVlc3RfZ2V0X3JpbmcocmVxKTsKIAkJCSAg
IF9fZW50cnktPmRldiA9IHJpbmctPmRldi0+cHJpbWFyeS0+aW5kZXg7CiAJCQkgICBfX2VudHJ5
LT5yaW5nID0gcmluZy0+aWQ7CiAJCQkgICBfX2VudHJ5LT5zZXFubyA9IGk5MTVfZ2VtX3JlcXVl
c3RfZ2V0X3NlcW5vKHJlcSk7Ci0JCQkgICBfX2VudHJ5LT5ibG9ja2luZyA9Ci0JCQkJICAgICBt
dXRleF9pc19sb2NrZWQoJnJpbmctPmRldi0+c3RydWN0X211dGV4KTsKKwkJCSAgIF9fZW50cnkt
PmJsb2NraW5nID0gYmxvY2tpbmc7CiAJCQkgICApLAogCiAJICAgIFRQX3ByaW50aygiZGV2PSV1
LCByaW5nPSV1LCBzZXFubz0ldSwgYmxvY2tpbmc9JXMiLAogCQkgICAgICBfX2VudHJ5LT5kZXYs
IF9fZW50cnktPnJpbmcsCi0JCSAgICAgIF9fZW50cnktPnNlcW5vLCBfX2VudHJ5LT5ibG9ja2lu
ZyA/ICAieWVzIChOQikiIDogIm5vIikKKwkJICAgICAgX19lbnRyeS0+c2Vxbm8sIF9fZW50cnkt
PmJsb2NraW5nID8gICJ5ZXMiIDogIm5vIikKICk7CiAKIERFRklORV9FVkVOVChpOTE1X2dlbV9y
ZXF1ZXN0LCBpOTE1X2dlbV9yZXF1ZXN0X3dhaXRfZW5kLAotLSAKMS45LjEKCl9fX19fX19fX19f
X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxp
c3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0
b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==