From: Mika Kuoppala Subject: [PATCH 1/2] drm/i915: Expose retry count to per gen reset logic Date: Fri, 10 Aug 2018 17:00:35 +0300 Message-ID: <20180810140036.24240-1-mika.kuoppala@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTPS id 88BDB6E940 for ; Fri, 10 Aug 2018 14:01:39 +0000 (UTC) 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 List-Id: intel-gfx@lists.freedesktop.org VGhlcmUgaXMgYSBwb3NzaWJpbGl0eSBmb3IgcGVyIGdlbiByZXNldCBsb2dpYyB0bwpiZSBtb3Jl IG5hc3R5IGlmIHRoZSBzb2Z0ZXIgYXBwcm9hY2ggb24gcmVzZXR0aW5nIGRvZXMKbm90IGJlYXIg ZnJ1aXQuCgpFeHBvc2UgcmV0cnkgY291bnQgdG8gcGVyIGdlbiByZXNldCBsb2dpYyBpZiBpdAp3 YW50cyB0byB0YWtlIHN1Y2ggdG91Z2ggbWVhc3VyZXMuCgpDYzogQ2hyaXMgV2lsc29uIDxjaHJp c0BjaHJpcy13aWxzb24uY28udWs+ClNpZ25lZC1vZmYtYnk6IE1pa2EgS3VvcHBhbGEgPG1pa2Eu a3VvcHBhbGFAbGludXguaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X3VuY29yZS5jIHwgNDAgKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0KIDEgZmlsZSBjaGFu Z2VkLCAyNiBpbnNlcnRpb25zKCspLCAxNCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF91bmNvcmUuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX3VuY29yZS5jCmluZGV4IGMyZmNiNTFmYzU4YS4uMDI3ZDE0NTc0YmZhIDEwMDY0NAotLS0g YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF91bmNvcmUuYworKysgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF91bmNvcmUuYwpAQCAtMTczOSw3ICsxNzM5LDcgQEAgc3RhdGljIHZvaWQg Z2VuM19zdG9wX2VuZ2luZShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpCiB9CiAKIHN0 YXRpYyB2b2lkIGk5MTVfc3RvcF9lbmdpbmVzKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZf cHJpdiwKLQkJCSAgICAgIHVuc2lnbmVkIGVuZ2luZV9tYXNrKQorCQkJICAgICAgdW5zaWduZWQg aW50IGVuZ2luZV9tYXNrKQogewogCXN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZTsKIAll bnVtIGludGVsX2VuZ2luZV9pZCBpZDsKQEAgLTE3NTksNyArMTc1OSw5IEBAIHN0YXRpYyBib29s IGk5MTVfaW5fcmVzZXQoc3RydWN0IHBjaV9kZXYgKnBkZXYpCiAJcmV0dXJuIGdkcnN0ICYgR1JE T01fUkVTRVRfU1RBVFVTOwogfQogCi1zdGF0aWMgaW50IGk5MTVfZG9fcmVzZXQoc3RydWN0IGRy bV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LCB1bnNpZ25lZCBlbmdpbmVfbWFzaykKK3N0YXRpYyBp bnQgaTkxNV9kb19yZXNldChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCisJCQkg dW5zaWduZWQgaW50IGVuZ2luZV9tYXNrLAorCQkJIHVuc2lnbmVkIGludCByZXRyeSkKIHsKIAlz dHJ1Y3QgcGNpX2RldiAqcGRldiA9IGRldl9wcml2LT5kcm0ucGRldjsKIAlpbnQgZXJyOwpAQCAt MTc4Niw3ICsxNzg4LDkgQEAgc3RhdGljIGJvb2wgZzR4X3Jlc2V0X2NvbXBsZXRlKHN0cnVjdCBw Y2lfZGV2ICpwZGV2KQogCXJldHVybiAoZ2Ryc3QgJiBHUkRPTV9SRVNFVF9FTkFCTEUpID09IDA7 CiB9CiAKLXN0YXRpYyBpbnQgZzMzX2RvX3Jlc2V0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpk ZXZfcHJpdiwgdW5zaWduZWQgZW5naW5lX21hc2spCitzdGF0aWMgaW50IGczM19kb19yZXNldChz dHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCisJCQl1bnNpZ25lZCBpbnQgZW5naW5l X21hc2ssCisJCQl1bnNpZ25lZCBpbnQgcmV0cnkpCiB7CiAJc3RydWN0IHBjaV9kZXYgKnBkZXYg PSBkZXZfcHJpdi0+ZHJtLnBkZXY7CiAKQEAgLTE3OTQsNyArMTc5OCw5IEBAIHN0YXRpYyBpbnQg ZzMzX2RvX3Jlc2V0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwgdW5zaWduZWQg ZW5naW5lX21hc2spCiAJcmV0dXJuIHdhaXRfZm9yKGc0eF9yZXNldF9jb21wbGV0ZShwZGV2KSwg NTAwKTsKIH0KIAotc3RhdGljIGludCBnNHhfZG9fcmVzZXQoc3RydWN0IGRybV9pOTE1X3ByaXZh dGUgKmRldl9wcml2LCB1bnNpZ25lZCBlbmdpbmVfbWFzaykKK3N0YXRpYyBpbnQgZzR4X2RvX3Jl c2V0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKKwkJCXVuc2lnbmVkIGludCBl bmdpbmVfbWFzaywKKwkJCXVuc2lnbmVkIGludCByZXRyeSkKIHsKIAlzdHJ1Y3QgcGNpX2RldiAq cGRldiA9IGRldl9wcml2LT5kcm0ucGRldjsKIAlpbnQgcmV0OwpAQCAtMTgzMSw3ICsxODM3LDgg QEAgc3RhdGljIGludCBnNHhfZG9fcmVzZXQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9w cml2LCB1bnNpZ25lZCBlbmdpbmVfbWFzaykKIH0KIAogc3RhdGljIGludCBpcm9ubGFrZV9kb19y ZXNldChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCi0JCQkgICAgIHVuc2lnbmVk IGVuZ2luZV9tYXNrKQorCQkJICAgICB1bnNpZ25lZCBpbnQgZW5naW5lX21hc2ssCisJCQkgICAg IHVuc2lnbmVkIGludCByZXRyeSkKIHsKIAlpbnQgcmV0OwogCkBAIC0xODg3LDYgKzE4OTQsNyBA QCBzdGF0aWMgaW50IGdlbjZfaHdfZG9tYWluX3Jlc2V0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRl ICpkZXZfcHJpdiwKICAqIGdlbjZfcmVzZXRfZW5naW5lcyAtIHJlc2V0IGluZGl2aWR1YWwgZW5n aW5lcwogICogQGRldl9wcml2OiBpOTE1IGRldmljZQogICogQGVuZ2luZV9tYXNrOiBtYXNrIG9m IGludGVsX3JpbmdfZmxhZygpIGVuZ2luZXMgb3IgQUxMX0VOR0lORVMgZm9yIGZ1bGwgcmVzZXQK KyAqIEByZXRyeTogdGhlIGNvdW50IG9mIG9mIHByZXZpb3VzIGF0dGVtcHRzIHRvIHJlc2V0Lgog ICoKICAqIFRoaXMgZnVuY3Rpb24gd2lsbCByZXNldCB0aGUgaW5kaXZpZHVhbCBlbmdpbmVzIHRo YXQgYXJlIHNldCBpbiBlbmdpbmVfbWFzay4KICAqIElmIHlvdSBwcm92aWRlIEFMTF9FTkdJTkVT IGFzIG1hc2ssIGZ1bGwgZ2xvYmFsIGRvbWFpbiByZXNldCB3aWxsIGJlIGlzc3VlZC4KQEAgLTE4 OTcsNyArMTkwNSw4IEBAIHN0YXRpYyBpbnQgZ2VuNl9od19kb21haW5fcmVzZXQoc3RydWN0IGRy bV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogICogUmV0dXJucyAwIG9uIHN1Y2Nlc3MsIG5vbnpl cm8gb24gZXJyb3IuCiAgKi8KIHN0YXRpYyBpbnQgZ2VuNl9yZXNldF9lbmdpbmVzKHN0cnVjdCBk cm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKLQkJCSAgICAgIHVuc2lnbmVkIGVuZ2luZV9tYXNr KQorCQkJICAgICAgdW5zaWduZWQgaW50IGVuZ2luZV9tYXNrLAorCQkJICAgICAgdW5zaWduZWQg aW50IHJldHJ5KQogewogCXN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZTsKIAljb25zdCB1 MzIgaHdfZW5naW5lX21hc2tbSTkxNV9OVU1fRU5HSU5FU10gPSB7CkBAIC0xOTM2LDcgKzE5NDUs NyBAQCBzdGF0aWMgaW50IGdlbjZfcmVzZXRfZW5naW5lcyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0 ZSAqZGV2X3ByaXYsCiAgKiBSZXR1cm5zIDAgb24gc3VjY2Vzcywgbm9uemVybyBvbiBlcnJvci4K ICAqLwogc3RhdGljIGludCBnZW4xMV9yZXNldF9lbmdpbmVzKHN0cnVjdCBkcm1faTkxNV9wcml2 YXRlICpkZXZfcHJpdiwKLQkJCSAgICAgICB1bnNpZ25lZCBlbmdpbmVfbWFzaykKKwkJCSAgICAg ICB1bnNpZ25lZCBpbnQgZW5naW5lX21hc2spCiB7CiAJc3RydWN0IGludGVsX2VuZ2luZV9jcyAq ZW5naW5lOwogCWNvbnN0IHUzMiBod19lbmdpbmVfbWFza1tJOTE1X05VTV9FTkdJTkVTXSA9IHsK QEAgLTIxMDUsNyArMjExNCw4IEBAIHN0YXRpYyB2b2lkIGdlbjhfcmVzZXRfZW5naW5lX2NhbmNl bChzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpCiB9CiAKIHN0YXRpYyBpbnQgZ2VuOF9y ZXNldF9lbmdpbmVzKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKLQkJCSAgICAg IHVuc2lnbmVkIGVuZ2luZV9tYXNrKQorCQkJICAgICAgdW5zaWduZWQgaW50IGVuZ2luZV9tYXNr LAorCQkJICAgICAgdW5zaWduZWQgaW50IHJldHJ5KQogewogCXN0cnVjdCBpbnRlbF9lbmdpbmVf Y3MgKmVuZ2luZTsKIAl1bnNpZ25lZCBpbnQgdG1wOwpAQCAtMjEyMSw3ICsyMTMxLDcgQEAgc3Rh dGljIGludCBnZW44X3Jlc2V0X2VuZ2luZXMoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9w cml2LAogCWlmIChJTlRFTF9HRU4oZGV2X3ByaXYpID49IDExKQogCQlyZXQgPSBnZW4xMV9yZXNl dF9lbmdpbmVzKGRldl9wcml2LCBlbmdpbmVfbWFzayk7CiAJZWxzZQotCQlyZXQgPSBnZW42X3Jl c2V0X2VuZ2luZXMoZGV2X3ByaXYsIGVuZ2luZV9tYXNrKTsKKwkJcmV0ID0gZ2VuNl9yZXNldF9l bmdpbmVzKGRldl9wcml2LCBlbmdpbmVfbWFzaywgcmV0cnkpOwogCiBub3RfcmVhZHk6CiAJZm9y X2VhY2hfZW5naW5lX21hc2tlZChlbmdpbmUsIGRldl9wcml2LCBlbmdpbmVfbWFzaywgdG1wKQpA QCAtMjEzMCw3ICsyMTQwLDggQEAgc3RhdGljIGludCBnZW44X3Jlc2V0X2VuZ2luZXMoc3RydWN0 IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogCXJldHVybiByZXQ7CiB9CiAKLXR5cGVkZWYg aW50ICgqcmVzZXRfZnVuYykoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKiwgdW5zaWduZWQgZW5n aW5lX21hc2spOwordHlwZWRlZiBpbnQgKCpyZXNldF9mdW5jKShzdHJ1Y3QgZHJtX2k5MTVfcHJp dmF0ZSAqLAorCQkJICB1bnNpZ25lZCBpbnQgZW5naW5lX21hc2ssIHVuc2lnbmVkIGludCByZXRy eSk7CiAKIHN0YXRpYyByZXNldF9mdW5jIGludGVsX2dldF9ncHVfcmVzZXQoc3RydWN0IGRybV9p OTE1X3ByaXZhdGUgKmRldl9wcml2KQogewpAQCAtMjE1MywxMCArMjE2NCwxMCBAQCBzdGF0aWMg cmVzZXRfZnVuYyBpbnRlbF9nZXRfZ3B1X3Jlc2V0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpk ZXZfcHJpdikKIAkJcmV0dXJuIE5VTEw7CiB9CiAKLWludCBpbnRlbF9ncHVfcmVzZXQoc3RydWN0 IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LCB1bnNpZ25lZCBlbmdpbmVfbWFzaykKK2ludCBp bnRlbF9ncHVfcmVzZXQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LCB1bnNpZ25l ZCBpbnQgZW5naW5lX21hc2spCiB7CiAJcmVzZXRfZnVuYyByZXNldCA9IGludGVsX2dldF9ncHVf cmVzZXQoZGV2X3ByaXYpOwotCWludCByZXRyeTsKKwl1bnNpZ25lZCBpbnQgcmV0cnk7CiAJaW50 IHJldDsKIAogCS8qCkBAIC0yMjAwLDggKzIyMTEsOSBAQCBpbnQgaW50ZWxfZ3B1X3Jlc2V0KHN0 cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwgdW5zaWduZWQgZW5naW5lX21hc2spCiAK IAkJcmV0ID0gLUVOT0RFVjsKIAkJaWYgKHJlc2V0KSB7Ci0JCQlHRU1fVFJBQ0UoImVuZ2luZV9t YXNrPSV4XG4iLCBlbmdpbmVfbWFzayk7Ci0JCQlyZXQgPSByZXNldChkZXZfcHJpdiwgZW5naW5l X21hc2spOworCQkJcmV0ID0gcmVzZXQoZGV2X3ByaXYsIGVuZ2luZV9tYXNrLCByZXRyeSk7CisJ CQlHRU1fVFJBQ0UoImVuZ2luZV9tYXNrPSV4LCByZXQ9JWQsIHJldHJ5PSVkXG4iLAorCQkJCSAg ZW5naW5lX21hc2ssIHJldCwgcmV0cnkpOwogCQl9CiAJCWlmIChyZXQgIT0gLUVUSU1FRE9VVCB8 fCBlbmdpbmVfbWFzayAhPSBBTExfRU5HSU5FUykKIAkJCWJyZWFrOwotLSAKMi4xNy4xCgpfX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFp bGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5m cmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK