From: Arun Siluvery Subject: [PATCH 16/20] drm/i915: Fix __i915_wait_request() behaviour during hang detection. Date: Wed, 13 Jan 2016 17:28:28 +0000 Message-ID: <1452706112-8617-17-git-send-email-arun.siluvery@linux.intel.com> References: <1452706112-8617-1-git-send-email-arun.siluvery@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTP id 7FA087A076 for ; Wed, 13 Jan 2016 09:29:03 -0800 (PST) In-Reply-To: <1452706112-8617-1-git-send-email-arun.siluvery@linux.intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: intel-gfx@lists.freedesktop.org Cc: Tomas Elf List-Id: intel-gfx@lists.freedesktop.org RnJvbTogVG9tYXMgRWxmIDx0b21hcy5lbGZAaW50ZWwuY29tPgoKVXNlIGlzX2xvY2tlZCBwYXJh bWV0ZXIgaW4gX19pOTE1X3dhaXRfcmVxdWVzdCgpIHRvIGRldGVybWluZSBpZiBhIHRocmVhZApz aG91bGQgYmUgZm9yY2VkIHRvIGJhY2sgb2ZmIGFuZCByZXRyeSBvciBpZiBpdCBjYW4gY29udGlu dWUgc2xlZXBpbmcuIERvbid0CnJldHVybiAtRUlPIGZyb20gX19pOTE1X3dhaXRfcmVxdWVzdCBz aW5jZSB0aGF0IGlzIGJhZCBmb3IgdGhlIHVwcGVyIGxheWVycywKb25seSAtRUFHQUlOIHRvIHNp Z25pZnkgcmVzZXQgaW4gcHJvZ3Jlc3MuICh1bmxlc3MgdGhlIGRyaXZlciBpcyB0ZXJtaW5hbGx5 CndlZGdlZCwgaW4gd2hpY2ggY2FzZSB0aGVyZSdzIG5vIG1vZGUgb2YgcmVjb3ZlcnkgbGVmdCB0 byBhdHRlbXB0KQoKQWxzbywgdXNlIGlzX2xvY2tlZCBpbiB0cmFjZV9pOTE1X2dlbV9yZXF1ZXN0 X3dhaXRfYmVnaW4oKSB0cmFjZSBwb2ludCBmb3IgbW9yZQphY2N1cmF0ZSByZWZsZWN0aW9uIG9m IGN1cnJlbnQgdGhyZWFkJ3MgbG9jayBzdGF0ZS4KClNpZ25lZC1vZmYtYnk6IFRvbWFzIEVsZiA8 dG9tYXMuZWxmQGludGVsLmNvbT4KQ2M6IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hyaXMtd2lsc29u LmNvLnVrPgpDYzogTWlrYSBLdW9wcGFsYSA8bWlrYS5rdW9wcGFsYUBsaW51eC5pbnRlbC5jb20+ Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYyAgIHwgODggKysrKysrKysrKysr KysrKysrKysrKysrKysrKysrKystLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3Ry YWNlLmggfCAxNSArKy0tLS0tCiAyIGZpbGVzIGNoYW5nZWQsIDc4IGluc2VydGlvbnMoKyksIDI1 IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2Vt LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCmluZGV4IDcxMjIzMTUuLjgwZGY1 YjUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKKysrIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYwpAQCAtMTI4Nyw3ICsxMjg3LDYgQEAgaW50IF9f aTkxNV93YWl0X3JlcXVlc3Qoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEsCiAJdW5z aWduZWQgbG9uZyB0aW1lb3V0X2V4cGlyZTsKIAlzNjQgYmVmb3JlLCBub3c7CiAJaW50IHJldDsK LQlpbnQgcmVzZXRfaW5fcHJvZ3Jlc3MgPSAwOwogCiAJV0FSTighaW50ZWxfaXJxc19lbmFibGVk KGRldl9wcml2KSwgIklSUXMgZGlzYWJsZWQiKTsKIApAQCAtMTMxMiw3ICsxMzExLDcgQEAgaW50 IF9faTkxNV93YWl0X3JlcXVlc3Qoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEsCiAJ CWdlbjZfcnBzX2Jvb3N0KGRldl9wcml2LCBycHMsIHJlcS0+ZW1pdHRlZF9qaWZmaWVzKTsKIAog CS8qIFJlY29yZCBjdXJyZW50IHRpbWUgaW4gY2FzZSBpbnRlcnJ1cHRlZCBieSBzaWduYWwsIG9y IHdlZGdlZCAqLwotCXRyYWNlX2k5MTVfZ2VtX3JlcXVlc3Rfd2FpdF9iZWdpbihyZXEpOworCXRy YWNlX2k5MTVfZ2VtX3JlcXVlc3Rfd2FpdF9iZWdpbihyZXEsIGlzX2xvY2tlZCk7CiAJYmVmb3Jl ID0ga3RpbWVfZ2V0X3Jhd19ucygpOwogCiAJLyogT3B0aW1pc3RpYyBzcGluIGZvciB0aGUgbmV4 dCBqaWZmaWUgYmVmb3JlIHRvdWNoaW5nIElSUXMgKi8KQEAgLTEzMjcsMjMgKzEzMjYsODQgQEAg aW50IF9faTkxNV93YWl0X3JlcXVlc3Qoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEs CiAKIAlmb3IgKDs7KSB7CiAJCXN0cnVjdCB0aW1lcl9saXN0IHRpbWVyOworCQlib29sIGZ1bGxf Z3B1X3Jlc2V0X2NvbXBsZXRlZF91bmxvY2tlZCA9IGZhbHNlOworCQlib29sIHJlc2V0X2luX3By b2dyZXNzX2xvY2tlZCA9IGZhbHNlOwogCiAJCXByZXBhcmVfdG9fd2FpdCgmcmluZy0+aXJxX3F1 ZXVlLCAmd2FpdCwgc3RhdGUpOwogCi0JCS8qIFdlIG5lZWQgdG8gY2hlY2sgd2hldGhlciBhbnkg Z3B1IHJlc2V0IGhhcHBlbmVkIGluIGJldHdlZW4KLQkJICogdGhlIGNhbGxlciBncmFiYmluZyB0 aGUgc2Vxbm8gYW5kIG5vdyAuLi4gKi8KLQkJcmVzZXRfaW5fcHJvZ3Jlc3MgPQotCQkJaTkxNV9n ZW1fY2hlY2tfd2VkZ2UocmluZy0+ZGV2LT5kZXZfcHJpdmF0ZSwgTlVMTCwgaW50ZXJydXB0aWJs ZSk7CisJCS8qCisJCSAqIFJ1bGVzIGZvciB3YWl0aW5nIHdpdGgvd2l0aG91dCBzdHJ1Y3RfbXV0 ZXggaGVsZCBkdXJpbmcKKwkJICogYXN5bmNocm9ub3VzIFREUiBoYW5nIGRldGVjdGlvbi9yZWNv dmVyeToKKwkJICoKKwkJICogKCJyZXNldCBpbiBwcm9ncmVzcyIgPSBURFIgaGFzIGRldGVjdGVk IGEgaGFuZywgaGFuZworCQkgKiByZWNvdmVyeSBtYXkgb3IgbWF5IG5vdCBoYXZlIGNvbW1lbmNl ZCkKKwkJICoKKwkJICogMS4gSXMgdGhlIGRyaXZlciB0ZXJtaW5hbGx5IHdlZGdlZD8gSWYgc28s IHJldHVybiAtRUlPIHNpbmNlCisJCSAqICAgIHRoZXJlIGlzIG5vIHBvaW50IGluIGhhdmluZyB0 aGUgY2FsbGVyIHJldHJ5IC0gdGhlIGRyaXZlcgorCQkgKiAgICBpcyBpcnJlY292ZXJhYmx5IHN0 dWNrLgorCQkgKgorCQkgKiAyLiBJcyB0aGlzIHRocmVhZCBob2xkaW5nIHRoZSBzdHJ1Y3RfbXV0 ZXggYW5kIGlzIGFueSBvZiB0aGUKKwkJICogICAgZm9sbG93aW5nIHRydWU/CisJCSAqCisJCSAq CWEpIElzIGFueSBraW5kIG9mIHJlc2V0IGluIHByb2dyZXNzPworCQkgKgliKSBIYXMgYSBmdWxs IEdQVSByZXNldCBoYXBwZW5lZCB3aGlsZSB0aGlzIHRocmVhZCB3ZXJlCisJCSAqCSAgIHNsZWVw aW5nPworCQkgKgorCQkgKiAgICBJZiBzbzoKKwkJICoJUmV0dXJuIC1FQUdBSU4uIFRoZSBjYWxs ZXIgc2hvdWxkIGludGVycHJldCB0aGlzIGFzOgorCQkgKglSZWxlYXNlIHN0cnVjdF9tdXRleCwg dHJ5IHRvIGFjcXVpcmUgc3RydWN0X211dGV4CisJCSAqCSh0aHJvdWdoIGk5MTVfbXV0ZXhfbG9j a19pbnRlcnJ1cHRpYmxlKCksIHdoaWNoIHdpbGwKKwkJICoJZmFpbCBhcyBsb25nIGFzIGFueSBy ZXNldCBpcyBpbiBwcm9ncmVzcykgYW5kIHJldHJ5IHRoZQorCQkgKgljYWxsIHRvIF9faTkxNV93 YWl0X3JlcXVlc3QoKSwgd2hpY2ggaG9wZWZ1bGx5IHdpbGwgZ28KKwkJICoJYmV0dGVyIGFzIHNv b24gYXMgdGhlIGhhbmcgaGFzIGJlZW4gcmVzb2x2ZWQuCisJCSAqCisJCSAqIDMuIElzIHRoaXMg dGhyZWFkIG5vdCBob2xkaW5nIHRoZSBzdHJ1Y3RfbXV0ZXggYW5kIGhhcyBhCisJCSAqICAgIGZ1 bGwgR1BVIHJlc2V0IGNvbXBsZXRlZD8gKHRoYXQgaXMsIHRoZSByZXNldCBjb3VudCBoYXMKKwkJ ICogICAgY2hhbmdlZCBidXQgdGhlcmUgaXMgY3VycmVubHkgbm8gZnVsbCBHUFUgcmVzZXQgaW4K KwkJICogICAgcHJvZ3Jlc3M/KQorCQkgKgorCQkgKiAgICBJZiBzbzoKKwkJICoJUmV0dXJuIDAu IFNpbmNlIHRoZSByZXF1ZXN0IGhhcyBiZWVuIHB1cmdlZCB0aGVyZSBpcyBubworCQkgKglyZXF1 ZXN0cyBsZWZ0IHRvIHdhaXQgZm9yLiBKdXN0IGdvIGhvbWUuCisJCSAqCisJCSAqIDQuIElzIHRo aXMgdGhyZWFkIG5vdCBob2xkaW5nIHRoZSBzdHJ1Y3RfbXV0ZXggYW5kIGlzIGFueQorCQkgKiAg ICBraW5kIG9mIHJlc2V0IGluIHByb2dyZXNzPworCQkgKgorCQkgKiAgICBJZiBzbzoKKwkJICoJ VGhpcyB0aHJlYWQgbWF5IGtlZXAgb24gd2FpdGluZy4KKwkJICovCiAKLQkJaWYgKChyZXNldF9j b3VudGVyICE9IGF0b21pY19yZWFkKCZkZXZfcHJpdi0+Z3B1X2Vycm9yLnJlc2V0X2NvdW50ZXIp KSB8fAotCQkgICAgIHJlc2V0X2luX3Byb2dyZXNzKSB7CisJCWlmIChpOTE1X3Rlcm1pbmFsbHlf d2VkZ2VkKCZkZXZfcHJpdi0+Z3B1X2Vycm9yKSkgeworCQkJcmV0ID0gLUVJTzsKKwkJCWJyZWFr OworCQl9CiAKLQkJCS8qIC4uLiBidXQgdXBncmFkZSB0aGUgLUVBR0FJTiB0byBhbiAtRUlPIGlm IHRoZSBncHUKLQkJCSAqIGlzIHRydWVseSBnb25lLiAqLwotCQkJaWYgKHJlc2V0X2luX3Byb2dy ZXNzKQotCQkJCXJldCA9IHJlc2V0X2luX3Byb2dyZXNzOwotCQkJZWxzZQotCQkJCXJldCA9IC1F QUdBSU47CisJCXJlc2V0X2luX3Byb2dyZXNzX2xvY2tlZCA9CisJCQkoKChpOTE1X2dlbV9jaGVj a193ZWRnZShyaW5nLT5kZXYtPmRldl9wcml2YXRlLCBOVUxMLCBpbnRlcnJ1cHRpYmxlKSkgfHwK KwkJCSAgKHJlc2V0X2NvdW50ZXIgIT0gYXRvbWljX3JlYWQoJmRldl9wcml2LT5ncHVfZXJyb3Iu cmVzZXRfY291bnRlcikpKSAmJgorCQkJICBpc19sb2NrZWQpOworCisJCWlmIChyZXNldF9pbl9w cm9ncmVzc19sb2NrZWQpIHsKKwkJCS8qCisJCQkgKiBJZiB0aGUgY2FsbGVyIGlzIGhvbGRpbmcg dGhlIHN0cnVjdF9tdXRleCB0aHJvdyB0aGVtCisJCQkgKiBvdXQgc2luY2UgVERSIG5lZWRzIGFj Y2VzcyB0byBpdC4KKwkJCSAqLworCQkJcmV0ID0gLUVBR0FJTjsKKwkJCWJyZWFrOworCQl9CisK KwkJZnVsbF9ncHVfcmVzZXRfY29tcGxldGVkX3VubG9ja2VkID0KKwkJCSgoKHJlc2V0X2NvdW50 ZXIgIT0gYXRvbWljX3JlYWQoJmRldl9wcml2LT5ncHVfZXJyb3IucmVzZXRfY291bnRlcikpICYm CisJCQkoIWk5MTVfcmVzZXRfaW5fcHJvZ3Jlc3MoJmRldl9wcml2LT5ncHVfZXJyb3IpKSkpOwor CisJCWlmIChmdWxsX2dwdV9yZXNldF9jb21wbGV0ZWRfdW5sb2NrZWQpIHsKKwkJCS8qCisJCQkg KiBGdWxsIEdQVSByZXNldCB3aXRob3V0IGhvbGRpbmcgdGhlIHN0cnVjdF9tdXRleCBoYXMKKwkJ CSAqIGNvbXBsZXRlZCAtIGp1c3QgcmV0dXJuLiBJZiByZWNvdmVyeSBpcyBzdGlsbCBpbgorCQkJ ICogcHJvZ3Jlc3MgdGhlIHRocmVhZCB3aWxsIGtlZXAgb24gc2xlZXBpbmcgdW50aWwKKwkJCSAq IHJlY292ZXJ5IGlzIGNvbXBsZXRlLgorCQkJICovCisJCQlyZXQgPSAwOwogCQkJYnJlYWs7CiAJ CX0KIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV90cmFjZS5oIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV90cmFjZS5oCmluZGV4IDVjMTVkNDMuLjdkY2FjOTMgMTAw NjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfdHJhY2UuaAorKysgYi9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X3RyYWNlLmgKQEAgLTU5MSw4ICs1OTEsOCBAQCBERUZJTkVfRVZF TlQoaTkxNV9nZW1fcmVxdWVzdCwgaTkxNV9nZW1fcmVxdWVzdF9jb21wbGV0ZSwKICk7CiAKIFRS QUNFX0VWRU5UKGk5MTVfZ2VtX3JlcXVlc3Rfd2FpdF9iZWdpbiwKLQkgICAgVFBfUFJPVE8oc3Ry dWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEpLAotCSAgICBUUF9BUkdTKHJlcSksCisJICAg IFRQX1BST1RPKHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxLCBib29sIGJsb2NraW5n KSwKKwkgICAgVFBfQVJHUyhyZXEsIGJsb2NraW5nKSwKIAogCSAgICBUUF9TVFJVQ1RfX2VudHJ5 KAogCQkJICAgICBfX2ZpZWxkKHUzMiwgZGV2KQpAQCAtNjAxLDI1ICs2MDEsMTggQEAgVFJBQ0Vf RVZFTlQoaTkxNV9nZW1fcmVxdWVzdF93YWl0X2JlZ2luLAogCQkJICAgICBfX2ZpZWxkKGJvb2ws IGJsb2NraW5nKQogCQkJICAgICApLAogCi0JICAgIC8qIE5COiB0aGUgYmxvY2tpbmcgaW5mb3Jt YXRpb24gaXMgcmFjeSBzaW5jZSBtdXRleF9pc19sb2NrZWQKLQkgICAgICogZG9lc24ndCBjaGVj ayB0aGF0IHRoZSBjdXJyZW50IHRocmVhZCBob2xkcyB0aGUgbG9jay4gVGhlIG9ubHkKLQkgICAg ICogb3RoZXIgb3B0aW9uIHdvdWxkIGJlIHRvIHBhc3MgdGhlIGJvb2xlYW4gaW5mb3JtYXRpb24g b2Ygd2hldGhlcgotCSAgICAgKiBvciBub3QgdGhlIGNsYXNzIHdhcyBibG9ja2luZyBkb3duIHRo cm91Z2ggdGhlIHN0YWNrIHdoaWNoIGlzCi0JICAgICAqIGxlc3MgZGVzaXJhYmxlLgotCSAgICAg Ki8KIAkgICAgVFBfZmFzdF9hc3NpZ24oCiAJCQkgICBzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpy aW5nID0KIAkJCQkJCWk5MTVfZ2VtX3JlcXVlc3RfZ2V0X3JpbmcocmVxKTsKIAkJCSAgIF9fZW50 cnktPmRldiA9IHJpbmctPmRldi0+cHJpbWFyeS0+aW5kZXg7CiAJCQkgICBfX2VudHJ5LT5yaW5n ID0gcmluZy0+aWQ7CiAJCQkgICBfX2VudHJ5LT5zZXFubyA9IGk5MTVfZ2VtX3JlcXVlc3RfZ2V0 X3NlcW5vKHJlcSk7Ci0JCQkgICBfX2VudHJ5LT5ibG9ja2luZyA9Ci0JCQkJICAgICBtdXRleF9p c19sb2NrZWQoJnJpbmctPmRldi0+c3RydWN0X211dGV4KTsKKwkJCSAgIF9fZW50cnktPmJsb2Nr aW5nID0gYmxvY2tpbmc7CiAJCQkgICApLAogCiAJICAgIFRQX3ByaW50aygiZGV2PSV1LCByaW5n PSV1LCBzZXFubz0ldSwgYmxvY2tpbmc9JXMiLAogCQkgICAgICBfX2VudHJ5LT5kZXYsIF9fZW50 cnktPnJpbmcsCi0JCSAgICAgIF9fZW50cnktPnNlcW5vLCBfX2VudHJ5LT5ibG9ja2luZyA/ICAi eWVzIChOQikiIDogIm5vIikKKwkJICAgICAgX19lbnRyeS0+c2Vxbm8sIF9fZW50cnktPmJsb2Nr aW5nID8gICJ5ZXMiIDogIm5vIikKICk7CiAKIERFRklORV9FVkVOVChpOTE1X2dlbV9yZXF1ZXN0 LCBpOTE1X2dlbV9yZXF1ZXN0X3dhaXRfZW5kLAotLSAKMS45LjEKCl9fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50 ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3Jn L21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==