From mboxrd@z Thu Jan  1 00:00:00 1970
From: Michel Thierry <michel.thierry@intel.com>
Subject: [PATCH 2/2 v2] drm/i915: There is only one fault
	register from GEN8 onwards
Date: Fri, 10 Nov 2017 16:44:48 -0800
Message-ID: <20171111004448.12360-2-michel.thierry@intel.com>
References: <20171111004448.12360-1-michel.thierry@intel.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64
Return-path: <intel-gfx-bounces@lists.freedesktop.org>
Received: from mga11.intel.com (unknown [192.55.52.93])
 by gabe.freedesktop.org (Postfix) with ESMTPS id 523546EBC4
 for <intel-gfx@lists.freedesktop.org>; Sat, 11 Nov 2017 00:44:50 +0000 (UTC)
In-Reply-To: <20171111004448.12360-1-michel.thierry@intel.com>
List-Unsubscribe: <https://lists.freedesktop.org/mailman/options/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <https://lists.freedesktop.org/archives/intel-gfx>
List-Post: <mailto:intel-gfx@lists.freedesktop.org>
List-Help: <mailto:intel-gfx-request@lists.freedesktop.org?subject=help>
List-Subscribe: <https://lists.freedesktop.org/mailman/listinfo/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=subscribe>
Errors-To: intel-gfx-bounces@lists.freedesktop.org
Sender: "Intel-gfx" <intel-gfx-bounces@lists.freedesktop.org>
To: intel-gfx@lists.freedesktop.org
List-Id: intel-gfx@lists.freedesktop.org

VW50aWwgSGFzd2VsbC9CYXl0cmFpbCwgdGhlIGhhcmR3YXJlIHVzZWQgdG8gaGF2ZSBhIHBlciBl
bmdpbmUgZmF1bHQKcmVnaXN0ZXIgKGUuZy4gMHg0MDk0IC0gcmVuZGVyIGZhdWx0IHJlZ2lzdGVy
LCAweDQxOTQgLSBtZWRpYSBmYXVsdApyZWdpc3RlciBhbmQgc28gb24pLiBCdXQgc2luY2UgQnJv
YWR3ZWxsLCBhbGwgdGhlc2UgcmVnaXN0ZXJzIHdlcmUKY29tYmluZWQgaW50byBhIHNpbmdlIG9u
ZSBhbmQgdGhlIGVuZ2luZSBpZCBzdG9yZWQgaW4gYml0cyAxNDoxMi4KCk5vdCBvbmx5IHdlIHNo
b3VsZCBub3QgYmVlbiByZWFkaW5nIChhbmQgd3JpdGluZyB0bykgcmVnaXN0ZXJzIHRoYXQgZG8K
bm90IGV4aXN0LCBpbiBwbGF0Zm9ybXMgd2l0aCBWQ1MyIChTS0wpLCB0aGUgYWRkcmVzcyB0aGF0
IHdvdWxkIGJlbG9uZwp0aGlzIGVuZ2luZSAoMHg0NDk0LCBWQ1MyX0hXID0gNCkgaXMgYWxyZWFk
eSBhc3NpZ25lZCB0byBvdGhlciByZWdpc3Rlci4KCnYyOiB1c2UgbGVzcyBjb250cm92ZXJzaWFs
IGZ1bmN0aW9uIG5hbWVzIChDaHJpcykuCgpSZWZlcmVuY2VzOiBJSEQtT1MtQkRXLVZvbCAyYy0x
MS4xNSwgcGFnZSA3NS4KUmVmZXJlbmNlczogSUhELU9TLVNLTC1Wb2wgMmMtMDUuMTYsIHBhZ2Ug
MzUwLgpTaWduZWQtb2ZmLWJ5OiBNaWNoZWwgVGhpZXJyeSA8bWljaGVsLnRoaWVycnlAaW50ZWwu
Y29tPgpDYzogQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+Ci0tLQogZHJp
dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMgICB8IDUyICsrKysrKysrKysrKysrKysr
KysrKysrKysrKy0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dwdV9lcnJvci5j
IHwgIDggKysrKy0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3JlZy5oICAgICAgIHwgIDIg
KysKIDMgZmlsZXMgY2hhbmdlZCwgNDcgaW5zZXJ0aW9ucygrKSwgMTUgZGVsZXRpb25zKC0pCgpk
aWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMgYi9kcml2ZXJz
L2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYwppbmRleCAxZTQwZWViMzFmOWQuLmM3Y2ZhZGM3
MTAzYyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMKKysr
IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMKQEAgLTIyNTYsMzEgKzIyNTYs
NTkgQEAgc3RhdGljIGJvb2wgbmVlZHNfaWRsZV9tYXBzKHN0cnVjdCBkcm1faTkxNV9wcml2YXRl
ICpkZXZfcHJpdikKIAlyZXR1cm4gSVNfR0VONShkZXZfcHJpdikgJiYgSVNfTU9CSUxFKGRldl9w
cml2KSAmJiBpbnRlbF92dGRfYWN0aXZlKCk7CiB9CiAKLXZvaWQgaTkxNV9jaGVja19hbmRfY2xl
YXJfZmF1bHRzKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKK3ZvaWQgZ2VuNl9j
aGVja19hbmRfY2xlYXJfZmF1bHRzKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikK
IHsKIAlzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmU7CiAJZW51bSBpbnRlbF9lbmdpbmVf
aWQgaWQ7Ci0KLQlpZiAoSU5URUxfSU5GTyhkZXZfcHJpdiktPmdlbiA8IDYpCi0JCXJldHVybjsK
Kwl1MzIgZmF1bHQ7CiAKIAlmb3JfZWFjaF9lbmdpbmUoZW5naW5lLCBkZXZfcHJpdiwgaWQpIHsK
LQkJdTMyIGZhdWx0X3JlZzsKLQkJZmF1bHRfcmVnID0gSTkxNV9SRUFEKFJJTkdfRkFVTFRfUkVH
KGVuZ2luZSkpOwotCQlpZiAoZmF1bHRfcmVnICYgUklOR19GQVVMVF9WQUxJRCkgeworCQlmYXVs
dCA9IEk5MTVfUkVBRChSSU5HX0ZBVUxUX1JFRyhlbmdpbmUpKTsKKwkJaWYgKGZhdWx0ICYgUklO
R19GQVVMVF9WQUxJRCkgewogCQkJRFJNX0RFQlVHX0RSSVZFUigiVW5leHBlY3RlZCBmYXVsdFxu
IgogCQkJCQkgIlx0QWRkcjogMHglMDhseFxuIgogCQkJCQkgIlx0QWRkcmVzcyBzcGFjZTogJXNc
biIKIAkJCQkJICJcdFNvdXJjZSBJRDogJWRcbiIKIAkJCQkJICJcdFR5cGU6ICVkXG4iLAotCQkJ
CQkgZmF1bHRfcmVnICYgUEFHRV9NQVNLLAotCQkJCQkgZmF1bHRfcmVnICYgUklOR19GQVVMVF9H
VFRTRUxfTUFTSyA/ICJHR1RUIiA6ICJQUEdUVCIsCi0JCQkJCSBSSU5HX0ZBVUxUX1NSQ0lEKGZh
dWx0X3JlZyksCi0JCQkJCSBSSU5HX0ZBVUxUX0ZBVUxUX1RZUEUoZmF1bHRfcmVnKSk7CisJCQkJ
CSBmYXVsdCAmIFBBR0VfTUFTSywKKwkJCQkJIGZhdWx0ICYgUklOR19GQVVMVF9HVFRTRUxfTUFT
SyA/ICJHR1RUIiA6ICJQUEdUVCIsCisJCQkJCSBSSU5HX0ZBVUxUX1NSQ0lEKGZhdWx0KSwKKwkJ
CQkJIFJJTkdfRkFVTFRfRkFVTFRfVFlQRShmYXVsdCkpOwogCQkJSTkxNV9XUklURShSSU5HX0ZB
VUxUX1JFRyhlbmdpbmUpLAotCQkJCSAgIGZhdWx0X3JlZyAmIH5SSU5HX0ZBVUxUX1ZBTElEKTsK
KwkJCQkgICBmYXVsdCAmIH5SSU5HX0ZBVUxUX1ZBTElEKTsKIAkJfQogCX0KK30KKwordm9pZCBn
ZW44X2NoZWNrX2FuZF9jbGVhcl9mYXVsdHMoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9w
cml2KQoreworCXUzMiBmYXVsdCA9IEk5MTVfUkVBRChHRU44X1JJTkdfRkFVTFRfUkVHKTsKKwor
CWlmIChmYXVsdCAmIFJJTkdfRkFVTFRfVkFMSUQpIHsKKwkJRFJNX0RFQlVHX0RSSVZFUigiVW5l
eHBlY3RlZCBmYXVsdFxuIgorCQkJCSAiXHRBZGRyOiAweCUwOGx4XG4iCisJCQkJICJcdEVuZ2lu
ZSBJRDogJWRcbiIKKwkJCQkgIlx0U291cmNlIElEOiAlZFxuIgorCQkJCSAiXHRUeXBlOiAlZFxu
IiwKKwkJCQkgZmF1bHQgJiBQQUdFX01BU0ssCisJCQkJIEdFTjhfUklOR19GQVVMVF9FTkdJTkVf
SUQoZmF1bHQpLAorCQkJCSBSSU5HX0ZBVUxUX1NSQ0lEKGZhdWx0KSwKKwkJCQkgUklOR19GQVVM
VF9GQVVMVF9UWVBFKGZhdWx0KSk7CisJCUk5MTVfV1JJVEUoR0VOOF9SSU5HX0ZBVUxUX1JFRywK
KwkJCSAgIGZhdWx0ICYgflJJTkdfRkFVTFRfVkFMSUQpOworCX0KK30KKwordm9pZCBpOTE1X2No
ZWNrX2FuZF9jbGVhcl9mYXVsdHMoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQor
eworCWlmIChJTlRFTF9HRU4oZGV2X3ByaXYpIDwgNikKKwkJcmV0dXJuOworCisJLyogRnJvbSBH
RU44IG9ud2FyZHMgd2Ugb25seSBoYXZlIG9uZSAnQWxsIEVuZ2luZSBGYXVsdCBSZWdpc3Rlcicg
Ki8KKwlpZiAoSU5URUxfR0VOKGRldl9wcml2KSA+PSA4KQorCQlnZW44X2NoZWNrX2FuZF9jbGVh
cl9mYXVsdHMoZGV2X3ByaXYpOworCWVsc2UKKwkJZ2VuNl9jaGVja19hbmRfY2xlYXJfZmF1bHRz
KGRldl9wcml2KTsKIAogCS8qIEVuZ2luZSBzcGVjaWZpYyBpbml0IG1heSBub3QgaGF2ZSBiZWVu
IGRvbmUgdGlsbCB0aGlzIHBvaW50LiAqLwogCWlmIChkZXZfcHJpdi0+ZW5naW5lW1JDU10pCmRp
ZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dwdV9lcnJvci5jIGIvZHJpdmVy
cy9ncHUvZHJtL2k5MTUvaTkxNV9ncHVfZXJyb3IuYwppbmRleCA1YzJkODNhODM4ZDguLjc0ODFj
OGUxYjVhOCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ncHVfZXJyb3Iu
YworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dwdV9lcnJvci5jCkBAIC0xMjE3LDEx
ICsxMjE3LDEzIEBAIHN0YXRpYyB2b2lkIGVycm9yX3JlY29yZF9lbmdpbmVfcmVnaXN0ZXJzKHN0
cnVjdCBpOTE1X2dwdV9zdGF0ZSAqZXJyb3IsCiAKIAlpZiAoSU5URUxfR0VOKGRldl9wcml2KSA+
PSA2KSB7CiAJCWVlLT5yY19wc21pID0gSTkxNV9SRUFEKFJJTkdfUFNNSV9DVEwoZW5naW5lLT5t
bWlvX2Jhc2UpKTsKLQkJZWUtPmZhdWx0X3JlZyA9IEk5MTVfUkVBRChSSU5HX0ZBVUxUX1JFRyhl
bmdpbmUpKTsKLQkJaWYgKElOVEVMX0dFTihkZXZfcHJpdikgPj0gOCkKKwkJaWYgKElOVEVMX0dF
TihkZXZfcHJpdikgPj0gOCkgewogCQkJZ2VuOF9yZWNvcmRfc2VtYXBob3JlX3N0YXRlKGVycm9y
LCBlbmdpbmUsIGVlKTsKLQkJZWxzZQorCQkJZWUtPmZhdWx0X3JlZyA9IEk5MTVfUkVBRChHRU44
X1JJTkdfRkFVTFRfUkVHKTsKKwkJfSBlbHNlIHsKIAkJCWdlbjZfcmVjb3JkX3NlbWFwaG9yZV9z
dGF0ZShlbmdpbmUsIGVlKTsKKwkJCWVlLT5mYXVsdF9yZWcgPSBJOTE1X1JFQUQoUklOR19GQVVM
VF9SRUcoZW5naW5lKSk7CisJCX0KIAl9CiAKIAlpZiAoSU5URUxfR0VOKGRldl9wcml2KSA+PSA0
KSB7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3JlZy5oIGIvZHJpdmVy
cy9ncHUvZHJtL2k5MTUvaTkxNV9yZWcuaAppbmRleCA2ZWYzMzQyMmY3NjIuLjdlZjgyYmE2NzBl
OSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9yZWcuaAorKysgYi9kcml2
ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3JlZy5oCkBAIC0yMzI5LDYgKzIzMjksOCBAQCBlbnVtIGk5
MTVfcG93ZXJfd2VsbF9pZCB7CiAjZGVmaW5lICAgQVJCX01PREVfU1dJWlpMRV9CRFcJKDE8PDEp
CiAjZGVmaW5lIFJFTkRFUl9IV1NfUEdBX0dFTjcJX01NSU8oMHgwNDA4MCkKICNkZWZpbmUgUklO
R19GQVVMVF9SRUcoZW5naW5lKQlfTU1JTygweDQwOTQgKyAweDEwMCooZW5naW5lKS0+aHdfaWQp
CisjZGVmaW5lIEdFTjhfUklOR19GQVVMVF9SRUcJX01NSU8oMHg0MDk0KQorI2RlZmluZSAgIEdF
TjhfUklOR19GQVVMVF9FTkdJTkVfSUQoeCkJKCgoeCkgPj4gMTIpICYgMHg3KQogI2RlZmluZSAg
IFJJTkdfRkFVTFRfR1RUU0VMX01BU0sgKDE8PDExKQogI2RlZmluZSAgIFJJTkdfRkFVTFRfU1JD
SUQoeCkJKCgoeCkgPj4gMykgJiAweGZmKQogI2RlZmluZSAgIFJJTkdfRkFVTFRfRkFVTFRfVFlQ
RSh4KSAoKCh4KSA+PiAxKSAmIDB4MykKLS0gCjIuMTUuMAoKX19fX19fX19fX19fX19fX19fX19f
X19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1n
ZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21h
aWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==