From mboxrd@z Thu Jan 1 00:00:00 1970 From: Arun Siluvery Subject: [PATCH 2/3] drm/i915/tdr: Prepare error handler to accept mask of hung engines Date: Fri, 18 Mar 2016 20:07:55 +0000 Message-ID: <1458331676-567-3-git-send-email-arun.siluvery@linux.intel.com> References: <1458331676-567-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 mga04.intel.com (mga04.intel.com [192.55.52.120]) by gabe.freedesktop.org (Postfix) with ESMTP id 1A5796E149 for ; Fri, 18 Mar 2016 20:08:07 +0000 (UTC) In-Reply-To: <1458331676-567-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 , Mika Kuoppala List-Id: intel-gfx@lists.freedesktop.org SW4gcHJlcGFyYXRpb24gZm9yIGVuZ2luZSByZXNldCwgdGhlIHdlZGdlZCBhcmd1bWVudCBvZiBp OTE1X2hhbmRsZV9lcnJvcigpCmlzIGV4dGVuZGVkIHRvIHJlZmxlY3QgYXMgYSBtYXNrIG9mIGVu Z2luZXMgdGhhdCBhcmUgaHVuZy4gVGhpcyBpcyBmdXJ0aGVyCnBhc3NlZCBkb3duIHRvIGVycm9y IHN0YXRlIGNhcHR1cmUgZnVuY3Rpb25zIHdoaWNoIGFyZSBhbHNvIHVwZGF0ZWQuCgpFbmdpbmUg cmVzZXQgcmVjb3ZlcnkgbWVjaGFuaXNtIHVzZXMgdGhpcyBtYXNrIGFuZCBzY2hlZHVsZXMgcmVj b3Zlcnkgd29yawpmb3IgdGhvc2UgcGFydGljdWxhciBlbmdpbmVzLgoKQ2M6IENocmlzIFdpbHNv biA8Y2hyaXNAY2hyaXMtd2lsc29uLmNvLnVrPgpDYzogTWlrYSBLdW9wcGFsYSA8bWlrYS5rdW9w cGFsYUBpbnRlbC5jb20+ClNpZ25lZC1vZmYtYnk6IFRvbWFzIEVsZiA8dG9tYXMuZWxmQGludGVs LmNvbT4KU2lnbmVkLW9mZi1ieTogQXJ1biBTaWx1dmVyeSA8YXJ1bi5zaWx1dmVyeUBsaW51eC5p bnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCAgICAgICB8ICA0 ICsrLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3B1X2Vycm9yLmMgfCAgOCArKysrLS0t LQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9pcnEuYyAgICAgICB8IDE2ICsrKysrKysrLS0t LS0tLS0KIDMgZmlsZXMgY2hhbmdlZCwgMTQgaW5zZXJ0aW9ucygrKSwgMTQgZGVsZXRpb25zKC0p CgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKaW5kZXggNTQ5YTIzMi4uNDlhYzA2NSAxMDA2NDQKLS0t IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2Rydi5oCkBAIC0yNzM1LDcgKzI3MzUsNyBAQCBib29sIGludGVsX2hwZF9waW5f dG9fcG9ydChlbnVtIGhwZF9waW4gcGluLCBlbnVtIHBvcnQgKnBvcnQpOwogLyogaTkxNV9pcnEu YyAqLwogdm9pZCBpOTE1X3F1ZXVlX2hhbmdjaGVjayhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KTsK IF9fcHJpbnRmKDMsIDQpCi12b2lkIGk5MTVfaGFuZGxlX2Vycm9yKHN0cnVjdCBkcm1fZGV2aWNl ICpkZXYsIGJvb2wgd2VkZ2VkLAordm9pZCBpOTE1X2hhbmRsZV9lcnJvcihzdHJ1Y3QgZHJtX2Rl dmljZSAqZGV2LCB1MzIgZW5naW5lX21hc2ssCiAJCSAgICAgICBjb25zdCBjaGFyICpmbXQsIC4u Lik7CiAKIGV4dGVybiB2b2lkIGludGVsX2lycV9pbml0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRl ICpkZXZfcHJpdik7CkBAIC0zMzIxLDcgKzMzMjEsNyBAQCBzdGF0aWMgaW5saW5lIHZvaWQgaTkx NV9lcnJvcl9zdGF0ZV9idWZfcmVsZWFzZSgKIHsKIAlrZnJlZShlYi0+YnVmKTsKIH0KLXZvaWQg aTkxNV9jYXB0dXJlX2Vycm9yX3N0YXRlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIGJvb2wgd2Vk Z2UsCit2b2lkIGk5MTVfY2FwdHVyZV9lcnJvcl9zdGF0ZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2 LCB1MzIgZW5naW5lX21hc2ssCiAJCQkgICAgICBjb25zdCBjaGFyICplcnJvcl9tc2cpOwogdm9p ZCBpOTE1X2Vycm9yX3N0YXRlX2dldChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCQkJICBzdHJ1 Y3QgaTkxNV9lcnJvcl9zdGF0ZV9maWxlX3ByaXYgKmVycm9yX3ByaXYpOwpkaWZmIC0tZ2l0IGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ncHVfZXJyb3IuYyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfZ3B1X2Vycm9yLmMKaW5kZXggZGI4NjAwYS4uMWY4ZmYwNiAxMDA2NDQKLS0tIGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ncHVfZXJyb3IuYworKysgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2dwdV9lcnJvci5jCkBAIC0xMzAxLDcgKzEzMDEsNyBAQCBzdGF0aWMgdm9p ZCBpOTE1X2NhcHR1cmVfcmVnX3N0YXRlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJp diwKIAogc3RhdGljIHZvaWQgaTkxNV9lcnJvcl9jYXB0dXJlX21zZyhzdHJ1Y3QgZHJtX2Rldmlj ZSAqZGV2LAogCQkJCSAgIHN0cnVjdCBkcm1faTkxNV9lcnJvcl9zdGF0ZSAqZXJyb3IsCi0JCQkJ ICAgYm9vbCB3ZWRnZWQsCisJCQkJICAgdTMyIGVuZ2luZV9tYXNrLAogCQkJCSAgIGNvbnN0IGNo YXIgKmVycm9yX21zZykKIHsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBk ZXYtPmRldl9wcml2YXRlOwpAQCAtMTMyNCw3ICsxMzI0LDcgQEAgc3RhdGljIHZvaWQgaTkxNV9l cnJvcl9jYXB0dXJlX21zZyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCXNjbnByaW50ZihlcnJv ci0+ZXJyb3JfbXNnICsgbGVuLCBzaXplb2YoZXJyb3ItPmVycm9yX21zZykgLSBsZW4sCiAJCSAg IiwgcmVhc29uOiAlcywgYWN0aW9uOiAlcyIsCiAJCSAgZXJyb3JfbXNnLAotCQkgIHdlZGdlZCA/ ICJyZXNldCIgOiAiY29udGludWUiKTsKKwkJICBlbmdpbmVfbWFzayA/ICJyZXNldCIgOiAiY29u dGludWUiKTsKIH0KIAogc3RhdGljIHZvaWQgaTkxNV9jYXB0dXJlX2dlbl9zdGF0ZShzdHJ1Y3Qg ZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCkBAIC0xMzQ3LDcgKzEzNDcsNyBAQCBzdGF0aWMg dm9pZCBpOTE1X2NhcHR1cmVfZ2VuX3N0YXRlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZf cHJpdiwKICAqIG91dCBhIHN0cnVjdHVyZSB3aGljaCBiZWNvbWVzIGF2YWlsYWJsZSBpbiBkZWJ1 Z2ZzIGZvciB1c2VyIGxldmVsIHRvb2xzCiAgKiB0byBwaWNrIHVwLgogICovCi12b2lkIGk5MTVf Y2FwdHVyZV9lcnJvcl9zdGF0ZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBib29sIHdlZGdlZCwK K3ZvaWQgaTkxNV9jYXB0dXJlX2Vycm9yX3N0YXRlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHUz MiBlbmdpbmVfbWFzaywKIAkJCSAgICAgIGNvbnN0IGNoYXIgKmVycm9yX21zZykKIHsKIAlzdGF0 aWMgYm9vbCB3YXJuZWQ7CkBAIC0xMzc1LDcgKzEzNzUsNyBAQCB2b2lkIGk5MTVfY2FwdHVyZV9l cnJvcl9zdGF0ZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBib29sIHdlZGdlZCwKIAllcnJvci0+ b3ZlcmxheSA9IGludGVsX292ZXJsYXlfY2FwdHVyZV9lcnJvcl9zdGF0ZShkZXYpOwogCWVycm9y LT5kaXNwbGF5ID0gaW50ZWxfZGlzcGxheV9jYXB0dXJlX2Vycm9yX3N0YXRlKGRldik7CiAKLQlp OTE1X2Vycm9yX2NhcHR1cmVfbXNnKGRldiwgZXJyb3IsIHdlZGdlZCwgZXJyb3JfbXNnKTsKKwlp OTE1X2Vycm9yX2NhcHR1cmVfbXNnKGRldiwgZXJyb3IsIGVuZ2luZV9tYXNrLCBlcnJvcl9tc2cp OwogCURSTV9JTkZPKCIlc1xuIiwgZXJyb3ItPmVycm9yX21zZyk7CiAKIAlzcGluX2xvY2tfaXJx c2F2ZSgmZGV2X3ByaXYtPmdwdV9lcnJvci5sb2NrLCBmbGFncyk7CmRpZmYgLS1naXQgYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2lycS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9p cnEuYwppbmRleCA4ZjNlMzMwLi5hNTVhN2NjIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2lycS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfaXJxLmMKQEAg LTI2NTMsMTQgKzI2NTMsMTQgQEAgc3RhdGljIHZvaWQgaTkxNV9yZXBvcnRfYW5kX2NsZWFyX2Vp cihzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogLyoqCiAgKiBpOTE1X2hhbmRsZV9lcnJvciAtIGhh bmRsZSBhIGdwdSBlcnJvcgogICogQGRldjogZHJtIGRldmljZQotICoKKyAqIEBlbmdpbmVfbWFz azogbWFzayByZXByZXNlbnRpbmcgZW5naW5lcyB0aGF0IGFyZSBodW5nCiAgKiBEbyBzb21lIGJh c2ljIGNoZWNraW5nIG9mIHJlZ2lzdGVyIHN0YXRlIGF0IGVycm9yIHRpbWUgYW5kCiAgKiBkdW1w IGl0IHRvIHRoZSBzeXNsb2cuICBBbHNvIGNhbGwgaTkxNV9jYXB0dXJlX2Vycm9yX3N0YXRlKCkg dG8gbWFrZQogICogc3VyZSB3ZSBnZXQgYSByZWNvcmQgYW5kIG1ha2UgaXQgYXZhaWxhYmxlIGlu IGRlYnVnZnMuICBGaXJlIGEgdWV2ZW50CiAgKiBzbyB1c2Vyc3BhY2Uga25vd3Mgc29tZXRoaW5n IGJhZCBoYXBwZW5lZCAoc2hvdWxkIHRyaWdnZXIgY29sbGVjdGlvbgogICogb2YgYSByaW5nIGR1 bXAgZXRjLikuCiAgKi8KLXZvaWQgaTkxNV9oYW5kbGVfZXJyb3Ioc3RydWN0IGRybV9kZXZpY2Ug KmRldiwgYm9vbCB3ZWRnZWQsCit2b2lkIGk5MTVfaGFuZGxlX2Vycm9yKHN0cnVjdCBkcm1fZGV2 aWNlICpkZXYsIHUzMiBlbmdpbmVfbWFzaywKIAkJICAgICAgIGNvbnN0IGNoYXIgKmZtdCwgLi4u KQogewogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZh dGU7CkBAIC0yNjcxLDEwICsyNjcxLDEwIEBAIHZvaWQgaTkxNV9oYW5kbGVfZXJyb3Ioc3RydWN0 IGRybV9kZXZpY2UgKmRldiwgYm9vbCB3ZWRnZWQsCiAJdnNjbnByaW50ZihlcnJvcl9tc2csIHNp emVvZihlcnJvcl9tc2cpLCBmbXQsIGFyZ3MpOwogCXZhX2VuZChhcmdzKTsKIAotCWk5MTVfY2Fw dHVyZV9lcnJvcl9zdGF0ZShkZXYsIHdlZGdlZCwgZXJyb3JfbXNnKTsKKwlpOTE1X2NhcHR1cmVf ZXJyb3Jfc3RhdGUoZGV2LCBlbmdpbmVfbWFzaywgZXJyb3JfbXNnKTsKIAlpOTE1X3JlcG9ydF9h bmRfY2xlYXJfZWlyKGRldik7CiAKLQlpZiAod2VkZ2VkKSB7CisJaWYgKGVuZ2luZV9tYXNrKSB7 CiAJCWF0b21pY19vcihJOTE1X1JFU0VUX0lOX1BST0dSRVNTX0ZMQUcsCiAJCQkJJmRldl9wcml2 LT5ncHVfZXJyb3IucmVzZXRfY291bnRlcik7CiAKQEAgLTMwMzMsNyArMzAzMyw3IEBAIHJpbmdf c3R1Y2soc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lLCB1NjQgYWN0aGQpCiAJICovCiAJ dG1wID0gSTkxNV9SRUFEX0NUTChlbmdpbmUpOwogCWlmICh0bXAgJiBSSU5HX1dBSVQpIHsKLQkJ aTkxNV9oYW5kbGVfZXJyb3IoZGV2LCBmYWxzZSwKKwkJaTkxNV9oYW5kbGVfZXJyb3IoZGV2LCAw LAogCQkJCSAgIktpY2tpbmcgc3R1Y2sgd2FpdCBvbiAlcyIsCiAJCQkJICBlbmdpbmUtPm5hbWUp OwogCQlJOTE1X1dSSVRFX0NUTChlbmdpbmUsIHRtcCk7CkBAIC0zMDQ1LDcgKzMwNDUsNyBAQCBy aW5nX3N0dWNrKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSwgdTY0IGFjdGhkKQogCQlk ZWZhdWx0OgogCQkJcmV0dXJuIEhBTkdDSEVDS19IVU5HOwogCQljYXNlIDE6Ci0JCQlpOTE1X2hh bmRsZV9lcnJvcihkZXYsIGZhbHNlLAorCQkJaTkxNV9oYW5kbGVfZXJyb3IoZGV2LCAwLAogCQkJ CQkgICJLaWNraW5nIHN0dWNrIHNlbWFwaG9yZSBvbiAlcyIsCiAJCQkJCSAgZW5naW5lLT5uYW1l KTsKIAkJCUk5MTVfV1JJVEVfQ1RMKGVuZ2luZSwgdG1wKTsKQEAgLTMxODksMTIgKzMxODksMTIg QEAgc3RhdGljIHZvaWQgaTkxNV9oYW5nY2hlY2tfZWxhcHNlZChzdHJ1Y3Qgd29ya19zdHJ1Y3Qg KndvcmspCiAJCQlEUk1fSU5GTygiJXMgb24gJXNcbiIsCiAJCQkJIHN0dWNrW2ldID8gInN0dWNr IiA6ICJubyBwcm9ncmVzcyIsCiAJCQkJIGVuZ2luZS0+bmFtZSk7Ci0JCQlyaW5nc19odW5nKys7 CisJCQlyaW5nc19odW5nIHw9IGludGVsX2VuZ2luZV9mbGFnKGVuZ2luZSk7CiAJCX0KIAl9CiAK IAlpZiAocmluZ3NfaHVuZykgewotCQlpOTE1X2hhbmRsZV9lcnJvcihkZXYsIHRydWUsICJSaW5n IGh1bmciKTsKKwkJaTkxNV9oYW5kbGVfZXJyb3IoZGV2LCByaW5nc19odW5nLCAiRW5naW5lKHMp IGh1bmciKTsKIAkJZ290byBvdXQ7CiAJfQogCi0tIAoxLjkuMQoKX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRl bC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3Jn L21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==