From mboxrd@z Thu Jan 1 00:00:00 1970 From: Arun Siluvery Subject: [PATCH v2 10/15] drm/i915: Extending i915_gem_check_wedge to check engine reset in progress Date: Fri, 17 Jun 2016 08:09:10 +0100 Message-ID: <1466147355-4635-11-git-send-email-arun.siluvery@linux.intel.com> References: <1466147355-4635-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 mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTP id A20936EADE for ; Fri, 17 Jun 2016 07:09:47 +0000 (UTC) In-Reply-To: <1466147355-4635-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 aTkxNV9nZW1fY2hlY2tfd2VkZ2Ugbm93IHJldHVybnMgYSBub24temVybyByZXN1bHQgaW4gdGhy ZWUgZGlmZmVyZW50IGNhc2VzOgoKMS4gTGVnYWN5OiBBIGhhbmcgaGFzIGJlZW4gZGV0ZWN0ZWQg YW5kIGZ1bGwgR1BVIHJlc2V0IGlzIGluIHByb2dyZXNzLgoKMi4gUGVyLWVuZ2luZSByZWNvdmVy eToKICAgYS4gQSBzaW5nbGUgZW5naW5lIHJlZmVyZW5jZSBjYW4gYmUgcGFzc2VkIHRvIHRoZSBm dW5jdGlvbiwgaW4gd2hpY2gKICAgY2FzZSBvbmx5IHRoYXQgZW5naW5lIHdpbGwgYmUgY2hlY2tl ZC4gSWYgdGhhdCBwYXJ0aWN1bGFyIGVuZ2luZSBpcwogICBkZXRlY3RlZCB0byBiZSBodW5nIGFu ZCBpcyB0byBiZSByZXNldCB0aGlzIHdpbGwgeWllbGQgYSBub24temVybyByZXN1bHQKICAgYnV0 IG5vdCBpZiByZXNldCBpcyBpbiBwcm9ncmVzcyBmb3IgYW55IG90aGVyIGVuZ2luZS4KCiAgIGIu IE5vIGVuZ2luZSByZWZlcmVuY2UgaXMgcGFzc2VkIHRvIHRoZSBmdW5jdGlvbiwgaW4gd2hpY2gg Y2FzZSBhbGwKICAgZW5naW5lcyBhcmUgY2hlY2tlZCBmb3Igb25nb2luZyBwZXItZW5naW5lIGhh bmcgcmVjb3ZlcnkuCgpfX2k5MTVfd2FpdF9yZXF1ZXN0KCkgaXMgdXBkYXRlZCBzdWNoIHRoYXQg aWYgYW4gZW5naW5lIHJlc2V0IGlzIHBlbmRpbmcsCndlIHJlcXVlc3QgdGhlIHdhaXRlciB0byB0 cnkgYWdhaW4gc28gdGhhdCBlbmdpbmUgcmVjb3ZlcnkgY2FuIGNvbnRpbnVlLgpJZiBpOTE1X3dh aXRfcmVxdWVzdCBkb2VzIG5vdCB0YWtlIHBlci1lbmdpbmUgaGFuZyByZWNvdmVyeSBpbnRvIGFj Y291bnQKdGhlcmUgaXMgbm8gd2F5IGZvciBhIHdhaXRpbmcgdGhyZWFkIHRvIGtub3cgdGhhdCBh IHBlci1lbmdpbmUgcmVjb3ZlcnkgaXMKYWJvdXQgdG8gaGFwcGVuIGFuZCB0aGF0IGl0IG5lZWRz IHRvIGJhY2sgb2ZmLgoKU2lnbmVkLW9mZi1ieTogVG9tYXMgRWxmIDx0b21hcy5lbGZAaW50ZWwu Y29tPgpTaWduZWQtb2ZmLWJ5OiBJYW4gTGlzdGVyIDxpYW4ubGlzdGVyQGludGVsLmNvbT4KQ2M6 IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hyaXMtd2lsc29uLmNvLnVrPgpDYzogTWlrYSBLdW9wcGFs YSA8bWlrYS5rdW9wcGFsYUBsaW51eC5pbnRlbC5jb20+ClNpZ25lZC1vZmYtYnk6IEFydW4gU2ls dXZlcnkgPGFydW4uc2lsdXZlcnlAbGludXguaW50ZWwuY29tPgotLS0KClRoZXNlIGNoYW5nZXMg YXJlIGJhc2VkIG9uIGN1cnJlbnQgbmlnaHRseS4gSSBhbSBhd2FyZSBvZiB0aGUgY2hhbmdlcyBi ZWluZwpkb25lIHRvIHdhaXRfcmVxdWVzdCBwYXRjaCBpbiAidGh1bmRlcmluZyBoZXJkIHNlcmll cyIgYnV0IG15IHVuZGVyc3RhbmRpbmcKaXMgaXQgaGFzIG90aGVyIGRlcGVuZGVuY2llcy4gV2Ug Y2FuIGFkZCBpbmNyZW1lbnRhbCBjaGFuZ2VzIG9uY2UgdGhhdApzZXJpZXMgaXMgbWVyZ2VkLgoK IGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMgfCA0MyArKysrKysrKysrKysrKysrKysr KysrKysrKysrKysrKysrKystLS0tLQogMSBmaWxlIGNoYW5nZWQsIDM4IGluc2VydGlvbnMoKyks IDUgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9n ZW0uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKaW5kZXggNjE2MDU2NC4uYmM0 MDRkYSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYworKysgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCkBAIC0xMDAsMTIgKzEwMCwzMSBAQCBzdGF0 aWMgdm9pZCBpOTE1X2dlbV9pbmZvX3JlbW92ZV9vYmooc3RydWN0IGRybV9pOTE1X3ByaXZhdGUg KmRldl9wcml2LAogCXNwaW5fdW5sb2NrKCZkZXZfcHJpdi0+bW0ub2JqZWN0X3N0YXRfbG9jayk7 CiB9CiAKK3N0YXRpYyBib29sIGk5MTVfZW5naW5lX3Jlc2V0X3BlbmRpbmcoc3RydWN0IGk5MTVf Z3B1X2Vycm9yICplcnJvciwKKwkJCQkgICAgIHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2lu ZSkKK3sKKwlpbnQgaTsKKworCWlmIChlbmdpbmUpCisJCXJldHVybiBpOTE1X2VuZ2luZV9yZXNl dF9pbl9wcm9ncmVzcyhlcnJvciwgZW5naW5lLT5pZCk7CisKKwlmb3IgKGkgPSAwOyBpIDwgSTkx NV9OVU1fRU5HSU5FUzsgKytpKSB7CisJCWlmIChpOTE1X2VuZ2luZV9yZXNldF9pbl9wcm9ncmVz cyhlcnJvciwgaSkpCisJCQlyZXR1cm4gdHJ1ZTsKKwl9CisKKwlyZXR1cm4gZmFsc2U7Cit9CisK IHN0YXRpYyBpbnQKIGk5MTVfZ2VtX3dhaXRfZm9yX2Vycm9yKHN0cnVjdCBpOTE1X2dwdV9lcnJv ciAqZXJyb3IpCiB7CiAJaW50IHJldDsKIAotCWlmICghaTkxNV9yZXNldF9pbl9wcm9ncmVzcyhl cnJvcikpCisjZGVmaW5lIEVYSVRfQ09ORCAoIWk5MTVfcmVzZXRfaW5fcHJvZ3Jlc3MoZXJyb3Ip IHx8CVwKKwkJICAgIWk5MTVfZW5naW5lX3Jlc2V0X3BlbmRpbmcoZXJyb3IsIE5VTEwpKQorCisJ aWYgKEVYSVRfQ09ORCkKIAkJcmV0dXJuIDA7CiAKIAkvKgpAQCAtMTE0LDcgKzEzMyw3IEBAIGk5 MTVfZ2VtX3dhaXRfZm9yX2Vycm9yKHN0cnVjdCBpOTE1X2dwdV9lcnJvciAqZXJyb3IpCiAJICog d2Ugc2hvdWxkIHNpbXBseSB0cnkgdG8gYmFpbCBvdXQgYW5kIGZhaWwgYXMgZ3JhY2VmdWxseSBh cyBwb3NzaWJsZS4KIAkgKi8KIAlyZXQgPSB3YWl0X2V2ZW50X2ludGVycnVwdGlibGVfdGltZW91 dChlcnJvci0+cmVzZXRfcXVldWUsCi0JCQkJCSAgICAgICAhaTkxNV9yZXNldF9pbl9wcm9ncmVz cyhlcnJvciksCisJCQkJCSAgICAgICBFWElUX0NPTkQsCiAJCQkJCSAgICAgICAxMCpIWik7CiAJ aWYgKHJldCA9PSAwKSB7CiAJCURSTV9FUlJPUigiVGltZWQgb3V0IHdhaXRpbmcgZm9yIHRoZSBn cHUgcmVzZXQgdG8gY29tcGxldGVcbiIpOwpAQCAtMTMyNSwxMiArMTM0NCwxOCBAQCBwdXRfcnBt OgogfQogCiBzdGF0aWMgaW50Ci1pOTE1X2dlbV9jaGVja193ZWRnZSh1bnNpZ25lZCByZXNldF9j b3VudGVyLCBib29sIGludGVycnVwdGlibGUpCitpOTE1X2dlbV9jaGVja193ZWRnZShzdHJ1Y3Qg ZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCisJCSAgICAgc3RydWN0IGludGVsX2VuZ2luZV9j cyAqZW5naW5lLAorCQkgICAgIGJvb2wgaW50ZXJydXB0aWJsZSkKIHsKKwlzdHJ1Y3QgaTkxNV9n cHVfZXJyb3IgKmVycm9yID0gJmRldl9wcml2LT5ncHVfZXJyb3I7CisJdW5zaWduZWQgcmVzZXRf Y291bnRlciA9IGk5MTVfcmVzZXRfY291bnRlcihlcnJvcik7CisKIAlpZiAoX19pOTE1X3Rlcm1p bmFsbHlfd2VkZ2VkKHJlc2V0X2NvdW50ZXIpKQogCQlyZXR1cm4gLUVJTzsKIAotCWlmIChfX2k5 MTVfcmVzZXRfaW5fcHJvZ3Jlc3MocmVzZXRfY291bnRlcikpIHsKKwlpZiAoX19pOTE1X3Jlc2V0 X2luX3Byb2dyZXNzKHJlc2V0X2NvdW50ZXIpIHx8CisJICAgIGk5MTVfZW5naW5lX3Jlc2V0X3Bl bmRpbmcoZXJyb3IsIGVuZ2luZSkpIHsKIAkJLyogTm9uLWludGVycnVwdGlibGUgY2FsbGVycyBj YW4ndCBoYW5kbGUgLUVBR0FJTiwgaGVuY2UgcmV0dXJuCiAJCSAqIC1FSU8gdW5jb25kaXRpb25h bGx5IGZvciB0aGVzZS4gKi8KIAkJaWYgKCFpbnRlcnJ1cHRpYmxlKQpAQCAtMTUwMCw2ICsxNTI1 LDcgQEAgaW50IF9faTkxNV93YWl0X3JlcXVlc3Qoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0 ICpyZXEsCiAKIAlmb3IgKDs7KSB7CiAJCXN0cnVjdCB0aW1lcl9saXN0IHRpbWVyOworCQlpbnQg cmVzZXRfcGVuZGluZzsKIAogCQlwcmVwYXJlX3RvX3dhaXQoJmVuZ2luZS0+aXJxX3F1ZXVlLCAm d2FpdCwgc3RhdGUpOwogCkBAIC0xNTE1LDYgKzE1NDEsMTMgQEAgaW50IF9faTkxNV93YWl0X3Jl cXVlc3Qoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEsCiAJCQlicmVhazsKIAkJfQog CisJCXJlc2V0X3BlbmRpbmcgPSBpOTE1X2VuZ2luZV9yZXNldF9wZW5kaW5nKCZkZXZfcHJpdi0+ Z3B1X2Vycm9yLAorCQkJCQkJCSAgTlVMTCk7CisJCWlmIChyZXNldF9wZW5kaW5nKSB7CisJCQly ZXQgPSAtRUFHQUlOOworCQkJYnJlYWs7CisJCX0KKwogCQlpZiAoaTkxNV9nZW1fcmVxdWVzdF9j b21wbGV0ZWQocmVxLCBmYWxzZSkpIHsKIAkJCXJldCA9IDA7CiAJCQlicmVhazsKQEAgLTI5OTcs NyArMzAzMCw3IEBAIF9faTkxNV9nZW1fcmVxdWVzdF9hbGxvYyhzdHJ1Y3QgaW50ZWxfZW5naW5l X2NzICplbmdpbmUsCiAJICogRUlPIGlmIHRoZSBHUFUgaXMgYWxyZWFkeSB3ZWRnZWQsIG9yIEVB R0FJTiB0byBkcm9wIHRoZSBzdHJ1Y3RfbXV0ZXgKIAkgKiBhbmQgcmVzdGFydC4KIAkgKi8KLQly ZXQgPSBpOTE1X2dlbV9jaGVja193ZWRnZShyZXNldF9jb3VudGVyLCBkZXZfcHJpdi0+bW0uaW50 ZXJydXB0aWJsZSk7CisJcmV0ID0gaTkxNV9nZW1fY2hlY2tfd2VkZ2UoZGV2X3ByaXYsIE5VTEws IGRldl9wcml2LT5tbS5pbnRlcnJ1cHRpYmxlKTsKIAlpZiAocmV0KQogCQlyZXR1cm4gcmV0Owog Ci0tIAoxLjkuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3Jn Cmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4 Cg==