From: Arun Siluvery Subject: [PATCH 08/14] drm/i915/tdr: Add support for per engine reset recovery Date: Tue, 12 Apr 2016 17:59:35 +0100 Message-ID: <1460480381-8777-9-git-send-email-arun.siluvery@linux.intel.com> References: <1460480381-8777-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 7E20A6E73E for ; Tue, 12 Apr 2016 17:00:00 +0000 (UTC) In-Reply-To: <1460480381-8777-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 VGhpcyBjaGFuZ2UgaW1wbGVtZW50cyBzdXBwb3J0IGZvciBwZXItZW5naW5lIHJlc2V0IGFzIGFu IGluaXRpYWwsIGxlc3MKaW50cnVzaXZlIGhhbmcgcmVjb3Zlcnkgb3B0aW9uIHRvIGJlIGF0dGVt cHRlZCBiZWZvcmUgZmFsbGluZyBiYWNrIHRvIHRoZQpsZWdhY3kgZnVsbCBHUFUgcmVzZXQgcmVj b3ZlcnkgbW9kZSBpZiBuZWNlc3NhcnkuIFRoaXMgaXMgb25seSBzdXBwb3J0ZWQKZnJvbSBHZW44 IG9ud2FyZHMuCgpIYW5nY2hlY2tlciBkZXRlcm1pbmVzIHdoaWNoIGVuZ2luZXMgYXJlIGh1bmcg YW5kIGludm9rZXMgZXJyb3IgaGFuZGxlciB0bwpyZWNvdmVyIGZyb20gaXQuIEVycm9yIGhhbmRs ZXIgc2NoZWR1bGVzIHJlY292ZXJ5IGZvciBlYWNoIG9mIHRob3NlIGVuZ2luZXMKdGhhdCBhcmUg aHVuZy4gVGhlIHJlY292ZXJ5IHByb2NlZHVyZSBpcyBhcyBmb2xsb3dzLAogLSBmb3JjZSBlbmdp bmUgdG8gaWRsZTogdGhpcyBpcyBkb25lIGJ5IGlzc3VpbmcgYSByZXNldCByZXF1ZXN0CiAtIHNh dmUgY3VycmVudCBzdGF0ZSB3aGljaCBpbmNsdWRlcyBoZWFkIGFuZCBjdXJyZW50IHJlcXVlc3QK IC0gcmVzZXQgZW5naW5lCiAtIHJlc3RvcmUgc2F2ZWQgc3RhdGUgYW5kIHJlc3VibWl0IGNvbnRl eHQKCklmIGVuZ2luZSByZXNldCBmYWlscyB0aGVuIHdlIGZhbGwgYmFjayB0byBoZWF2eSB3ZWln aHQgZnVsbCBncHUgcmVzZXQKd2hpY2ggcmVzZXRzIGFsbCBlbmdpbmVzIGFuZCByZWluaXRpYXpl cyBjb21wbGV0ZSBzdGF0ZSBvZiBIVyBhbmQgU1cuCgpQb3NzaWJsZSByZWFzb25zIGZvciBmYWls dXJlLAogLSBlbmdpbmUgbm90IHJlYWR5IGZvciByZXNldAogLSBpZiB0aGUgSFcgYW5kIFNXIGRv ZXNuJ3QgYWdyZWUgb24gdGhlIGNvbnRleHQgdGhhdCBjYXVzZWQgdGhlIGhhbmcKIC0gcmVzZXQg aXRzZWxmIGZhaWxlZCBmb3Igc29tZSByZWFzb24KCkNjOiBDaHJpcyBXaWxzb24gPGNocmlzQGNo cmlzLXdpbHNvbi5jby51az4KQ2M6IE1pa2EgS3VvcHBhbGEgPG1pa2Eua3VvcHBhbGFAbGludXgu aW50ZWwuY29tPgpTaWduZWQtb2ZmLWJ5OiBUb21hcyBFbGYgPHRvbWFzLmVsZkBpbnRlbC5jb20+ ClNpZ25lZC1vZmYtYnk6IEFydW4gU2lsdXZlcnkgPGFydW4uc2lsdXZlcnlAbGludXguaW50ZWwu Y29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMgICAgIHwgNTQgKysrKysr KysrKysrKysrKysrKysrKysrKysrKysrKysrKystLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx NV9kcnYuaCAgICAgfCAgNCArKysKIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMgICAg IHwgIDQgKy0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF91bmNvcmUuYyB8IDM3ICsrKysr KysrKysrKysrKysrKysrKysrKysKIDQgZmlsZXMgY2hhbmdlZCwgOTUgaW5zZXJ0aW9ucygrKSwg NCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Ry di5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYwppbmRleCAxOTMzZjg3Li4yMjdh ZDQyIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5jCisrKyBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMKQEAgLTk3MCwxMCArOTcwLDYwIEBAIGludCBp OTE1X3Jlc2V0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAgKi8KIGludCBpOTE1X3Jlc2V0X2Vu Z2luZShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpCiB7CisJc3RydWN0IGRybV9kZXZp Y2UgKmRldiA9IGVuZ2luZS0+ZGV2OworCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJp diA9IGRldi0+ZGV2X3ByaXZhdGU7CisJc3RydWN0IGludGVsX2VuZ2luZV9jc19zdGF0ZSBzdGF0 ZTsKIAlpbnQgcmV0OwogCi0JLyogRklYTUU6IHJlcGxhY2UgbWUgd2l0aCBlbmdpbmUgcmVzZXQg c2VxdWVuY2UgKi8KLQlyZXQgPSAtRU5PREVWOworCVdBUk5fT04oIW11dGV4X2lzX2xvY2tlZCgm ZGV2LT5zdHJ1Y3RfbXV0ZXgpKTsKKworCWk5MTVfZ2VtX3Jlc2V0X2VuZ2luZV9zdGF0dXMoZGV2 X3ByaXYsIGVuZ2luZSk7CisKKwkvKlRha2Ugd2FrZSBsb2NrIHRvIHByZXZlbnQgcG93ZXIgc2F2 aW5nIG1vZGUgKi8KKwlpbnRlbF91bmNvcmVfZm9yY2V3YWtlX2dldChkZXZfcHJpdiwgRk9SQ0VX QUtFX0FMTCk7CisKKwlyZXQgPSBpbnRlbF9yZXF1ZXN0X2Zvcl9yZXNldChlbmdpbmUpOworCWlm IChyZXQpIHsKKwkJRFJNX0VSUk9SKCJGYWlsZWQgdG8gZGlzYWJsZSAlc1xuIiwgZW5naW5lLT5u YW1lKTsKKwkJZ290byBvdXQ7CisJfQorCisJcmV0ID0gZW5naW5lLT5zYXZlKGVuZ2luZSwgJnN0 YXRlKTsKKwlpZiAocmV0KQorCQlnb3RvIGVuYWJsZV9lbmdpbmU7CisKKwlyZXQgPSBpbnRlbF9n cHVfcmVzZXQoZGV2LCBpbnRlbF9lbmdpbmVfZmxhZyhlbmdpbmUpKTsKKwlpZiAocmV0KSB7CisJ CURSTV9FUlJPUigiRmFpbGVkIHRvIHJlc2V0ICVzLCByZXQ9JWRcbiIsIGVuZ2luZS0+bmFtZSwg cmV0KTsKKwkJZ290byBlbmFibGVfZW5naW5lOworCX0KKworCXJldCA9IGVuZ2luZS0+aW5pdF9o dyhlbmdpbmUpOworCWlmIChyZXQpCisJCWdvdG8gb3V0OworCisJLyoKKwkgKiBSZXN0YXJ0IHRo ZSBlbmdpbmUgYWZ0ZXIgcmVzZXQuCisJICogRW5naW5lIHN0YXRlIGlzIGZpcnN0IHJlc3RvcmVk IGFuZCB0aGUgY29udGV4dCBpcyByZXN1Ym1pdHRlZC4KKwkgKi8KKwllbmdpbmUtPnN0YXJ0KGVu Z2luZSwgJnN0YXRlKTsKKworZW5hYmxlX2VuZ2luZToKKwkvKgorCSAqIHdlIG9ubHkgbmVlZCB0 byBlbmFibGUgZW5naW5lIGlmIHdlIGNhbm5vdCBlaXRoZXIgc2F2ZSBlbmdpbmUgc3RhdGUKKwkg KiBvciByZXNldCBmYWlscy4gSWYgdGhlIHJlc2V0IGlzIHN1Y2Nlc3NmdWwsIGVuZ2luZSBnZXRz IGVuYWJsZWQKKwkgKiBhdXRvbWF0aWNhbGx5IHNvIHdlIGNhbiBza2lwIHRoaXMgc3RlcC4KKwkg Ki8KKwlpZiAocmV0KQorCQlpbnRlbF9jbGVhcl9yZXNldF9yZXF1ZXN0KGVuZ2luZSk7CisKK291 dDoKKwlpZiAoc3RhdGUucmVxKQorCQlpOTE1X2dlbV9yZXF1ZXN0X3VucmVmZXJlbmNlKHN0YXRl LnJlcSk7CisKKwkvKiBXYWtlIHVwIGFueXRoaW5nIHdhaXRpbmcgb24gdGhpcyBlbmdpbmUncyBx dWV1ZSAqLworCXdha2VfdXBfYWxsKCZlbmdpbmUtPmlycV9xdWV1ZSk7CisJaW50ZWxfdW5jb3Jl X2ZvcmNld2FrZV9wdXQoZGV2X3ByaXYsIEZPUkNFV0FLRV9BTEwpOwogCiAJcmV0dXJuIHJldDsK IH0KZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggYi9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCmluZGV4IGJiMzQxMDcuLmVkYTUzMWYgMTAwNjQ0Ci0t LSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9kcnYuaApAQCAtMjc1NCw2ICsyNzU0LDggQEAgZXh0ZXJuIGxvbmcgaTkxNV9j b21wYXRfaW9jdGwoc3RydWN0IGZpbGUgKmZpbHAsIHVuc2lnbmVkIGludCBjbWQsCiAJCQkgICAg ICB1bnNpZ25lZCBsb25nIGFyZyk7CiAjZW5kaWYKIGV4dGVybiBpbnQgaW50ZWxfZ3B1X3Jlc2V0 KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHUzMiBlbmdpbmVfbWFzayk7CitleHRlcm4gaW50IGlu dGVsX3JlcXVlc3RfZm9yX3Jlc2V0KHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSk7Citl eHRlcm4gaW50IGludGVsX2NsZWFyX3Jlc2V0X3JlcXVlc3Qoc3RydWN0IGludGVsX2VuZ2luZV9j cyAqZW5naW5lKTsKIGV4dGVybiBib29sIGludGVsX2hhc19ncHVfcmVzZXQoc3RydWN0IGRybV9k ZXZpY2UgKmRldik7CiBleHRlcm4gYm9vbCBpbnRlbF9oYXNfZW5naW5lX3Jlc2V0X3N1cHBvcnQo c3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKTsKIGV4dGVybiBpbnQgaTkxNV9yZXNldChz dHJ1Y3QgZHJtX2RldmljZSAqZGV2KTsKQEAgLTMwOTQsNiArMzA5Niw4IEBAIHN0YXRpYyBpbmxp bmUgYm9vbCBpOTE1X3N0b3BfcmluZ19hbGxvd193YXJuKHN0cnVjdCBkcm1faTkxNV9wcml2YXRl ICpkZXZfcHJpdikKIH0KIAogdm9pZCBpOTE1X2dlbV9yZXNldChzdHJ1Y3QgZHJtX2RldmljZSAq ZGV2KTsKK3ZvaWQgaTkxNV9nZW1fcmVzZXRfZW5naW5lX3N0YXR1cyhzdHJ1Y3QgZHJtX2k5MTVf cHJpdmF0ZSAqZGV2X3ByaXYsCisJCQkJICBzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nKTsK IGJvb2wgaTkxNV9nZW1fY2xmbHVzaF9vYmplY3Qoc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3Qg Km9iaiwgYm9vbCBmb3JjZSk7CiBpbnQgX19tdXN0X2NoZWNrIGk5MTVfZ2VtX2luaXQoc3RydWN0 IGRybV9kZXZpY2UgKmRldik7CiBpbnQgaTkxNV9nZW1faW5pdF9lbmdpbmVzKHN0cnVjdCBkcm1f ZGV2aWNlICpkZXYpOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0u YyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKaW5kZXggNWE2NWE3Ni4uNGM2MjU4 MyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYworKysgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCkBAIC0yODAyLDggKzI4MDIsOCBAQCBpOTE1X2dl bV9maW5kX2FjdGl2ZV9yZXF1ZXN0KHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKIAly ZXR1cm4gTlVMTDsKIH0KIAotc3RhdGljIHZvaWQgaTkxNV9nZW1fcmVzZXRfZW5naW5lX3N0YXR1 cyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCi0JCQkJICAgICAgIHN0cnVjdCBp bnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKK3ZvaWQgaTkxNV9nZW1fcmVzZXRfZW5naW5lX3N0YXR1 cyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCisJCQkJICBzdHJ1Y3QgaW50ZWxf ZW5naW5lX2NzICplbmdpbmUpCiB7CiAJc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXF1 ZXN0OwogCWJvb2wgcmluZ19odW5nOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfdW5jb3JlLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF91bmNvcmUuYwppbmRl eCA5Y2UyNDcwLi4zYmZkYTg1IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF91bmNvcmUuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF91bmNvcmUuYwpAQCAt MTcwNCw2ICsxNzA0LDQzIEBAIGludCBpbnRlbF9ndWNfcmVzZXQoc3RydWN0IGRybV9pOTE1X3By aXZhdGUgKmRldl9wcml2KQogCXJldHVybiByZXQ7CiB9CiAKKy8qCisgKiBPbiBnZW44KyBhIHJl c2V0IHJlcXVlc3QgaGFzIHRvIGJlIGlzc3VlZCB2aWEgdGhlIHJlc2V0IGNvbnRyb2wgcmVnaXN0 ZXIKKyAqIGJlZm9yZSBhIEdQVSBlbmdpbmUgY2FuIGJlIHJlc2V0IGluIG9yZGVyIHRvIHN0b3Ag dGhlIGNvbW1hbmQgc3RyZWFtZXIKKyAqIGFuZCBpZGxlIHRoZSBlbmdpbmUuIFRoaXMgcmVwbGFj ZXMgdGhlIGxlZ2FjeSB3YXkgb2Ygc3RvcHBpbmcgYW4gZW5naW5lCisgKiBieSB3cml0aW5nIHRv IHRoZSBzdG9wIHJpbmcgYml0IGluIHRoZSBNSV9NT0RFIHJlZ2lzdGVyLgorICovCitpbnQgaW50 ZWxfcmVxdWVzdF9mb3JfcmVzZXQoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKQorewor CXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBlbmdpbmUtPmRldjsKKworCWlmICghaW50ZWxfaGFz X2VuZ2luZV9yZXNldF9zdXBwb3J0KGVuZ2luZSkpIHsKKwkJRFJNX0VSUk9SKCJFbmdpbmUgUmVz ZXQgbm90IHN1cHBvcnRlZCBvbiBHZW4lZFxuIiwKKwkJCSAgSU5URUxfSU5GTyhkZXYpLT5nZW4p OworCQlyZXR1cm4gLUVJTlZBTDsKKwl9CisKKwlyZXR1cm4gZ2VuOF9yZXF1ZXN0X2VuZ2luZV9y ZXNldChlbmdpbmUpOworfQorCisvKgorICogSXQgaXMgcG9zc2libGUgdG8gYmFjayBvZmYgZnJv bSBhIHByZXZpb3VzbHkgaXNzdWVkIHJlc2V0IHJlcXVlc3QgYnkgc2ltcGx5CisgKiBjbGVhcmlu ZyB0aGUgcmVzZXQgcmVxdWVzdCBiaXQgaW4gdGhlIHJlc2V0IGNvbnRyb2wgcmVnaXN0ZXIuCisg Ki8KK2ludCBpbnRlbF9jbGVhcl9yZXNldF9yZXF1ZXN0KHN0cnVjdCBpbnRlbF9lbmdpbmVfY3Mg KmVuZ2luZSkKK3sKKwlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gZW5naW5lLT5kZXY7CisKKwlp ZiAoIWludGVsX2hhc19lbmdpbmVfcmVzZXRfc3VwcG9ydChlbmdpbmUpKSB7CisJCURSTV9FUlJP UigiUmVzZXQgdW5yZXF1ZXN0IG5vdCBzdXBwb3J0ZWQgb24gR2VuJWRcbiIsCisJCQkgIElOVEVM X0lORk8oZGV2KS0+Z2VuKTsKKwkJcmV0dXJuIC1FSU5WQUw7CisJfQorCisJZ2VuOF91bnJlcXVl c3RfZW5naW5lX3Jlc2V0KGVuZ2luZSk7CisJcmV0dXJuIDA7Cit9CisKIGJvb2wgaW50ZWxfdW5j b3JlX3VuY2xhaW1lZF9tbWlvKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIHsK IAlyZXR1cm4gY2hlY2tfZm9yX3VuY2xhaW1lZF9tbWlvKGRldl9wcml2KTsKLS0gCjEuOS4xCgpf X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZngg bWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0 cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK