From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michel Thierry Subject: [PATCH v3] drm/i915: There is only one fault register from GEN8 onwards Date: Mon, 13 Nov 2017 09:36:28 -0800 Message-ID: <20171113173628.11689-1-michel.thierry@intel.com> References: <20171111004448.12360-2-michel.thierry@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by gabe.freedesktop.org (Postfix) with ESMTPS id C14BB6E6E0 for ; Mon, 13 Nov 2017 17:36:28 +0000 (UTC) In-Reply-To: <20171111004448.12360-2-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 LCAweDQxOTQgLSBtZWRpYSBmYXVsdApyZWdpc3RlciBhbmQgc28gb24pLiBCdXQgc2luY2UgQnJv YWR3ZWxsLCBhbGwgdGhlc2UgcmVnaXN0ZXJzIHdlcmUKY29tYmluZWQgaW50byBhIHNpbmdlIG9u ZSBhbmQgdGhlIGVuZ2luZSBpZCBzdG9yZWQgaW4gYml0cyAxNDoxMi4KCk5vdCBvbmx5IHdlIHNo b3VsZCBub3QgYmVlbiByZWFkaW5nIChhbmQgd3JpdGluZyB0bykgcmVnaXN0ZXJzIHRoYXQgZG8K bm90IGV4aXN0LCBpbiBwbGF0Zm9ybXMgd2l0aCBWQ1MyIChTS0wpLCB0aGUgYWRkcmVzcyB0aGF0 IHdvdWxkIGJlbG9uZwp0aGlzIGVuZ2luZSAoMHg0NDk0LCBWQ1MyX0hXID0gNCkgaXMgYWxyZWFk eSBhc3NpZ25lZCB0byBvdGhlciByZWdpc3Rlci4KCnYyOiB1c2UgbGVzcyBjb250cm92ZXJzaWFs IGZ1bmN0aW9uIG5hbWVzIChDaHJpcykuCnYzOiBtYWtlIG5vbi1leHBvcnRlZCBmdW5jdGlvbnMg c3RhdGljLCByZW1vdmUgbm93IG9ic29sZXRlIGNoZWNrIGZvcgplbmdpbmUgcHJlc2VuY2UgYmVm b3JlIHBvc3RpbmdfcmVhZCAoQ2hyaXMpLgoKUmVmZXJlbmNlczogSUhELU9TLUJEVy1Wb2wgMmMt MTEuMTUsIHBhZ2UgNzUuClJlZmVyZW5jZXM6IElIRC1PUy1TS0wtVm9sIDJjLTA1LjE2LCBwYWdl IDM1MC4KU2lnbmVkLW9mZi1ieTogTWljaGVsIFRoaWVycnkgPG1pY2hlbC50aGllcnJ5QGludGVs LmNvbT4KQ2M6IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hyaXMtd2lsc29uLmNvLnVrPgotLS0KIGRy aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jICAgfCA1NyArKysrKysrKysrKysrKysr KysrKysrKysrKy0tLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ncHVfZXJyb3Iu YyB8ICA4ICsrKy0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3JlZy5oICAgICAgIHwgIDIg KysKIDMgZmlsZXMgY2hhbmdlZCwgNDkgaW5zZXJ0aW9ucygrKSwgMTggZGVsZXRpb25zKC0pCgpk aWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMgYi9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYwppbmRleCAxZTQwZWViMzFmOWQuLjNjM2E2OTk0 MzZjOSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMKKysr IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMKQEAgLTIyNTYsMzUgKzIyNTYs NjIgQEAgc3RhdGljIGJvb2wgbmVlZHNfaWRsZV9tYXBzKHN0cnVjdCBkcm1faTkxNV9wcml2YXRl ICpkZXZfcHJpdikKIAlyZXR1cm4gSVNfR0VONShkZXZfcHJpdikgJiYgSVNfTU9CSUxFKGRldl9w cml2KSAmJiBpbnRlbF92dGRfYWN0aXZlKCk7CiB9CiAKLXZvaWQgaTkxNV9jaGVja19hbmRfY2xl YXJfZmF1bHRzKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKK3N0YXRpYyB2b2lk IGdlbjZfY2hlY2tfYW5kX2NsZWFyX2ZhdWx0cyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2 X3ByaXYpCiB7CiAJc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lOwogCWVudW0gaW50ZWxf ZW5naW5lX2lkIGlkOwotCi0JaWYgKElOVEVMX0lORk8oZGV2X3ByaXYpLT5nZW4gPCA2KQotCQly ZXR1cm47CisJdTMyIGZhdWx0OwogCiAJZm9yX2VhY2hfZW5naW5lKGVuZ2luZSwgZGV2X3ByaXYs IGlkKSB7Ci0JCXUzMiBmYXVsdF9yZWc7Ci0JCWZhdWx0X3JlZyA9IEk5MTVfUkVBRChSSU5HX0ZB VUxUX1JFRyhlbmdpbmUpKTsKLQkJaWYgKGZhdWx0X3JlZyAmIFJJTkdfRkFVTFRfVkFMSUQpIHsK KwkJZmF1bHQgPSBJOTE1X1JFQUQoUklOR19GQVVMVF9SRUcoZW5naW5lKSk7CisJCWlmIChmYXVs dCAmIFJJTkdfRkFVTFRfVkFMSUQpIHsKIAkJCURSTV9ERUJVR19EUklWRVIoIlVuZXhwZWN0ZWQg ZmF1bHRcbiIKIAkJCQkJICJcdEFkZHI6IDB4JTA4bHhcbiIKIAkJCQkJICJcdEFkZHJlc3Mgc3Bh Y2U6ICVzXG4iCiAJCQkJCSAiXHRTb3VyY2UgSUQ6ICVkXG4iCiAJCQkJCSAiXHRUeXBlOiAlZFxu IiwKLQkJCQkJIGZhdWx0X3JlZyAmIFBBR0VfTUFTSywKLQkJCQkJIGZhdWx0X3JlZyAmIFJJTkdf RkFVTFRfR1RUU0VMX01BU0sgPyAiR0dUVCIgOiAiUFBHVFQiLAotCQkJCQkgUklOR19GQVVMVF9T UkNJRChmYXVsdF9yZWcpLAotCQkJCQkgUklOR19GQVVMVF9GQVVMVF9UWVBFKGZhdWx0X3JlZykp OworCQkJCQkgZmF1bHQgJiBQQUdFX01BU0ssCisJCQkJCSBmYXVsdCAmIFJJTkdfRkFVTFRfR1RU U0VMX01BU0sgPyAiR0dUVCIgOiAiUFBHVFQiLAorCQkJCQkgUklOR19GQVVMVF9TUkNJRChmYXVs dCksCisJCQkJCSBSSU5HX0ZBVUxUX0ZBVUxUX1RZUEUoZmF1bHQpKTsKIAkJCUk5MTVfV1JJVEUo UklOR19GQVVMVF9SRUcoZW5naW5lKSwKLQkJCQkgICBmYXVsdF9yZWcgJiB+UklOR19GQVVMVF9W QUxJRCk7CisJCQkJICAgZmF1bHQgJiB+UklOR19GQVVMVF9WQUxJRCk7CiAJCX0KIAl9CiAKLQkv KiBFbmdpbmUgc3BlY2lmaWMgaW5pdCBtYXkgbm90IGhhdmUgYmVlbiBkb25lIHRpbGwgdGhpcyBw b2ludC4gKi8KLQlpZiAoZGV2X3ByaXYtPmVuZ2luZVtSQ1NdKQotCQlQT1NUSU5HX1JFQUQoUklO R19GQVVMVF9SRUcoZGV2X3ByaXYtPmVuZ2luZVtSQ1NdKSk7CisJUE9TVElOR19SRUFEKFJJTkdf RkFVTFRfUkVHKGRldl9wcml2LT5lbmdpbmVbUkNTXSkpOworfQorCitzdGF0aWMgdm9pZCBnZW44 X2NoZWNrX2FuZF9jbGVhcl9mYXVsdHMoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2 KQoreworCXUzMiBmYXVsdCA9IEk5MTVfUkVBRChHRU44X1JJTkdfRkFVTFRfUkVHKTsKKworCWlm IChmYXVsdCAmIFJJTkdfRkFVTFRfVkFMSUQpIHsKKwkJRFJNX0RFQlVHX0RSSVZFUigiVW5leHBl Y3RlZCBmYXVsdFxuIgorCQkJCSAiXHRBZGRyOiAweCUwOGx4XG4iCisJCQkJICJcdEVuZ2luZSBJ RDogJWRcbiIKKwkJCQkgIlx0U291cmNlIElEOiAlZFxuIgorCQkJCSAiXHRUeXBlOiAlZFxuIiwK KwkJCQkgZmF1bHQgJiBQQUdFX01BU0ssCisJCQkJIEdFTjhfUklOR19GQVVMVF9FTkdJTkVfSUQo ZmF1bHQpLAorCQkJCSBSSU5HX0ZBVUxUX1NSQ0lEKGZhdWx0KSwKKwkJCQkgUklOR19GQVVMVF9G QVVMVF9UWVBFKGZhdWx0KSk7CisJCUk5MTVfV1JJVEUoR0VOOF9SSU5HX0ZBVUxUX1JFRywKKwkJ CSAgIGZhdWx0ICYgflJJTkdfRkFVTFRfVkFMSUQpOworCX0KKworCVBPU1RJTkdfUkVBRChHRU44 X1JJTkdfRkFVTFRfUkVHKTsKK30KKwordm9pZCBpOTE1X2NoZWNrX2FuZF9jbGVhcl9mYXVsdHMo c3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQoreworCS8qIEZyb20gR0VOOCBvbndh cmRzIHdlIG9ubHkgaGF2ZSBvbmUgJ0FsbCBFbmdpbmUgRmF1bHQgUmVnaXN0ZXInICovCisJaWYg KElOVEVMX0dFTihkZXZfcHJpdikgPj0gOCkKKwkJZ2VuOF9jaGVja19hbmRfY2xlYXJfZmF1bHRz KGRldl9wcml2KTsKKwllbHNlIGlmIChJTlRFTF9HRU4oZGV2X3ByaXYpID49IDYpCisJCWdlbjZf Y2hlY2tfYW5kX2NsZWFyX2ZhdWx0cyhkZXZfcHJpdik7CisJZWxzZQorCQlyZXR1cm47CiB9CiAK IHZvaWQgaTkxNV9nZW1fc3VzcGVuZF9ndHRfbWFwcGluZ3Moc3RydWN0IGRybV9pOTE1X3ByaXZh dGUgKmRldl9wcml2KQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ncHVf ZXJyb3IuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3B1X2Vycm9yLmMKaW5kZXggNWMy ZDgzYTgzOGQ4Li43NDgxYzhlMWI1YTggMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZ3B1X2Vycm9yLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ncHVfZXJy b3IuYwpAQCAtMTIxNywxMSArMTIxNywxMyBAQCBzdGF0aWMgdm9pZCBlcnJvcl9yZWNvcmRfZW5n aW5lX3JlZ2lzdGVycyhzdHJ1Y3QgaTkxNV9ncHVfc3RhdGUgKmVycm9yLAogCiAJaWYgKElOVEVM X0dFTihkZXZfcHJpdikgPj0gNikgewogCQllZS0+cmNfcHNtaSA9IEk5MTVfUkVBRChSSU5HX1BT TUlfQ1RMKGVuZ2luZS0+bW1pb19iYXNlKSk7Ci0JCWVlLT5mYXVsdF9yZWcgPSBJOTE1X1JFQUQo UklOR19GQVVMVF9SRUcoZW5naW5lKSk7Ci0JCWlmIChJTlRFTF9HRU4oZGV2X3ByaXYpID49IDgp CisJCWlmIChJTlRFTF9HRU4oZGV2X3ByaXYpID49IDgpIHsKIAkJCWdlbjhfcmVjb3JkX3NlbWFw aG9yZV9zdGF0ZShlcnJvciwgZW5naW5lLCBlZSk7Ci0JCWVsc2UKKwkJCWVlLT5mYXVsdF9yZWcg PSBJOTE1X1JFQUQoR0VOOF9SSU5HX0ZBVUxUX1JFRyk7CisJCX0gZWxzZSB7CiAJCQlnZW42X3Jl Y29yZF9zZW1hcGhvcmVfc3RhdGUoZW5naW5lLCBlZSk7CisJCQllZS0+ZmF1bHRfcmVnID0gSTkx NV9SRUFEKFJJTkdfRkFVTFRfUkVHKGVuZ2luZSkpOworCQl9CiAJfQogCiAJaWYgKElOVEVMX0dF TihkZXZfcHJpdikgPj0gNCkgewpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx NV9yZWcuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcmVnLmgKaW5kZXggNmVmMzM0MjJm NzYyLi43ZWY4MmJhNjcwZTkgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf cmVnLmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9yZWcuaApAQCAtMjMyOSw2ICsy MzI5LDggQEAgZW51bSBpOTE1X3Bvd2VyX3dlbGxfaWQgewogI2RlZmluZSAgIEFSQl9NT0RFX1NX SVpaTEVfQkRXCSgxPDwxKQogI2RlZmluZSBSRU5ERVJfSFdTX1BHQV9HRU43CV9NTUlPKDB4MDQw ODApCiAjZGVmaW5lIFJJTkdfRkFVTFRfUkVHKGVuZ2luZSkJX01NSU8oMHg0MDk0ICsgMHgxMDAq KGVuZ2luZSktPmh3X2lkKQorI2RlZmluZSBHRU44X1JJTkdfRkFVTFRfUkVHCV9NTUlPKDB4NDA5 NCkKKyNkZWZpbmUgICBHRU44X1JJTkdfRkFVTFRfRU5HSU5FX0lEKHgpCSgoKHgpID4+IDEyKSAm IDB4NykKICNkZWZpbmUgICBSSU5HX0ZBVUxUX0dUVFNFTF9NQVNLICgxPDwxMSkKICNkZWZpbmUg ICBSSU5HX0ZBVUxUX1NSQ0lEKHgpCSgoKHgpID4+IDMpICYgMHhmZikKICNkZWZpbmUgICBSSU5H X0ZBVUxUX0ZBVUxUX1RZUEUoeCkgKCgoeCkgPj4gMSkgJiAweDMpCi0tIAoyLjE1LjAKCl9fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWls aW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZy ZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=