From: Arun Siluvery Subject: [PATCH 05/20] drm/i915: Extending i915_gem_check_wedge to check engine reset in progress Date: Wed, 13 Jan 2016 17:28:17 +0000 Message-ID: <1452706112-8617-6-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 mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTP id CAD2B8995F for ; Wed, 13 Jan 2016 09:28:43 -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: Ian Lister , Tomas Elf List-Id: intel-gfx@lists.freedesktop.org RnJvbTogVG9tYXMgRWxmIDx0b21hcy5lbGZAaW50ZWwuY29tPgoKaTkxNV9nZW1fd2VkZ2Ugbm93 IHJldHVybnMgYSBub24temVybyByZXN1bHQgaW4gdGhyZWUgZGlmZmVyZW50IGNhc2VzOgoKMS4g TGVnYWN5OiBBIGhhbmcgaGFzIGJlZW4gZGV0ZWN0ZWQgYW5kIGZ1bGwgR1BVIHJlc2V0IGlzIGlu IHByb2dyZXNzLgoKMi4gUGVyLWVuZ2luZSByZWNvdmVyeToKCglhLiBBIHNpbmdsZSBlbmdpbmUg cmVmZXJlbmNlIGNhbiBiZSBwYXNzZWQgdG8gdGhlIGZ1bmN0aW9uLCBpbiB3aGljaAoJY2FzZSBv bmx5IHRoYXQgZW5naW5lIHdpbGwgYmUgY2hlY2tlZC4gSWYgdGhhdCBwYXJ0aWN1bGFyIGVuZ2lu ZSBpcwoJZGV0ZWN0ZWQgdG8gYmUgaHVuZyBhbmQgaXMgdG8gYmUgcmVzZXQgdGhpcyB3aWxsIHlp ZWxkIGEgbm9uLXplcm8KCXJlc3VsdCBidXQgbm90IGlmIHJlc2V0IGlzIGluIHByb2dyZXNzIGZv ciBhbnkgb3RoZXIgZW5naW5lLgoKCWIuIE5vIGVuZ2luZSByZWZlcmVuY2UgaXMgcGFzc2VkIHRv IHRoZSBmdW5jdGlvbiwgaW4gd2hpY2ggY2FzZSBhbGwKCWVuZ2luZXMgYXJlIGNoZWNrZWQgZm9y IG9uZ29pbmcgcGVyLWVuZ2luZSBoYW5nIHJlY292ZXJ5LgoKQWxzbywgaTkxNV93YWl0X3JlcXVl c3Qgd2FzIHVwZGF0ZWQgdG8gdGFrZSBhZHZhbnRhZ2Ugb2YgdGhpcyBuZXcKZnVuY3Rpb25hbGl0 eS4gVGhpcyBpcyBpbXBvcnRhbnQgc2luY2UgdGhlIFREUiBoYW5nIHJlY292ZXJ5IG1lY2hhbmlz bSBuZWVkcyBhCndheSB0byBmb3JjZSB3YWl0aW5nIHRocmVhZHMgdGhhdCBob2xkIHRoZSBzdHJ1 Y3RfbXV0ZXggdG8gZ2l2ZSB1cCB0aGUKc3RydWN0X211dGV4IGFuZCB0cnkgYWdhaW4gYWZ0ZXIg dGhlIGhhbmcgcmVjb3ZlcnkgaGFzIGNvbXBsZXRlZC4gSWYKaTkxNV93YWl0X3JlcXVlc3QgZG9l cyBub3QgdGFrZSBwZXItZW5naW5lIGhhbmcgcmVjb3ZlcnkgaW50byBhY2NvdW50IHRoZXJlIGlz Cm5vIHdheSBmb3IgYSB3YWl0aW5nIHRocmVhZCB0byBrbm93IHRoYXQgYSBwZXItZW5naW5lIHJl Y292ZXJ5IGlzIGFib3V0IHRvCmhhcHBlbiBhbmQgdGhhdCBpdCBuZWVkcyB0byBiYWNrIG9mZi4K ClNpZ25lZC1vZmYtYnk6IFRvbWFzIEVsZiA8dG9tYXMuZWxmQGludGVsLmNvbT4KU2lnbmVkLW9m Zi1ieTogQXJ1biBTaWx1dmVyeSA8YXJ1bi5zaWx1dmVyeUBpbnRlbC5jb20+ClNpZ25lZC1vZmYt Ynk6IElhbiBMaXN0ZXIgPGlhbi5saXN0ZXJAaW50ZWwuY29tPgpDYzogQ2hyaXMgV2lsc29uIDxj aHJpc0BjaHJpcy13aWxzb24uY28udWs+CkNjOiBNaWthIEt1b3BwYWxhIDxtaWthLmt1b3BwYWxh QGxpbnV4LmludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oICAg ICAgICAgfCAgMyArLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYyAgICAgICAgIHwg NjAgKysrKysrKysrKysrKysrKysrKysrKysrKysrLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9scmMuYyAgICAgICAgfCAgNCArLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X3JpbmdidWZmZXIuYyB8ICA0ICsrLQogNCBmaWxlcyBjaGFuZ2VkLCA1NiBpbnNlcnRpb25zKCsp LCAxNSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2Rydi5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAppbmRleCA4NWNmNjkyLi41 YmU3ZDNlIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCisrKyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKQEAgLTMwMzMsNyArMzAzMyw4IEBAIGk5 MTVfZ2VtX2ZpbmRfYWN0aXZlX3JlcXVlc3Qoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZyk7 CiAKIGJvb2wgaTkxNV9nZW1fcmV0aXJlX3JlcXVlc3RzKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYp Owogdm9pZCBpOTE1X2dlbV9yZXRpcmVfcmVxdWVzdHNfcmluZyhzdHJ1Y3QgaW50ZWxfZW5naW5l X2NzICpyaW5nKTsKLWludCBfX211c3RfY2hlY2sgaTkxNV9nZW1fY2hlY2tfd2VkZ2Uoc3RydWN0 IGk5MTVfZ3B1X2Vycm9yICplcnJvciwKK2ludCBfX211c3RfY2hlY2sgaTkxNV9nZW1fY2hlY2tf d2VkZ2Uoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAorCQkJCSAgICAgIHN0cnVj dCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSwKIAkJCQkgICAgICBib29sIGludGVycnVwdGlibGUp OwogCiBzdGF0aWMgaW5saW5lIGJvb2wgaTkxNV9yZXNldF9pbl9wcm9ncmVzcyhzdHJ1Y3QgaTkx NV9ncHVfZXJyb3IgKmVycm9yKQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx NV9nZW0uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKaW5kZXggZTNjZmVkMi4u ZTZlYjQ1ZCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYworKysg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCkBAIC04MCwxMiArODAsMzggQEAgc3Rh dGljIHZvaWQgaTkxNV9nZW1faW5mb19yZW1vdmVfb2JqKHN0cnVjdCBkcm1faTkxNV9wcml2YXRl ICpkZXZfcHJpdiwKIAlzcGluX3VubG9jaygmZGV2X3ByaXYtPm1tLm9iamVjdF9zdGF0X2xvY2sp OwogfQogCitzdGF0aWMgaW5saW5lIGludAoraTkxNV9lbmdpbmVfcmVzZXRfaW5fcHJvZ3Jlc3Mo c3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAorCXN0cnVjdCBpbnRlbF9lbmdpbmVf Y3MgKmVuZ2luZSkKK3sKKwlpbnQgcmV0ID0gMDsKKworCWlmIChlbmdpbmUpIHsKKwkJcmV0ID0g ISEoYXRvbWljX3JlYWQoJmRldl9wcml2LT5yaW5nW2VuZ2luZS0+aWRdLmhhbmdjaGVjay5mbGFn cykKKwkJCSYgSTkxNV9FTkdJTkVfUkVTRVRfSU5fUFJPR1JFU1MpOworCX0gZWxzZSB7CisJCWlu dCBpOworCisJCWZvciAoaSA9IDA7IGkgPCBJOTE1X05VTV9SSU5HUzsgaSsrKQorCQkJaWYgKGF0 b21pY19yZWFkKCZkZXZfcHJpdi0+cmluZ1tpXS5oYW5nY2hlY2suZmxhZ3MpCisJCQkJJiBJOTE1 X0VOR0lORV9SRVNFVF9JTl9QUk9HUkVTUykgeworCisJCQkJcmV0ID0gMTsKKwkJCQlicmVhazsK KwkJCX0KKwl9CisKKwlyZXR1cm4gcmV0OworfQorCiBzdGF0aWMgaW50Ci1pOTE1X2dlbV93YWl0 X2Zvcl9lcnJvcihzdHJ1Y3QgaTkxNV9ncHVfZXJyb3IgKmVycm9yKQoraTkxNV9nZW1fd2FpdF9m b3JfZXJyb3Ioc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogewogCWludCByZXQ7 CisJc3RydWN0IGk5MTVfZ3B1X2Vycm9yICplcnJvciA9ICZkZXZfcHJpdi0+Z3B1X2Vycm9yOwog CiAjZGVmaW5lIEVYSVRfQ09ORCAoIWk5MTVfcmVzZXRfaW5fcHJvZ3Jlc3MoZXJyb3IpIHx8IFwK KwkJICAgIWk5MTVfZW5naW5lX3Jlc2V0X2luX3Byb2dyZXNzKGRldl9wcml2LCBOVUxMKSB8fCBc CiAJCSAgIGk5MTVfdGVybWluYWxseV93ZWRnZWQoZXJyb3IpKQogCWlmIChFWElUX0NPTkQpCiAJ CXJldHVybiAwOwpAQCAtMTE0LDcgKzE0MCw3IEBAIGludCBpOTE1X211dGV4X2xvY2tfaW50ZXJy dXB0aWJsZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRl ICpkZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7CiAJaW50IHJldDsKIAotCXJldCA9IGk5MTVf Z2VtX3dhaXRfZm9yX2Vycm9yKCZkZXZfcHJpdi0+Z3B1X2Vycm9yKTsKKwlyZXQgPSBpOTE1X2dl bV93YWl0X2Zvcl9lcnJvcihkZXZfcHJpdik7CiAJaWYgKHJldCkKIAkJcmV0dXJuIHJldDsKIApA QCAtMTExMCwxMCArMTEzNiwxNSBAQCBwdXRfcnBtOgogfQogCiBpbnQKLWk5MTVfZ2VtX2NoZWNr X3dlZGdlKHN0cnVjdCBpOTE1X2dwdV9lcnJvciAqZXJyb3IsCitpOTE1X2dlbV9jaGVja193ZWRn ZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCisJCSAgICAgc3RydWN0IGludGVs X2VuZ2luZV9jcyAqZW5naW5lLAogCQkgICAgIGJvb2wgaW50ZXJydXB0aWJsZSkKIHsKLQlpZiAo aTkxNV9yZXNldF9pbl9wcm9ncmVzcyhlcnJvcikpIHsKKwlzdHJ1Y3QgaTkxNV9ncHVfZXJyb3Ig KmVycm9yID0gJmRldl9wcml2LT5ncHVfZXJyb3I7CisKKwlpZiAoaTkxNV9yZXNldF9pbl9wcm9n cmVzcyhlcnJvcikgfHwKKwkgICAgaTkxNV9lbmdpbmVfcmVzZXRfaW5fcHJvZ3Jlc3MoZGV2X3By aXYsIGVuZ2luZSkpIHsKKwogCQkvKiBOb24taW50ZXJydXB0aWJsZSBjYWxsZXJzIGNhbid0IGhh bmRsZSAtRUFHQUlOLCBoZW5jZSByZXR1cm4KIAkJICogLUVJTyB1bmNvbmRpdGlvbmFsbHkgZm9y IHRoZXNlLiAqLwogCQlpZiAoIWludGVycnVwdGlibGUpCkBAIC0xMjUzLDYgKzEyODQsNyBAQCBp bnQgX19pOTE1X3dhaXRfcmVxdWVzdChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSwK IAl1bnNpZ25lZCBsb25nIHRpbWVvdXRfZXhwaXJlOwogCXM2NCBiZWZvcmUsIG5vdzsKIAlpbnQg cmV0OworCWludCByZXNldF9pbl9wcm9ncmVzcyA9IDA7CiAKIAlXQVJOKCFpbnRlbF9pcnFzX2Vu YWJsZWQoZGV2X3ByaXYpLCAiSVJRcyBkaXNhYmxlZCIpOwogCkBAIC0xMjk3LDExICsxMzI5LDE3 IEBAIGludCBfX2k5MTVfd2FpdF9yZXF1ZXN0KHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAq cmVxLAogCiAJCS8qIFdlIG5lZWQgdG8gY2hlY2sgd2hldGhlciBhbnkgZ3B1IHJlc2V0IGhhcHBl bmVkIGluIGJldHdlZW4KIAkJICogdGhlIGNhbGxlciBncmFiYmluZyB0aGUgc2Vxbm8gYW5kIG5v dyAuLi4gKi8KLQkJaWYgKHJlc2V0X2NvdW50ZXIgIT0gYXRvbWljX3JlYWQoJmRldl9wcml2LT5n cHVfZXJyb3IucmVzZXRfY291bnRlcikpIHsKKwkJcmVzZXRfaW5fcHJvZ3Jlc3MgPQorCQkJaTkx NV9nZW1fY2hlY2tfd2VkZ2UocmluZy0+ZGV2LT5kZXZfcHJpdmF0ZSwgTlVMTCwgaW50ZXJydXB0 aWJsZSk7CisKKwkJaWYgKChyZXNldF9jb3VudGVyICE9IGF0b21pY19yZWFkKCZkZXZfcHJpdi0+ Z3B1X2Vycm9yLnJlc2V0X2NvdW50ZXIpKSB8fAorCQkgICAgIHJlc2V0X2luX3Byb2dyZXNzKSB7 CisKIAkJCS8qIC4uLiBidXQgdXBncmFkZSB0aGUgLUVBR0FJTiB0byBhbiAtRUlPIGlmIHRoZSBn cHUKIAkJCSAqIGlzIHRydWVseSBnb25lLiAqLwotCQkJcmV0ID0gaTkxNV9nZW1fY2hlY2tfd2Vk Z2UoJmRldl9wcml2LT5ncHVfZXJyb3IsIGludGVycnVwdGlibGUpOwotCQkJaWYgKHJldCA9PSAw KQorCQkJaWYgKHJlc2V0X2luX3Byb2dyZXNzKQorCQkJCXJldCA9IHJlc2V0X2luX3Byb2dyZXNz OworCQkJZWxzZQogCQkJCXJldCA9IC1FQUdBSU47CiAJCQlicmVhazsKIAkJfQpAQCAtMTQ3MCw3 ICsxNTA4LDcgQEAgaTkxNV93YWl0X3JlcXVlc3Qoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0 ICpyZXEpCiAKIAlCVUdfT04oIW11dGV4X2lzX2xvY2tlZCgmZGV2LT5zdHJ1Y3RfbXV0ZXgpKTsK IAotCXJldCA9IGk5MTVfZ2VtX2NoZWNrX3dlZGdlKCZkZXZfcHJpdi0+Z3B1X2Vycm9yLCBpbnRl cnJ1cHRpYmxlKTsKKwlyZXQgPSBpOTE1X2dlbV9jaGVja193ZWRnZShkZXZfcHJpdiwgTlVMTCwg aW50ZXJydXB0aWJsZSk7CiAJaWYgKHJldCkKIAkJcmV0dXJuIHJldDsKIApAQCAtMTU2MCw3ICsx NTk4LDcgQEAgaTkxNV9nZW1fb2JqZWN0X3dhaXRfcmVuZGVyaW5nX19ub25ibG9ja2luZyhzdHJ1 Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqLAogCWlmICghb2JqLT5hY3RpdmUpCiAJCXJldHVy biAwOwogCi0JcmV0ID0gaTkxNV9nZW1fY2hlY2tfd2VkZ2UoJmRldl9wcml2LT5ncHVfZXJyb3Is IHRydWUpOworCXJldCA9IGk5MTVfZ2VtX2NoZWNrX3dlZGdlKGRldl9wcml2LCBOVUxMLCB0cnVl KTsKIAlpZiAocmV0KQogCQlyZXR1cm4gcmV0OwogCkBAIC00MTA0LDExICs0MTQyLDExIEBAIGk5 MTVfZ2VtX3JpbmdfdGhyb3R0bGUoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgc3RydWN0IGRybV9m aWxlICpmaWxlKQogCXVuc2lnbmVkIHJlc2V0X2NvdW50ZXI7CiAJaW50IHJldDsKIAotCXJldCA9 IGk5MTVfZ2VtX3dhaXRfZm9yX2Vycm9yKCZkZXZfcHJpdi0+Z3B1X2Vycm9yKTsKKwlyZXQgPSBp OTE1X2dlbV93YWl0X2Zvcl9lcnJvcihkZXZfcHJpdik7CiAJaWYgKHJldCkKIAkJcmV0dXJuIHJl dDsKIAotCXJldCA9IGk5MTVfZ2VtX2NoZWNrX3dlZGdlKCZkZXZfcHJpdi0+Z3B1X2Vycm9yLCBm YWxzZSk7CisJcmV0ID0gaTkxNV9nZW1fY2hlY2tfd2VkZ2UoZGV2X3ByaXYsIE5VTEwsIGZhbHNl KTsKIAlpZiAocmV0KQogCQlyZXR1cm4gcmV0OwogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9scmMuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jCmlu ZGV4IGZjZWM0NzYuLmEyZTU2ZDQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2xyYy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jCkBAIC0xMDY2 LDggKzEwNjYsOCBAQCBpbnQgaW50ZWxfbG9naWNhbF9yaW5nX2JlZ2luKHN0cnVjdCBkcm1faTkx NV9nZW1fcmVxdWVzdCAqcmVxLCBpbnQgbnVtX2R3b3JkcykKIAogCVdBUk5fT04ocmVxID09IE5V TEwpOwogCWRldl9wcml2ID0gcmVxLT5yaW5nLT5kZXYtPmRldl9wcml2YXRlOwotCi0JcmV0ID0g aTkxNV9nZW1fY2hlY2tfd2VkZ2UoJmRldl9wcml2LT5ncHVfZXJyb3IsCisJcmV0ID0gaTkxNV9n ZW1fY2hlY2tfd2VkZ2UoZGV2X3ByaXYsCisJCQkJICAgcmVxLT5yaW5nLAogCQkJCSAgIGRldl9w cml2LT5tbS5pbnRlcnJ1cHRpYmxlKTsKIAlpZiAocmV0KQogCQlyZXR1cm4gcmV0OwpkaWZmIC0t Z2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jCmluZGV4IGRlZjBkY2YuLmY5NTkzMjYgMTAw NjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuYworKysgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmMKQEAgLTI1MDEsOCArMjUwMSwx MCBAQCBpbnQgaW50ZWxfcmluZ19iZWdpbihzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJl cSwKIAlyaW5nID0gcmVxLT5yaW5nOwogCWRldl9wcml2ID0gcmluZy0+ZGV2LT5kZXZfcHJpdmF0 ZTsKIAotCXJldCA9IGk5MTVfZ2VtX2NoZWNrX3dlZGdlKCZkZXZfcHJpdi0+Z3B1X2Vycm9yLAor CXJldCA9IGk5MTVfZ2VtX2NoZWNrX3dlZGdlKGRldl9wcml2LAorCQkJCSAgIHJpbmcsCiAJCQkJ ICAgZGV2X3ByaXYtPm1tLmludGVycnVwdGlibGUpOworCiAJaWYgKHJldCkKIAkJcmV0dXJuIHJl dDsKIAotLSAKMS45LjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9w Lm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwt Z2Z4Cg==