From: Michel Thierry Subject: [PATCH v2] drm/i915: There is only one fault register from Gen8 onwards Date: Fri, 23 Jun 2017 16:53:45 -0700 Message-ID: <20170623235345.22883-1-michel.thierry@intel.com> References: <20170623231729.35240-1-michel.thierry@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7EE4A6E80A for ; Fri, 23 Jun 2017 23:53:46 +0000 (UTC) In-Reply-To: <20170623231729.35240-1-michel.thierry@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 List-Id: intel-gfx@lists.freedesktop.org VW50aWwgSGFzd2VsbC9CYXl0cmFpbCwgdGhlIGhhcmR3YXJlIHVzZWQgdG8gaGF2ZSBhIHBlciBl bmdpbmUgZmF1bHQKcmVnaXN0ZXIgKGUuZy4gMHg0MDk0IC0gcmVuZGVyIGZhdWx0IHJlZ2lzdGVy LCAweDQxOTQgLSBtZWRpYSBmYXVsdApyZWdpc3RlciwgZXRjKS4gQnV0IHNpbmNlIEJyb2Fkd2Vs bCwgYWxsIHRoZXNlIHJlZ2lzdGVycyB3ZXJlIGNvbWJpbmVkCmludG8gYSBzaW5nZSBvbmUsIHdo aWNoIHNwZWNpZmllcyB0aGUgZW5naW5lIGlkIGluIGJpdHMgMTQ6MTIuCgpMdWNraWx5LCB0aGUg YWRkaXRpb25hbCByZWdpc3RlciBhZGRyZXNzZXMgaGF2ZW4ndCBiZWVuIHJldXNlZCwgYnV0IHdl CnNob3VsZCBub3QgYmVlbiByZWFkaW5nIChhbmQgd3JpdGluZyB0bykgcmVnaXN0ZXJzIHRoYXQg ZG8gbm90IGV4aXN0LgoKdjI6IFJlbmFtZSBmYXVsdCB2YXJpYWJsZSwgdXNlIElOVEVMX0dFTiAo Q2hyaXMpLgoKUmVmZXJlbmNlczogSUhELU9TLUJEVy1Wb2wgMmMtMTEuMTUsIHBhZ2UgNzUuCkNj OiBDaHJpcyBXaWxzb24gPGNocmlzQGNocmlzLXdpbHNvbi5jby51az4KU2lnbmVkLW9mZi1ieTog TWljaGVsIFRoaWVycnkgPG1pY2hlbC50aGllcnJ5QGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYyAgIHwgNDIgKysrKysrKysrKysrKysrKysrKysrKysr Ky0tLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3B1X2Vycm9yLmMgfCAgOCAr KysrLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3JlZy5oICAgICAgIHwgIDIgKysKIDMg ZmlsZXMgY2hhbmdlZCwgMzcgaW5zZXJ0aW9ucygrKSwgMTUgZGVsZXRpb25zKC0pCgpkaWZmIC0t Z2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2dlbV9ndHQuYwppbmRleCBkZTY3MDg0ZDVmY2YuLmM4NDBkNDE4NGE0ZiAx MDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMKKysrIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMKQEAgLTE5OTYsMjUgKzE5OTYsNDMgQEAg dm9pZCBpOTE1X2NoZWNrX2FuZF9jbGVhcl9mYXVsdHMoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUg KmRldl9wcml2KQogewogCXN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZTsKIAllbnVtIGlu dGVsX2VuZ2luZV9pZCBpZDsKKwl1MzIgZmF1bHQ7CiAKLQlpZiAoSU5URUxfSU5GTyhkZXZfcHJp diktPmdlbiA8IDYpCisJaWYgKElOVEVMX0dFTihkZXZfcHJpdikgPCA2KQogCQlyZXR1cm47CiAK LQlmb3JfZWFjaF9lbmdpbmUoZW5naW5lLCBkZXZfcHJpdiwgaWQpIHsKLQkJdTMyIGZhdWx0X3Jl ZzsKLQkJZmF1bHRfcmVnID0gSTkxNV9SRUFEKFJJTkdfRkFVTFRfUkVHKGVuZ2luZSkpOwotCQlp ZiAoZmF1bHRfcmVnICYgUklOR19GQVVMVF9WQUxJRCkgeworCS8qIEZyb20gR0VOOCBvbndhcmRz IHdlIG9ubHkgaGF2ZSBvbmUgJ0FsbCBFbmdpbmUgRmF1bHQgUmVnaXN0ZXInICovCisJaWYgKElO VEVMX0dFTihkZXZfcHJpdikgPj0gOCkgeworCQlmYXVsdCA9IEk5MTVfUkVBRChHRU44X1JJTkdf RkFVTFRfUkVHKTsKKwkJaWYgKGZhdWx0ICYgUklOR19GQVVMVF9WQUxJRCkgewogCQkJRFJNX0RF QlVHX0RSSVZFUigiVW5leHBlY3RlZCBmYXVsdFxuIgogCQkJCQkgIlx0QWRkcjogMHglMDhseFxu IgotCQkJCQkgIlx0QWRkcmVzcyBzcGFjZTogJXNcbiIKKwkJCQkJICJcdEVuZ2luZSBJRDogJWRc biIKIAkJCQkJICJcdFNvdXJjZSBJRDogJWRcbiIKIAkJCQkJICJcdFR5cGU6ICVkXG4iLAotCQkJ CQkgZmF1bHRfcmVnICYgUEFHRV9NQVNLLAotCQkJCQkgZmF1bHRfcmVnICYgUklOR19GQVVMVF9H VFRTRUxfTUFTSyA/ICJHR1RUIiA6ICJQUEdUVCIsCi0JCQkJCSBSSU5HX0ZBVUxUX1NSQ0lEKGZh dWx0X3JlZyksCi0JCQkJCSBSSU5HX0ZBVUxUX0ZBVUxUX1RZUEUoZmF1bHRfcmVnKSk7Ci0JCQlJ OTE1X1dSSVRFKFJJTkdfRkFVTFRfUkVHKGVuZ2luZSksCi0JCQkJICAgZmF1bHRfcmVnICYgflJJ TkdfRkFVTFRfVkFMSUQpOworCQkJCQkgZmF1bHQgJiBQQUdFX01BU0ssCisJCQkJCSBHRU44X1JJ TkdfRkFVTFRfRU5HSU5FX0lEKGZhdWx0KSwKKwkJCQkJIFJJTkdfRkFVTFRfU1JDSUQoZmF1bHQp LAorCQkJCQkgUklOR19GQVVMVF9GQVVMVF9UWVBFKGZhdWx0KSk7CisJCQlJOTE1X1dSSVRFKEdF TjhfUklOR19GQVVMVF9SRUcsCisJCQkJICAgZmF1bHQgJiB+UklOR19GQVVMVF9WQUxJRCk7CisJ CX0KKwl9IGVsc2UgeworCQlmb3JfZWFjaF9lbmdpbmUoZW5naW5lLCBkZXZfcHJpdiwgaWQpIHsK KwkJCWZhdWx0ID0gSTkxNV9SRUFEKFJJTkdfRkFVTFRfUkVHKGVuZ2luZSkpOworCQkJaWYgKGZh dWx0ICYgUklOR19GQVVMVF9WQUxJRCkgeworCQkJCURSTV9ERUJVR19EUklWRVIoIlVuZXhwZWN0 ZWQgZmF1bHRcbiIKKwkJCQkJCSAiXHRBZGRyOiAweCUwOGx4XG4iCisJCQkJCQkgIlx0QWRkcmVz cyBzcGFjZTogJXNcbiIKKwkJCQkJCSAiXHRTb3VyY2UgSUQ6ICVkXG4iCisJCQkJCQkgIlx0VHlw ZTogJWRcbiIsCisJCQkJCQkgZmF1bHQgJiBQQUdFX01BU0ssCisJCQkJCQkgZmF1bHQgJiBSSU5H X0ZBVUxUX0dUVFNFTF9NQVNLID8gIkdHVFQiIDogIlBQR1RUIiwKKwkJCQkJCSBSSU5HX0ZBVUxU X1NSQ0lEKGZhdWx0KSwKKwkJCQkJCSBSSU5HX0ZBVUxUX0ZBVUxUX1RZUEUoZmF1bHQpKTsKKwkJ CQlJOTE1X1dSSVRFKFJJTkdfRkFVTFRfUkVHKGVuZ2luZSksCisJCQkJCSAgIGZhdWx0ICYgflJJ TkdfRkFVTFRfVkFMSUQpOworCQkJfQogCQl9CiAJfQogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2dwdV9lcnJvci5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9n cHVfZXJyb3IuYwppbmRleCBhZTcwMjgzNDcwYTYuLmI3ZjE0N2IxYjZkZCAxMDA2NDQKLS0tIGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ncHVfZXJyb3IuYworKysgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2dwdV9lcnJvci5jCkBAIC0xMTY3LDExICsxMTY3LDEzIEBAIHN0YXRpYyB2 b2lkIGVycm9yX3JlY29yZF9lbmdpbmVfcmVnaXN0ZXJzKHN0cnVjdCBpOTE1X2dwdV9zdGF0ZSAq ZXJyb3IsCiAKIAlpZiAoSU5URUxfR0VOKGRldl9wcml2KSA+PSA2KSB7CiAJCWVlLT5yY19wc21p ID0gSTkxNV9SRUFEKFJJTkdfUFNNSV9DVEwoZW5naW5lLT5tbWlvX2Jhc2UpKTsKLQkJZWUtPmZh dWx0X3JlZyA9IEk5MTVfUkVBRChSSU5HX0ZBVUxUX1JFRyhlbmdpbmUpKTsKLQkJaWYgKElOVEVM X0dFTihkZXZfcHJpdikgPj0gOCkKKwkJaWYgKElOVEVMX0dFTihkZXZfcHJpdikgPj0gOCkgewog CQkJZ2VuOF9yZWNvcmRfc2VtYXBob3JlX3N0YXRlKGVycm9yLCBlbmdpbmUsIGVlKTsKLQkJZWxz ZQorCQkJZWUtPmZhdWx0X3JlZyA9IEk5MTVfUkVBRChHRU44X1JJTkdfRkFVTFRfUkVHKTsKKwkJ fSBlbHNlIHsKIAkJCWdlbjZfcmVjb3JkX3NlbWFwaG9yZV9zdGF0ZShlbmdpbmUsIGVlKTsKKwkJ CWVlLT5mYXVsdF9yZWcgPSBJOTE1X1JFQUQoUklOR19GQVVMVF9SRUcoZW5naW5lKSk7CisJCX0K IAl9CiAKIAlpZiAoSU5URUxfR0VOKGRldl9wcml2KSA+PSA0KSB7CmRpZmYgLS1naXQgYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3JlZy5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9y ZWcuaAppbmRleCBjODY0N2NmYTgxYmEuLjU0YTgyOGFhZDc3NyAxMDA2NDQKLS0tIGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9yZWcuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X3JlZy5oCkBAIC0yMTQ5LDYgKzIxNDksOCBAQCBlbnVtIHNrbF9kaXNwX3Bvd2VyX3dlbGxzIHsK ICNkZWZpbmUgICBBUkJfTU9ERV9TV0laWkxFX0JEVwkoMTw8MSkKICNkZWZpbmUgUkVOREVSX0hX U19QR0FfR0VONwlfTU1JTygweDA0MDgwKQogI2RlZmluZSBSSU5HX0ZBVUxUX1JFRyhlbmdpbmUp CV9NTUlPKDB4NDA5NCArIDB4MTAwKihlbmdpbmUpLT5od19pZCkKKyNkZWZpbmUgR0VOOF9SSU5H X0ZBVUxUX1JFRwlfTU1JTygweDQwOTQpCisjZGVmaW5lICAgR0VOOF9SSU5HX0ZBVUxUX0VOR0lO RV9JRCh4KQkoKCh4KSA+PiAxMikgJiAweDcpCiAjZGVmaW5lICAgUklOR19GQVVMVF9HVFRTRUxf TUFTSyAoMTw8MTEpCiAjZGVmaW5lICAgUklOR19GQVVMVF9TUkNJRCh4KQkoKCh4KSA+PiAzKSAm IDB4ZmYpCiAjZGVmaW5lICAgUklOR19GQVVMVF9GQVVMVF9UWVBFKHgpICgoKHgpID4+IDEpICYg MHgzKQotLSAKMi4xMS4wCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3Rv cC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRl bC1nZngK