From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tomas Elf Subject: [PATCH 05/20] drm/i915: Extending i915_gem_check_wedge to check engine reset in progress Date: Fri, 23 Oct 2015 02:32:27 +0100 Message-ID: <1445563962-20753-6-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: Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTP id E75A26E761 for ; Thu, 22 Oct 2015 18:33:14 -0700 (PDT) In-Reply-To: <1445563962-20753-1-git-send-email-tomas.elf@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: Ian Lister List-Id: intel-gfx@lists.freedesktop.org aTkxNV9nZW1fd2VkZ2Ugbm93IHJldHVybnMgYSBub24temVybyByZXN1bHQgaW4gdGhyZWUgZGlm ZmVyZW50IGNhc2VzOgoKMS4gTGVnYWN5OiBBIGhhbmcgaGFzIGJlZW4gZGV0ZWN0ZWQgYW5kIGZ1 bGwgR1BVIHJlc2V0IGlzIGluIHByb2dyZXNzLgoKMi4gUGVyLWVuZ2luZSByZWNvdmVyeToKCglh LiBBIHNpbmdsZSBlbmdpbmUgcmVmZXJlbmNlIGNhbiBiZSBwYXNzZWQgdG8gdGhlIGZ1bmN0aW9u LCBpbiB3aGljaAoJY2FzZSBvbmx5IHRoYXQgZW5naW5lIHdpbGwgYmUgY2hlY2tlZC4gSWYgdGhh dCBwYXJ0aWN1bGFyIGVuZ2luZSBpcwoJZGV0ZWN0ZWQgdG8gYmUgaHVuZyBhbmQgaXMgdG8gYmUg cmVzZXQgdGhpcyB3aWxsIHlpZWxkIGEgbm9uLXplcm8KCXJlc3VsdCBidXQgbm90IGlmIHJlc2V0 IGlzIGluIHByb2dyZXNzIGZvciBhbnkgb3RoZXIgZW5naW5lLgoKCWIuIE5vIGVuZ2luZSByZWZl cmVuY2UgaXMgcGFzc2VkIHRvIHRoZSBmdW5jdGlvbiwgaW4gd2hpY2ggY2FzZSBhbGwKCWVuZ2lu ZXMgYXJlIGNoZWNrZWQgZm9yIG9uZ29pbmcgcGVyLWVuZ2luZSBoYW5nIHJlY292ZXJ5LgoKQWxz bywgaTkxNV93YWl0X3JlcXVlc3Qgd2FzIHVwZGF0ZWQgdG8gdGFrZSBhZHZhbnRhZ2Ugb2YgdGhp cyBuZXcKZnVuY3Rpb25hbGl0eS4gVGhpcyBpcyBpbXBvcnRhbnQgc2luY2UgdGhlIFREUiBoYW5n IHJlY292ZXJ5IG1lY2hhbmlzbSBuZWVkcyBhCndheSB0byBmb3JjZSB3YWl0aW5nIHRocmVhZHMg dGhhdCBob2xkIHRoZSBzdHJ1Y3RfbXV0ZXggdG8gZ2l2ZSB1cCB0aGUKc3RydWN0X211dGV4IGFu ZCB0cnkgYWdhaW4gYWZ0ZXIgdGhlIGhhbmcgcmVjb3ZlcnkgaGFzIGNvbXBsZXRlZC4gSWYKaTkx NV93YWl0X3JlcXVlc3QgZG9lcyBub3QgdGFrZSBwZXItZW5naW5lIGhhbmcgcmVjb3ZlcnkgaW50 byBhY2NvdW50IHRoZXJlIGlzCm5vIHdheSBmb3IgYSB3YWl0aW5nIHRocmVhZCB0byBrbm93IHRo YXQgYSBwZXItZW5naW5lIHJlY292ZXJ5IGlzIGFib3V0IHRvCmhhcHBlbiBhbmQgdGhhdCBpdCBu ZWVkcyB0byBiYWNrIG9mZi4KClNpZ25lZC1vZmYtYnk6IFRvbWFzIEVsZiA8dG9tYXMuZWxmQGlu dGVsLmNvbT4KU2lnbmVkLW9mZi1ieTogQXJ1biBTaWx1dmVyeSA8YXJ1bi5zaWx1dmVyeUBpbnRl bC5jb20+ClNpZ25lZC1vZmYtYnk6IElhbiBMaXN0ZXIgPGlhbi5saXN0ZXJAaW50ZWwuY29tPgpD YzogQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+CkNjOiBNaWthIEt1b3Bw YWxhIDxtaWthLmt1b3BwYWxhQGxpbnV4LmludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2Rydi5oICAgICAgICAgfCAgMyArLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx NV9nZW0uYyAgICAgICAgIHwgNjAgKysrKysrKysrKysrKysrKysrKysrKysrKysrLS0tLS0tCiBk cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYyAgICAgICAgfCAgNCArLS0KIGRyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuYyB8ICA0ICsrLQogNCBmaWxlcyBjaGFuZ2Vk LCA1NiBpbnNlcnRpb25zKCspLCAxNSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYu aAppbmRleCAwYTQ2OWFmLi42MmM1OWU3IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKQEAgLTI5 ODUsNyArMjk4NSw4IEBAIGk5MTVfZ2VtX2ZpbmRfYWN0aXZlX3JlcXVlc3Qoc3RydWN0IGludGVs X2VuZ2luZV9jcyAqcmluZyk7CiAKIGJvb2wgaTkxNV9nZW1fcmV0aXJlX3JlcXVlc3RzKHN0cnVj dCBkcm1fZGV2aWNlICpkZXYpOwogdm9pZCBpOTE1X2dlbV9yZXRpcmVfcmVxdWVzdHNfcmluZyhz dHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nKTsKLWludCBfX211c3RfY2hlY2sgaTkxNV9nZW1f Y2hlY2tfd2VkZ2Uoc3RydWN0IGk5MTVfZ3B1X2Vycm9yICplcnJvciwKK2ludCBfX211c3RfY2hl Y2sgaTkxNV9nZW1fY2hlY2tfd2VkZ2Uoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2 LAorCQkJCSAgICAgIHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSwKIAkJCQkgICAgICBi b29sIGludGVycnVwdGlibGUpOwogCiBzdGF0aWMgaW5saW5lIGJvb2wgaTkxNV9yZXNldF9pbl9w cm9ncmVzcyhzdHJ1Y3QgaTkxNV9ncHVfZXJyb3IgKmVycm9yKQpkaWZmIC0tZ2l0IGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2Vt LmMKaW5kZXggZTc1ZGM3OS4uOTU1NjljYyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9nZW0uYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCkBAIC04 MCwxMiArODAsMzggQEAgc3RhdGljIHZvaWQgaTkxNV9nZW1faW5mb19yZW1vdmVfb2JqKHN0cnVj dCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAlzcGluX3VubG9jaygmZGV2X3ByaXYtPm1t Lm9iamVjdF9zdGF0X2xvY2spOwogfQogCitzdGF0aWMgaW5saW5lIGludAoraTkxNV9lbmdpbmVf cmVzZXRfaW5fcHJvZ3Jlc3Moc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAorCXN0 cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKK3sKKwlpbnQgcmV0ID0gMDsKKworCWlmIChl bmdpbmUpIHsKKwkJcmV0ID0gISEoYXRvbWljX3JlYWQoJmRldl9wcml2LT5yaW5nW2VuZ2luZS0+ aWRdLmhhbmdjaGVjay5mbGFncykKKwkJCSYgSTkxNV9FTkdJTkVfUkVTRVRfSU5fUFJPR1JFU1Mp OworCX0gZWxzZSB7CisJCWludCBpOworCisJCWZvciAoaSA9IDA7IGkgPCBJOTE1X05VTV9SSU5H UzsgaSsrKQorCQkJaWYgKGF0b21pY19yZWFkKCZkZXZfcHJpdi0+cmluZ1tpXS5oYW5nY2hlY2su ZmxhZ3MpCisJCQkJJiBJOTE1X0VOR0lORV9SRVNFVF9JTl9QUk9HUkVTUykgeworCisJCQkJcmV0 ID0gMTsKKwkJCQlicmVhazsKKwkJCX0KKwl9CisKKwlyZXR1cm4gcmV0OworfQorCiBzdGF0aWMg aW50Ci1pOTE1X2dlbV93YWl0X2Zvcl9lcnJvcihzdHJ1Y3QgaTkxNV9ncHVfZXJyb3IgKmVycm9y KQoraTkxNV9nZW1fd2FpdF9mb3JfZXJyb3Ioc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9w cml2KQogewogCWludCByZXQ7CisJc3RydWN0IGk5MTVfZ3B1X2Vycm9yICplcnJvciA9ICZkZXZf cHJpdi0+Z3B1X2Vycm9yOwogCiAjZGVmaW5lIEVYSVRfQ09ORCAoIWk5MTVfcmVzZXRfaW5fcHJv Z3Jlc3MoZXJyb3IpIHx8IFwKKwkJICAgIWk5MTVfZW5naW5lX3Jlc2V0X2luX3Byb2dyZXNzKGRl dl9wcml2LCBOVUxMKSB8fCBcCiAJCSAgIGk5MTVfdGVybWluYWxseV93ZWRnZWQoZXJyb3IpKQog CWlmIChFWElUX0NPTkQpCiAJCXJldHVybiAwOwpAQCAtMTE0LDcgKzE0MCw3IEBAIGludCBpOTE1 X211dGV4X2xvY2tfaW50ZXJydXB0aWJsZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCXN0cnVj dCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7CiAJaW50IHJl dDsKIAotCXJldCA9IGk5MTVfZ2VtX3dhaXRfZm9yX2Vycm9yKCZkZXZfcHJpdi0+Z3B1X2Vycm9y KTsKKwlyZXQgPSBpOTE1X2dlbV93YWl0X2Zvcl9lcnJvcihkZXZfcHJpdik7CiAJaWYgKHJldCkK IAkJcmV0dXJuIHJldDsKIApAQCAtMTExMCwxMCArMTEzNiwxNSBAQCBwdXRfcnBtOgogfQogCiBp bnQKLWk5MTVfZ2VtX2NoZWNrX3dlZGdlKHN0cnVjdCBpOTE1X2dwdV9lcnJvciAqZXJyb3IsCitp OTE1X2dlbV9jaGVja193ZWRnZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCisJ CSAgICAgc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lLAogCQkgICAgIGJvb2wgaW50ZXJy dXB0aWJsZSkKIHsKLQlpZiAoaTkxNV9yZXNldF9pbl9wcm9ncmVzcyhlcnJvcikpIHsKKwlzdHJ1 Y3QgaTkxNV9ncHVfZXJyb3IgKmVycm9yID0gJmRldl9wcml2LT5ncHVfZXJyb3I7CisKKwlpZiAo aTkxNV9yZXNldF9pbl9wcm9ncmVzcyhlcnJvcikgfHwKKwkgICAgaTkxNV9lbmdpbmVfcmVzZXRf aW5fcHJvZ3Jlc3MoZGV2X3ByaXYsIGVuZ2luZSkpIHsKKwogCQkvKiBOb24taW50ZXJydXB0aWJs ZSBjYWxsZXJzIGNhbid0IGhhbmRsZSAtRUFHQUlOLCBoZW5jZSByZXR1cm4KIAkJICogLUVJTyB1 bmNvbmRpdGlvbmFsbHkgZm9yIHRoZXNlLiAqLwogCQlpZiAoIWludGVycnVwdGlibGUpCkBAIC0x MjAxLDYgKzEyMzIsNyBAQCBpbnQgX19pOTE1X3dhaXRfcmVxdWVzdChzdHJ1Y3QgZHJtX2k5MTVf Z2VtX3JlcXVlc3QgKnJlcSwKIAl1bnNpZ25lZCBsb25nIHRpbWVvdXRfZXhwaXJlOwogCXM2NCBi ZWZvcmUsIG5vdzsKIAlpbnQgcmV0OworCWludCByZXNldF9pbl9wcm9ncmVzcyA9IDA7CiAKIAlX QVJOKCFpbnRlbF9pcnFzX2VuYWJsZWQoZGV2X3ByaXYpLCAiSVJRcyBkaXNhYmxlZCIpOwogCkBA IC0xMjM4LDExICsxMjcwLDE3IEBAIGludCBfX2k5MTVfd2FpdF9yZXF1ZXN0KHN0cnVjdCBkcm1f aTkxNV9nZW1fcmVxdWVzdCAqcmVxLAogCiAJCS8qIFdlIG5lZWQgdG8gY2hlY2sgd2hldGhlciBh bnkgZ3B1IHJlc2V0IGhhcHBlbmVkIGluIGJldHdlZW4KIAkJICogdGhlIGNhbGxlciBncmFiYmlu ZyB0aGUgc2Vxbm8gYW5kIG5vdyAuLi4gKi8KLQkJaWYgKHJlc2V0X2NvdW50ZXIgIT0gYXRvbWlj X3JlYWQoJmRldl9wcml2LT5ncHVfZXJyb3IucmVzZXRfY291bnRlcikpIHsKKwkJcmVzZXRfaW5f cHJvZ3Jlc3MgPQorCQkJaTkxNV9nZW1fY2hlY2tfd2VkZ2UocmluZy0+ZGV2LT5kZXZfcHJpdmF0 ZSwgTlVMTCwgaW50ZXJydXB0aWJsZSk7CisKKwkJaWYgKChyZXNldF9jb3VudGVyICE9IGF0b21p Y19yZWFkKCZkZXZfcHJpdi0+Z3B1X2Vycm9yLnJlc2V0X2NvdW50ZXIpKSB8fAorCQkgICAgIHJl c2V0X2luX3Byb2dyZXNzKSB7CisKIAkJCS8qIC4uLiBidXQgdXBncmFkZSB0aGUgLUVBR0FJTiB0 byBhbiAtRUlPIGlmIHRoZSBncHUKIAkJCSAqIGlzIHRydWVseSBnb25lLiAqLwotCQkJcmV0ID0g aTkxNV9nZW1fY2hlY2tfd2VkZ2UoJmRldl9wcml2LT5ncHVfZXJyb3IsIGludGVycnVwdGlibGUp OwotCQkJaWYgKHJldCA9PSAwKQorCQkJaWYgKHJlc2V0X2luX3Byb2dyZXNzKQorCQkJCXJldCA9 IHJlc2V0X2luX3Byb2dyZXNzOworCQkJZWxzZQogCQkJCXJldCA9IC1FQUdBSU47CiAJCQlicmVh azsKIAkJfQpAQCAtMTQxMSw3ICsxNDQ5LDcgQEAgaTkxNV93YWl0X3JlcXVlc3Qoc3RydWN0IGRy bV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEpCiAKIAlCVUdfT04oIW11dGV4X2lzX2xvY2tlZCgmZGV2 LT5zdHJ1Y3RfbXV0ZXgpKTsKIAotCXJldCA9IGk5MTVfZ2VtX2NoZWNrX3dlZGdlKCZkZXZfcHJp di0+Z3B1X2Vycm9yLCBpbnRlcnJ1cHRpYmxlKTsKKwlyZXQgPSBpOTE1X2dlbV9jaGVja193ZWRn ZShkZXZfcHJpdiwgTlVMTCwgaW50ZXJydXB0aWJsZSk7CiAJaWYgKHJldCkKIAkJcmV0dXJuIHJl dDsKIApAQCAtMTUwMSw3ICsxNTM5LDcgQEAgaTkxNV9nZW1fb2JqZWN0X3dhaXRfcmVuZGVyaW5n X19ub25ibG9ja2luZyhzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqLAogCWlmICghb2Jq LT5hY3RpdmUpCiAJCXJldHVybiAwOwogCi0JcmV0ID0gaTkxNV9nZW1fY2hlY2tfd2VkZ2UoJmRl dl9wcml2LT5ncHVfZXJyb3IsIHRydWUpOworCXJldCA9IGk5MTVfZ2VtX2NoZWNrX3dlZGdlKGRl dl9wcml2LCBOVUxMLCB0cnVlKTsKIAlpZiAocmV0KQogCQlyZXR1cm4gcmV0OwogCkBAIC00MDA5 LDExICs0MDQ3LDExIEBAIGk5MTVfZ2VtX3JpbmdfdGhyb3R0bGUoc3RydWN0IGRybV9kZXZpY2Ug KmRldiwgc3RydWN0IGRybV9maWxlICpmaWxlKQogCXVuc2lnbmVkIHJlc2V0X2NvdW50ZXI7CiAJ aW50IHJldDsKIAotCXJldCA9IGk5MTVfZ2VtX3dhaXRfZm9yX2Vycm9yKCZkZXZfcHJpdi0+Z3B1 X2Vycm9yKTsKKwlyZXQgPSBpOTE1X2dlbV93YWl0X2Zvcl9lcnJvcihkZXZfcHJpdik7CiAJaWYg KHJldCkKIAkJcmV0dXJuIHJldDsKIAotCXJldCA9IGk5MTVfZ2VtX2NoZWNrX3dlZGdlKCZkZXZf cHJpdi0+Z3B1X2Vycm9yLCBmYWxzZSk7CisJcmV0ID0gaTkxNV9nZW1fY2hlY2tfd2VkZ2UoZGV2 X3ByaXYsIE5VTEwsIGZhbHNlKTsKIAlpZiAocmV0KQogCQlyZXR1cm4gcmV0OwogCmRpZmYgLS1n aXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2xyYy5jCmluZGV4IGExMTMyODAuLmIwNjIzMmMgMTAwNjQ0Ci0tLSBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2xyYy5jCkBAIC0xMDI3LDggKzEwMjcsOCBAQCBpbnQgaW50ZWxfbG9naWNhbF9yaW5nX2Jl Z2luKHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxLCBpbnQgbnVtX2R3b3JkcykKIAog CVdBUk5fT04ocmVxID09IE5VTEwpOwogCWRldl9wcml2ID0gcmVxLT5yaW5nLT5kZXYtPmRldl9w cml2YXRlOwotCi0JcmV0ID0gaTkxNV9nZW1fY2hlY2tfd2VkZ2UoJmRldl9wcml2LT5ncHVfZXJy b3IsCisJcmV0ID0gaTkxNV9nZW1fY2hlY2tfd2VkZ2UoZGV2X3ByaXYsCisJCQkJICAgcmVxLT5y aW5nLAogCQkJCSAgIGRldl9wcml2LT5tbS5pbnRlcnJ1cHRpYmxlKTsKIAlpZiAocmV0KQogCQly ZXR1cm4gcmV0OwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1 ZmZlci5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jCmluZGV4IDAw ZGU1YjguLjM3NTZmYmIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Jp bmdidWZmZXIuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmMK QEAgLTI0OTcsOCArMjQ5NywxMCBAQCBpbnQgaW50ZWxfcmluZ19iZWdpbihzdHJ1Y3QgZHJtX2k5 MTVfZ2VtX3JlcXVlc3QgKnJlcSwKIAlyaW5nID0gcmVxLT5yaW5nOwogCWRldl9wcml2ID0gcmlu Zy0+ZGV2LT5kZXZfcHJpdmF0ZTsKIAotCXJldCA9IGk5MTVfZ2VtX2NoZWNrX3dlZGdlKCZkZXZf cHJpdi0+Z3B1X2Vycm9yLAorCXJldCA9IGk5MTVfZ2VtX2NoZWNrX3dlZGdlKGRldl9wcml2LAor CQkJCSAgIHJpbmcsCiAJCQkJICAgZGV2X3ByaXYtPm1tLmludGVycnVwdGlibGUpOworCiAJaWYg KHJldCkKIAkJcmV0dXJuIHJldDsKIAotLSAKMS45LjEKCl9fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4 QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxt YW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==