From: Michel Thierry Subject: [PATCH] drm/i915: There is only one fault register from GEN8 onwards Date: Fri, 10 Nov 2017 11:01:16 -0800 Message-ID: <20171110190116.36669-1-michel.thierry@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 ESMTPS id 9916A6EB1F for ; Fri, 10 Nov 2017 19:01:17 +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 VW50aWwgSGFzd2VsbC9CYXl0cmFpbCwgdGhlIGhhcmR3YXJlIHVzZWQgdG8gaGF2ZSBhIHBlciBl bmdpbmUgZmF1bHQKcmVnaXN0ZXIgKGUuZy4gMHg0MDk0IC0gcmVuZGVyIGZhdWx0IHJlZ2lzdGVy LCAweDQxOTQgLSBtZWRpYSBmYXVsdApyZWdpc3RlciBhbmQgc28gb24pLiBCdXQgc2luY2UgQnJv YWR3ZWxsLCBhbGwgdGhlc2UgcmVnaXN0ZXJzIHdlcmUKY29tYmluZWQgaW50byBhIHNpbmdlIG9u ZSBhbmQgdGhlIGVuZ2luZSBpZCBzdG9yZWQgaW4gYml0cyAxNDoxMi4KCk5vdCBvbmx5IHdlIHNo b3VsZCBub3QgYmVlbiByZWFkaW5nIChhbmQgd3JpdGluZyB0bykgcmVnaXN0ZXJzIHRoYXQgZG8K bm90IGV4aXN0LCBpbiBwbGF0Zm9ybXMgd2l0aCBWQ1MyIChTS0wpLCB0aGUgYWRkcmVzcyB0aGF0 IHdvdWxkIGJlbG9uZwp0aGlzIGVuZ2luZSAoMHg0NDk0LCBWQ1MyX0hXID0gNCkgaXMgYWxyZWFk eSBhc3NpZ25lZCB0byBvdGhlciByZWdpc3Rlci4KClJlZmVyZW5jZXM6IElIRC1PUy1CRFctVm9s IDJjLTExLjE1LCBwYWdlIDc1LgpSZWZlcmVuY2VzOiBJSEQtT1MtU0tMLVZvbCAyYy0wNS4xNiwg cGFnZSAzNTAuClNpZ25lZC1vZmYtYnk6IE1pY2hlbCBUaGllcnJ5IDxtaWNoZWwudGhpZXJyeUBp bnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMgICB8IDM4 ICsrKysrKysrKysrKysrKysrKysrKysrKysrKysrKy0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X2dwdV9lcnJvci5jIHwgIDggKysrKystLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfcmVnLmggICAgICAgfCAgMiArKwogMyBmaWxlcyBjaGFuZ2VkLCA0MCBpbnNlcnRpb25zKCsp LCA4IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf Z2VtX2d0dC5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMKaW5kZXggMWU0 MGVlYjMxZjlkLi42NmE5MDczMzBhZDIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZ2VtX2d0dC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5j CkBAIC0yMjU2LDE2ICsyMjU2LDEzIEBAIHN0YXRpYyBib29sIG5lZWRzX2lkbGVfbWFwcyhzdHJ1 Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJcmV0dXJuIElTX0dFTjUoZGV2X3ByaXYp ICYmIElTX01PQklMRShkZXZfcHJpdikgJiYgaW50ZWxfdnRkX2FjdGl2ZSgpOwogfQogCi12b2lk IGk5MTVfY2hlY2tfYW5kX2NsZWFyX2ZhdWx0cyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2 X3ByaXYpCit2b2lkIF9fY2hlY2tfYW5kX2NsZWFyX2ZhdWx0cyhzdHJ1Y3QgZHJtX2k5MTVfcHJp dmF0ZSAqZGV2X3ByaXYpCiB7CiAJc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lOwogCWVu dW0gaW50ZWxfZW5naW5lX2lkIGlkOwotCi0JaWYgKElOVEVMX0lORk8oZGV2X3ByaXYpLT5nZW4g PCA2KQotCQlyZXR1cm47CisJdTMyIGZhdWx0X3JlZzsKIAogCWZvcl9lYWNoX2VuZ2luZShlbmdp bmUsIGRldl9wcml2LCBpZCkgewotCQl1MzIgZmF1bHRfcmVnOwogCQlmYXVsdF9yZWcgPSBJOTE1 X1JFQUQoUklOR19GQVVMVF9SRUcoZW5naW5lKSk7CiAJCWlmIChmYXVsdF9yZWcgJiBSSU5HX0ZB VUxUX1ZBTElEKSB7CiAJCQlEUk1fREVCVUdfRFJJVkVSKCJVbmV4cGVjdGVkIGZhdWx0XG4iCkBA IC0yMjgxLDYgKzIyNzgsMzcgQEAgdm9pZCBpOTE1X2NoZWNrX2FuZF9jbGVhcl9mYXVsdHMoc3Ry dWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogCQkJCSAgIGZhdWx0X3JlZyAmIH5SSU5H X0ZBVUxUX1ZBTElEKTsKIAkJfQogCX0KK30KKwordm9pZCBfX2dlbjhfY2hlY2tfYW5kX2NsZWFy X2ZhdWx0cyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCit7CisJdTMyIGZhdWx0 X3JlZyA9IEk5MTVfUkVBRChHRU44X1JJTkdfRkFVTFRfUkVHKTsKKworCWlmIChmYXVsdF9yZWcg JiBSSU5HX0ZBVUxUX1ZBTElEKSB7CisJCURSTV9ERUJVR19EUklWRVIoIlVuZXhwZWN0ZWQgZmF1 bHRcbiIKKwkJCQkgIlx0QWRkcjogMHglMDhseFxuIgorCQkJCSAiXHRFbmdpbmUgSUQ6ICVkXG4i CisJCQkJICJcdFNvdXJjZSBJRDogJWRcbiIKKwkJCQkgIlx0VHlwZTogJWRcbiIsCisJCQkJIGZh dWx0X3JlZyAmIFBBR0VfTUFTSywKKwkJCQkgR0VOOF9SSU5HX0ZBVUxUX0VOR0lORV9JRChmYXVs dF9yZWcpLAorCQkJCSBSSU5HX0ZBVUxUX1NSQ0lEKGZhdWx0X3JlZyksCisJCQkJIFJJTkdfRkFV TFRfRkFVTFRfVFlQRShmYXVsdF9yZWcpKTsKKwkJSTkxNV9XUklURShHRU44X1JJTkdfRkFVTFRf UkVHLAorCQkJICAgZmF1bHRfcmVnICYgflJJTkdfRkFVTFRfVkFMSUQpOworCX0KK30KKwordm9p ZCBpOTE1X2NoZWNrX2FuZF9jbGVhcl9mYXVsdHMoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRl dl9wcml2KQoreworCWlmIChJTlRFTF9HRU4oZGV2X3ByaXYpIDwgNikKKwkJcmV0dXJuOworCisJ LyogRnJvbSBHRU44IG9ud2FyZHMgd2Ugb25seSBoYXZlIG9uZSAnQWxsIEVuZ2luZSBGYXVsdCBS ZWdpc3RlcicgKi8KKwlpZiAoSU5URUxfR0VOKGRldl9wcml2KSA+PSA4KQorCQlfX2dlbjhfY2hl Y2tfYW5kX2NsZWFyX2ZhdWx0cyhkZXZfcHJpdik7CisJZWxzZQorCQlfX2NoZWNrX2FuZF9jbGVh cl9mYXVsdHMoZGV2X3ByaXYpOwogCiAJLyogRW5naW5lIHNwZWNpZmljIGluaXQgbWF5IG5vdCBo YXZlIGJlZW4gZG9uZSB0aWxsIHRoaXMgcG9pbnQuICovCiAJaWYgKGRldl9wcml2LT5lbmdpbmVb UkNTXSkKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3B1X2Vycm9yLmMg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dwdV9lcnJvci5jCmluZGV4IDVjMmQ4M2E4Mzhk OC4uNzQ4MWM4ZTFiNWE4IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dw dV9lcnJvci5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3B1X2Vycm9yLmMKQEAg LTEyMTcsMTEgKzEyMTcsMTMgQEAgc3RhdGljIHZvaWQgZXJyb3JfcmVjb3JkX2VuZ2luZV9yZWdp c3RlcnMoc3RydWN0IGk5MTVfZ3B1X3N0YXRlICplcnJvciwKIAogCWlmIChJTlRFTF9HRU4oZGV2 X3ByaXYpID49IDYpIHsKIAkJZWUtPnJjX3BzbWkgPSBJOTE1X1JFQUQoUklOR19QU01JX0NUTChl bmdpbmUtPm1taW9fYmFzZSkpOwotCQllZS0+ZmF1bHRfcmVnID0gSTkxNV9SRUFEKFJJTkdfRkFV TFRfUkVHKGVuZ2luZSkpOwotCQlpZiAoSU5URUxfR0VOKGRldl9wcml2KSA+PSA4KQorCQlpZiAo SU5URUxfR0VOKGRldl9wcml2KSA+PSA4KSB7CiAJCQlnZW44X3JlY29yZF9zZW1hcGhvcmVfc3Rh dGUoZXJyb3IsIGVuZ2luZSwgZWUpOwotCQllbHNlCisJCQllZS0+ZmF1bHRfcmVnID0gSTkxNV9S RUFEKEdFTjhfUklOR19GQVVMVF9SRUcpOworCQl9IGVsc2UgewogCQkJZ2VuNl9yZWNvcmRfc2Vt YXBob3JlX3N0YXRlKGVuZ2luZSwgZWUpOworCQkJZWUtPmZhdWx0X3JlZyA9IEk5MTVfUkVBRChS SU5HX0ZBVUxUX1JFRyhlbmdpbmUpKTsKKwkJfQogCX0KIAogCWlmIChJTlRFTF9HRU4oZGV2X3By aXYpID49IDQpIHsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcmVnLmgg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3JlZy5oCmluZGV4IDZlZjMzNDIyZjc2Mi4uN2Vm ODJiYTY3MGU5IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3JlZy5oCisr KyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcmVnLmgKQEAgLTIzMjksNiArMjMyOSw4IEBA IGVudW0gaTkxNV9wb3dlcl93ZWxsX2lkIHsKICNkZWZpbmUgICBBUkJfTU9ERV9TV0laWkxFX0JE VwkoMTw8MSkKICNkZWZpbmUgUkVOREVSX0hXU19QR0FfR0VONwlfTU1JTygweDA0MDgwKQogI2Rl ZmluZSBSSU5HX0ZBVUxUX1JFRyhlbmdpbmUpCV9NTUlPKDB4NDA5NCArIDB4MTAwKihlbmdpbmUp LT5od19pZCkKKyNkZWZpbmUgR0VOOF9SSU5HX0ZBVUxUX1JFRwlfTU1JTygweDQwOTQpCisjZGVm aW5lICAgR0VOOF9SSU5HX0ZBVUxUX0VOR0lORV9JRCh4KQkoKCh4KSA+PiAxMikgJiAweDcpCiAj ZGVmaW5lICAgUklOR19GQVVMVF9HVFRTRUxfTUFTSyAoMTw8MTEpCiAjZGVmaW5lICAgUklOR19G QVVMVF9TUkNJRCh4KQkoKCh4KSA+PiAzKSAmIDB4ZmYpCiAjZGVmaW5lICAgUklOR19GQVVMVF9G QVVMVF9UWVBFKHgpICgoKHgpID4+IDEpICYgMHgzKQotLSAKMi4xNS4wCgpfX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0 CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3Rv cC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK