From mboxrd@z Thu Jan  1 00:00:00 1970
From: Chris Wilson <chris@chris-wilson.co.uk>
Subject: [CI-ping 04/15] drm/i915: Hide the
	atomic_read(reset_counter) behind a helper
Date: Tue, 12 Apr 2016 21:02:58 +0100
Message-ID: <1460491389-8602-4-git-send-email-chris@chris-wilson.co.uk>
References: <1460491389-8602-1-git-send-email-chris@chris-wilson.co.uk>
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 mail-wm0-x244.google.com (mail-wm0-x244.google.com
 [IPv6:2a00:1450:400c:c09::244])
 by gabe.freedesktop.org (Postfix) with ESMTPS id 7C0DA6E78B
 for <intel-gfx@lists.freedesktop.org>; Tue, 12 Apr 2016 20:03:21 +0000 (UTC)
Received: by mail-wm0-x244.google.com with SMTP id n3so8316243wmn.1
 for <intel-gfx@lists.freedesktop.org>; Tue, 12 Apr 2016 13:03:21 -0700 (PDT)
In-Reply-To: <1460491389-8602-1-git-send-email-chris@chris-wilson.co.uk>
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
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
List-Id: intel-gfx@lists.freedesktop.org

VGhpcyBpcyBwcmluY2lwYWxseSBhIGxpdHRsZSBiaXQgb2Ygc3ludGF0aWMgc3VnYXIgdG8gaGlk
ZSB0aGUKYXRvbWljX3JlYWQoKXMgdGhyb3VnaG91dCB0aGUgY29kZSB0byByZXRyaWV2ZSB0aGUg
Y3VycmVudCByZXNldF9jb3VudGVyLgpJdCBhbHNvIHByb3ZpZGVzIHRoZSBvdGhlciB1dGlsaXR5
IGZ1bmN0aW9ucyB0byBjaGVjayB0aGUgcmVzZXQgc3RhdGUgb24gdGhlCmFscmVhZHkgcmVhZCBy
ZXNldF9jb3VudGVyLCBzbyB0aGF0IChpbiBsYXRlciBwYXRjaGVzKSB3ZSBjYW4gcmVhZCBpdCBv
bmNlCmFuZCBkbyBtdWx0aXBsZSB0ZXN0cyByYXRoZXIgdGhhbiByaXNrIHRoZSB2YWx1ZSBjaGFu
Z2luZyBiZXR3ZWVuIHRlc3RzLgoKdjI6IEJlIG1vcmUgc3RyaWN0IG9uIGNvbnZlcnRpbmcgZXhp
c3RpbmcgaTkxNV9yZXNldF9pbl9wcm9ncmVzcygpIG92ZXIgdG8KdGhlIG1vcmUgdmVyYm9zZSBp
OTE1X3Jlc2V0X2luX3Byb2dyZXNzX29yX3dlZGdlZCgpLgoKU2lnbmVkLW9mZi1ieTogQ2hyaXMg
V2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+CkNjOiBEYW5pZWwgVmV0dGVyIDxkYW5p
ZWwudmV0dGVyQGZmd2xsLmNoPgpSZXZpZXdlZC1ieTogRGFuaWVsIFZldHRlciA8ZGFuaWVsLnZl
dHRlckBmZndsbC5jaD4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYyAg
ICAgfCAgNCArKy0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oICAgICAgICAgfCAz
MiArKysrKysrKysrKysrKysrKysrKysrKysrKysrLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUv
aTkxNV9nZW0uYyAgICAgICAgIHwgMTYgKysrKysrKystLS0tLS0tLQogZHJpdmVycy9ncHUvZHJt
L2k5MTUvaTkxNV9pcnEuYyAgICAgICAgIHwgIDIgKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2lu
dGVsX2Rpc3BsYXkuYyAgICB8IDE4ICsrKysrKysrKysrLS0tLS0tLQogZHJpdmVycy9ncHUvZHJt
L2k5MTUvaW50ZWxfbHJjLmMgICAgICAgIHwgIDIgKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2lu
dGVsX3JpbmdidWZmZXIuYyB8ICA3ICsrKystLS0KIDcgZmlsZXMgY2hhbmdlZCwgNTUgaW5zZXJ0
aW9ucygrKSwgMjYgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5
MTUvaTkxNV9kZWJ1Z2ZzLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYwpp
bmRleCAyZDExYjQ5NDhhNzQuLmYxNDcwODM0ZTg3NCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUv
ZHJtL2k5MTUvaTkxNV9kZWJ1Z2ZzLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9k
ZWJ1Z2ZzLmMKQEAgLTQ3MjEsNyArNDcyMSw3IEBAIGk5MTVfd2VkZ2VkX2dldCh2b2lkICpkYXRh
LCB1NjQgKnZhbCkKIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gZGF0YTsKIAlzdHJ1Y3QgZHJt
X2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2YXRlOwogCi0JKnZhbCA9IGF0
b21pY19yZWFkKCZkZXZfcHJpdi0+Z3B1X2Vycm9yLnJlc2V0X2NvdW50ZXIpOworCSp2YWwgPSBp
OTE1X3Jlc2V0X2NvdW50ZXIoJmRldl9wcml2LT5ncHVfZXJyb3IpOwogCiAJcmV0dXJuIDA7CiB9
CkBAIC00NzQwLDcgKzQ3NDAsNyBAQCBpOTE1X3dlZGdlZF9zZXQodm9pZCAqZGF0YSwgdTY0IHZh
bCkKIAkgKiB3aGlsZSBpdCBpcyB3cml0aW5nIHRvICdpOTE1X3dlZGdlZCcKIAkgKi8KIAotCWlm
IChpOTE1X3Jlc2V0X2luX3Byb2dyZXNzKCZkZXZfcHJpdi0+Z3B1X2Vycm9yKSkKKwlpZiAoaTkx
NV9yZXNldF9pbl9wcm9ncmVzc19vcl93ZWRnZWQoJmRldl9wcml2LT5ncHVfZXJyb3IpKQogCQly
ZXR1cm4gLUVBR0FJTjsKIAogCWludGVsX3J1bnRpbWVfcG1fZ2V0KGRldl9wcml2KTsKZGlmZiAt
LWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0v
aTkxNS9pOTE1X2Rydi5oCmluZGV4IDQ1MmY2NGFjZDdkZS4uMTA1M2NiM2Y5ZTdiIDEwMDY0NAot
LS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2Ry
bS9pOTE1L2k5MTVfZHJ2LmgKQEAgLTMwODgsMjAgKzMwODgsNDQgQEAgdm9pZCBpOTE1X2dlbV9y
ZXRpcmVfcmVxdWVzdHNfcmluZyhzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpOwogaW50
IF9fbXVzdF9jaGVjayBpOTE1X2dlbV9jaGVja193ZWRnZShzdHJ1Y3QgaTkxNV9ncHVfZXJyb3Ig
KmVycm9yLAogCQkJCSAgICAgIGJvb2wgaW50ZXJydXB0aWJsZSk7CiAKK3N0YXRpYyBpbmxpbmUg
dTMyIGk5MTVfcmVzZXRfY291bnRlcihzdHJ1Y3QgaTkxNV9ncHVfZXJyb3IgKmVycm9yKQorewor
CXJldHVybiBhdG9taWNfcmVhZCgmZXJyb3ItPnJlc2V0X2NvdW50ZXIpOworfQorCitzdGF0aWMg
aW5saW5lIGJvb2wgX19pOTE1X3Jlc2V0X2luX3Byb2dyZXNzKHUzMiByZXNldCkKK3sKKwlyZXR1
cm4gdW5saWtlbHkocmVzZXQgJiBJOTE1X1JFU0VUX0lOX1BST0dSRVNTX0ZMQUcpOworfQorCitz
dGF0aWMgaW5saW5lIGJvb2wgX19pOTE1X3Jlc2V0X2luX3Byb2dyZXNzX29yX3dlZGdlZCh1MzIg
cmVzZXQpCit7CisJcmV0dXJuIHVubGlrZWx5KHJlc2V0ICYgKEk5MTVfUkVTRVRfSU5fUFJPR1JF
U1NfRkxBRyB8IEk5MTVfV0VER0VEKSk7Cit9CisKK3N0YXRpYyBpbmxpbmUgYm9vbCBfX2k5MTVf
dGVybWluYWxseV93ZWRnZWQodTMyIHJlc2V0KQoreworCXJldHVybiB1bmxpa2VseShyZXNldCAm
IEk5MTVfV0VER0VEKTsKK30KKwogc3RhdGljIGlubGluZSBib29sIGk5MTVfcmVzZXRfaW5fcHJv
Z3Jlc3Moc3RydWN0IGk5MTVfZ3B1X2Vycm9yICplcnJvcikKIHsKLQlyZXR1cm4gdW5saWtlbHko
YXRvbWljX3JlYWQoJmVycm9yLT5yZXNldF9jb3VudGVyKQotCQkJJiAoSTkxNV9SRVNFVF9JTl9Q
Uk9HUkVTU19GTEFHIHwgSTkxNV9XRURHRUQpKTsKKwlyZXR1cm4gX19pOTE1X3Jlc2V0X2luX3By
b2dyZXNzKGk5MTVfcmVzZXRfY291bnRlcihlcnJvcikpOworfQorCitzdGF0aWMgaW5saW5lIGJv
b2wgaTkxNV9yZXNldF9pbl9wcm9ncmVzc19vcl93ZWRnZWQoc3RydWN0IGk5MTVfZ3B1X2Vycm9y
ICplcnJvcikKK3sKKwlyZXR1cm4gX19pOTE1X3Jlc2V0X2luX3Byb2dyZXNzX29yX3dlZGdlZChp
OTE1X3Jlc2V0X2NvdW50ZXIoZXJyb3IpKTsKIH0KIAogc3RhdGljIGlubGluZSBib29sIGk5MTVf
dGVybWluYWxseV93ZWRnZWQoc3RydWN0IGk5MTVfZ3B1X2Vycm9yICplcnJvcikKIHsKLQlyZXR1
cm4gYXRvbWljX3JlYWQoJmVycm9yLT5yZXNldF9jb3VudGVyKSAmIEk5MTVfV0VER0VEOworCXJl
dHVybiBfX2k5MTVfdGVybWluYWxseV93ZWRnZWQoaTkxNV9yZXNldF9jb3VudGVyKGVycm9yKSk7
CiB9CiAKIHN0YXRpYyBpbmxpbmUgdTMyIGk5MTVfcmVzZXRfY291bnQoc3RydWN0IGk5MTVfZ3B1
X2Vycm9yICplcnJvcikKIHsKLQlyZXR1cm4gKChhdG9taWNfcmVhZCgmZXJyb3ItPnJlc2V0X2Nv
dW50ZXIpICYgfkk5MTVfV0VER0VEKSArIDEpIC8gMjsKKwlyZXR1cm4gKChpOTE1X3Jlc2V0X2Nv
dW50ZXIoZXJyb3IpICYgfkk5MTVfV0VER0VEKSArIDEpIC8gMjsKIH0KIAogc3RhdGljIGlubGlu
ZSBib29sIGk5MTVfc3RvcF9yaW5nX2FsbG93X2JhbihzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAq
ZGV2X3ByaXYpCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jIGIv
ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYwppbmRleCAwMGJlZDNiNzk3OTMuLmVjYmU1
NjgxMDc5NiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYworKysg
Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCkBAIC04Myw3ICs4Myw3IEBAIGk5MTVf
Z2VtX3dhaXRfZm9yX2Vycm9yKHN0cnVjdCBpOTE1X2dwdV9lcnJvciAqZXJyb3IpCiB7CiAJaW50
IHJldDsKIAotI2RlZmluZSBFWElUX0NPTkQgKCFpOTE1X3Jlc2V0X2luX3Byb2dyZXNzKGVycm9y
KSB8fCBcCisjZGVmaW5lIEVYSVRfQ09ORCAoIWk5MTVfcmVzZXRfaW5fcHJvZ3Jlc3Nfb3Jfd2Vk
Z2VkKGVycm9yKSB8fCBcCiAJCSAgIGk5MTVfdGVybWluYWxseV93ZWRnZWQoZXJyb3IpKQogCWlm
IChFWElUX0NPTkQpCiAJCXJldHVybiAwOwpAQCAtMTExMiw3ICsxMTEyLDcgQEAgaW50CiBpOTE1
X2dlbV9jaGVja193ZWRnZShzdHJ1Y3QgaTkxNV9ncHVfZXJyb3IgKmVycm9yLAogCQkgICAgIGJv
b2wgaW50ZXJydXB0aWJsZSkKIHsKLQlpZiAoaTkxNV9yZXNldF9pbl9wcm9ncmVzcyhlcnJvcikp
IHsKKwlpZiAoaTkxNV9yZXNldF9pbl9wcm9ncmVzc19vcl93ZWRnZWQoZXJyb3IpKSB7CiAJCS8q
IE5vbi1pbnRlcnJ1cHRpYmxlIGNhbGxlcnMgY2FuJ3QgaGFuZGxlIC1FQUdBSU4sIGhlbmNlIHJl
dHVybgogCQkgKiAtRUlPIHVuY29uZGl0aW9uYWxseSBmb3IgdGhlc2UuICovCiAJCWlmICghaW50
ZXJydXB0aWJsZSkKQEAgLTEyOTksNyArMTI5OSw3IEBAIGludCBfX2k5MTVfd2FpdF9yZXF1ZXN0
KHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxLAogCiAJCS8qIFdlIG5lZWQgdG8gY2hl
Y2sgd2hldGhlciBhbnkgZ3B1IHJlc2V0IGhhcHBlbmVkIGluIGJldHdlZW4KIAkJICogdGhlIGNh
bGxlciBncmFiYmluZyB0aGUgc2Vxbm8gYW5kIG5vdyAuLi4gKi8KLQkJaWYgKHJlc2V0X2NvdW50
ZXIgIT0gYXRvbWljX3JlYWQoJmRldl9wcml2LT5ncHVfZXJyb3IucmVzZXRfY291bnRlcikpIHsK
KwkJaWYgKHJlc2V0X2NvdW50ZXIgIT0gaTkxNV9yZXNldF9jb3VudGVyKCZkZXZfcHJpdi0+Z3B1
X2Vycm9yKSkgewogCQkJLyogLi4uIGJ1dCB1cGdyYWRlIHRoZSAtRUFHQUlOIHRvIGFuIC1FSU8g
aWYgdGhlIGdwdQogCQkJICogaXMgdHJ1ZWx5IGdvbmUuICovCiAJCQlyZXQgPSBpOTE1X2dlbV9j
aGVja193ZWRnZSgmZGV2X3ByaXYtPmdwdV9lcnJvciwgaW50ZXJydXB0aWJsZSk7CkBAIC0xNDc0
LDcgKzE0NzQsNyBAQCBpOTE1X3dhaXRfcmVxdWVzdChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVl
c3QgKnJlcSkKIAkJcmV0dXJuIHJldDsKIAogCXJldCA9IF9faTkxNV93YWl0X3JlcXVlc3QocmVx
LAotCQkJCSAgYXRvbWljX3JlYWQoJmRldl9wcml2LT5ncHVfZXJyb3IucmVzZXRfY291bnRlciks
CisJCQkJICBpOTE1X3Jlc2V0X2NvdW50ZXIoJmRldl9wcml2LT5ncHVfZXJyb3IpLAogCQkJCSAg
aW50ZXJydXB0aWJsZSwgTlVMTCwgTlVMTCk7CiAJaWYgKHJldCkKIAkJcmV0dXJuIHJldDsKQEAg
LTE1NjMsNyArMTU2Myw3IEBAIGk5MTVfZ2VtX29iamVjdF93YWl0X3JlbmRlcmluZ19fbm9uYmxv
Y2tpbmcoc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iaiwKIAlpZiAocmV0KQogCQlyZXR1
cm4gcmV0OwogCi0JcmVzZXRfY291bnRlciA9IGF0b21pY19yZWFkKCZkZXZfcHJpdi0+Z3B1X2Vy
cm9yLnJlc2V0X2NvdW50ZXIpOworCXJlc2V0X2NvdW50ZXIgPSBpOTE1X3Jlc2V0X2NvdW50ZXIo
JmRldl9wcml2LT5ncHVfZXJyb3IpOwogCiAJaWYgKHJlYWRvbmx5KSB7CiAJCXN0cnVjdCBkcm1f
aTkxNV9nZW1fcmVxdWVzdCAqcmVxOwpAQCAtMzE3OSw3ICszMTc5LDcgQEAgaTkxNV9nZW1fd2Fp
dF9pb2N0bChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB2b2lkICpkYXRhLCBzdHJ1Y3QgZHJtX2Zp
bGUgKmZpbGUpCiAJfQogCiAJZHJtX2dlbV9vYmplY3RfdW5yZWZlcmVuY2UoJm9iai0+YmFzZSk7
Ci0JcmVzZXRfY291bnRlciA9IGF0b21pY19yZWFkKCZkZXZfcHJpdi0+Z3B1X2Vycm9yLnJlc2V0
X2NvdW50ZXIpOworCXJlc2V0X2NvdW50ZXIgPSBpOTE1X3Jlc2V0X2NvdW50ZXIoJmRldl9wcml2
LT5ncHVfZXJyb3IpOwogCiAJZm9yIChpID0gMDsgaSA8IEk5MTVfTlVNX0VOR0lORVM7IGkrKykg
ewogCQlpZiAob2JqLT5sYXN0X3JlYWRfcmVxW2ldID09IE5VTEwpCkBAIC0zMjI0LDcgKzMyMjQs
NyBAQCBfX2k5MTVfZ2VtX29iamVjdF9zeW5jKHN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpv
YmosCiAJaWYgKCFpOTE1X3NlbWFwaG9yZV9pc19lbmFibGVkKG9iai0+YmFzZS5kZXYpKSB7CiAJ
CXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICppOTE1ID0gdG9faTkxNShvYmotPmJhc2UuZGV2KTsK
IAkJcmV0ID0gX19pOTE1X3dhaXRfcmVxdWVzdChmcm9tX3JlcSwKLQkJCQkJICBhdG9taWNfcmVh
ZCgmaTkxNS0+Z3B1X2Vycm9yLnJlc2V0X2NvdW50ZXIpLAorCQkJCQkgIGk5MTVfcmVzZXRfY291
bnRlcigmaTkxNS0+Z3B1X2Vycm9yKSwKIAkJCQkJICBpOTE1LT5tbS5pbnRlcnJ1cHRpYmxlLAog
CQkJCQkgIE5VTEwsCiAJCQkJCSAgJmk5MTUtPnJwcy5zZW1hcGhvcmVzKTsKQEAgLTQyMDUsNyAr
NDIwNSw3IEBAIGk5MTVfZ2VtX3JpbmdfdGhyb3R0bGUoc3RydWN0IGRybV9kZXZpY2UgKmRldiwg
c3RydWN0IGRybV9maWxlICpmaWxlKQogCiAJCXRhcmdldCA9IHJlcXVlc3Q7CiAJfQotCXJlc2V0
X2NvdW50ZXIgPSBhdG9taWNfcmVhZCgmZGV2X3ByaXYtPmdwdV9lcnJvci5yZXNldF9jb3VudGVy
KTsKKwlyZXNldF9jb3VudGVyID0gaTkxNV9yZXNldF9jb3VudGVyKCZkZXZfcHJpdi0+Z3B1X2Vy
cm9yKTsKIAlpZiAodGFyZ2V0KQogCQlpOTE1X2dlbV9yZXF1ZXN0X3JlZmVyZW5jZSh0YXJnZXQp
OwogCXNwaW5fdW5sb2NrKCZmaWxlX3ByaXYtPm1tLmxvY2spOwpkaWZmIC0tZ2l0IGEvZHJpdmVy
cy9ncHUvZHJtL2k5MTUvaTkxNV9pcnEuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfaXJx
LmMKaW5kZXggMjQ3ZDk2MmFmYWJiLi5jMjI2OWMxMDNlMzAgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMv
Z3B1L2RybS9pOTE1L2k5MTVfaXJxLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9p
cnEuYwpAQCAtMjUwMSw3ICsyNTAxLDcgQEAgc3RhdGljIHZvaWQgaTkxNV9yZXNldF9hbmRfd2Fr
ZXVwKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJICogdGhlIHJlc2V0IGluLXByb2dyZXNzIGJp
dCBpcyBvbmx5IGV2ZXIgc2V0IGJ5IGNvZGUgb3V0c2lkZSBvZiB0aGlzCiAJICogd29yayB3ZSBk
b24ndCBuZWVkIHRvIHdvcnJ5IGFib3V0IGFueSBvdGhlciByYWNlcy4KIAkgKi8KLQlpZiAoaTkx
NV9yZXNldF9pbl9wcm9ncmVzcyhlcnJvcikgJiYgIWk5MTVfdGVybWluYWxseV93ZWRnZWQoZXJy
b3IpKSB7CisJaWYgKGk5MTVfcmVzZXRfaW5fcHJvZ3Jlc3Nfb3Jfd2VkZ2VkKGVycm9yKSAmJiAh
aTkxNV90ZXJtaW5hbGx5X3dlZGdlZChlcnJvcikpIHsKIAkJRFJNX0RFQlVHX0RSSVZFUigicmVz
ZXR0aW5nIGNoaXBcbiIpOwogCQlrb2JqZWN0X3VldmVudF9lbnYoJmRldi0+cHJpbWFyeS0+a2Rl
di0+a29iaiwgS09CSl9DSEFOR0UsCiAJCQkJICAgcmVzZXRfZXZlbnQpOwpkaWZmIC0tZ2l0IGEv
ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5
MTUvaW50ZWxfZGlzcGxheS5jCmluZGV4IDYwN2RjNDFiY2M2OC4uMGJiNzgwMDkzNzliIDEwMDY0
NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKKysrIGIvZHJpdmVy
cy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCkBAIC0zMjAwLDEwICszMjAwLDEyIEBAIHN0
YXRpYyBib29sIGludGVsX2NydGNfaGFzX3BlbmRpbmdfZmxpcChzdHJ1Y3QgZHJtX2NydGMgKmNy
dGMpCiAJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGNydGMtPmRldjsKIAlzdHJ1Y3QgZHJtX2k5
MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2YXRlOwogCXN0cnVjdCBpbnRlbF9j
cnRjICppbnRlbF9jcnRjID0gdG9faW50ZWxfY3J0YyhjcnRjKTsKKwl1bnNpZ25lZCByZXNldF9j
b3VudGVyOwogCWJvb2wgcGVuZGluZzsKIAotCWlmIChpOTE1X3Jlc2V0X2luX3Byb2dyZXNzKCZk
ZXZfcHJpdi0+Z3B1X2Vycm9yKSB8fAotCSAgICBpbnRlbF9jcnRjLT5yZXNldF9jb3VudGVyICE9
IGF0b21pY19yZWFkKCZkZXZfcHJpdi0+Z3B1X2Vycm9yLnJlc2V0X2NvdW50ZXIpKQorCXJlc2V0
X2NvdW50ZXIgPSBpOTE1X3Jlc2V0X2NvdW50ZXIoJmRldl9wcml2LT5ncHVfZXJyb3IpOworCWlm
IChpbnRlbF9jcnRjLT5yZXNldF9jb3VudGVyICE9IHJlc2V0X2NvdW50ZXIgfHwKKwkgICAgX19p
OTE1X3Jlc2V0X2luX3Byb2dyZXNzX29yX3dlZGdlZChyZXNldF9jb3VudGVyKSkKIAkJcmV0dXJu
IGZhbHNlOwogCiAJc3Bpbl9sb2NrX2lycSgmZGV2LT5ldmVudF9sb2NrKTsKQEAgLTEwOTA4LDkg
KzEwOTEwLDExIEBAIHN0YXRpYyBib29sIHBhZ2VfZmxpcF9maW5pc2hlZChzdHJ1Y3QgaW50ZWxf
Y3J0YyAqY3J0YykKIHsKIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gY3J0Yy0+YmFzZS5kZXY7
CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsK
Kwl1bnNpZ25lZCByZXNldF9jb3VudGVyOwogCi0JaWYgKGk5MTVfcmVzZXRfaW5fcHJvZ3Jlc3Mo
JmRldl9wcml2LT5ncHVfZXJyb3IpIHx8Ci0JICAgIGNydGMtPnJlc2V0X2NvdW50ZXIgIT0gYXRv
bWljX3JlYWQoJmRldl9wcml2LT5ncHVfZXJyb3IucmVzZXRfY291bnRlcikpCisJcmVzZXRfY291
bnRlciA9IGk5MTVfcmVzZXRfY291bnRlcigmZGV2X3ByaXYtPmdwdV9lcnJvcik7CisJaWYgKGNy
dGMtPnJlc2V0X2NvdW50ZXIgIT0gcmVzZXRfY291bnRlciB8fAorCSAgICBfX2k5MTVfcmVzZXRf
aW5fcHJvZ3Jlc3Nfb3Jfd2VkZ2VkKHJlc2V0X2NvdW50ZXIpKQogCQlyZXR1cm4gdHJ1ZTsKIAog
CS8qCkBAIC0xMTU3Myw3ICsxMTU3Nyw3IEBAIHN0YXRpYyBpbnQgaW50ZWxfY3J0Y19wYWdlX2Zs
aXAoc3RydWN0IGRybV9jcnRjICpjcnRjLAogCQlnb3RvIGNsZWFudXA7CiAKIAlhdG9taWNfaW5j
KCZpbnRlbF9jcnRjLT51bnBpbl93b3JrX2NvdW50KTsKLQlpbnRlbF9jcnRjLT5yZXNldF9jb3Vu
dGVyID0gYXRvbWljX3JlYWQoJmRldl9wcml2LT5ncHVfZXJyb3IucmVzZXRfY291bnRlcik7CisJ
aW50ZWxfY3J0Yy0+cmVzZXRfY291bnRlciA9IGk5MTVfcmVzZXRfY291bnRlcigmZGV2X3ByaXYt
PmdwdV9lcnJvcik7CiAKIAlpZiAoSU5URUxfSU5GTyhkZXYpLT5nZW4gPj0gNSB8fCBJU19HNFgo
ZGV2KSkKIAkJd29yay0+ZmxpcF9jb3VudCA9IEk5MTVfUkVBRChQSVBFX0ZMSVBDT1VOVF9HNFgo
cGlwZSkpICsgMTsKQEAgLTEzNDE5LDEwICsxMzQyMywxMCBAQCBzdGF0aWMgaW50IGludGVsX2F0
b21pY19wcmVwYXJlX2NvbW1pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCQlyZXR1cm4gcmV0
OwogCiAJcmV0ID0gZHJtX2F0b21pY19oZWxwZXJfcHJlcGFyZV9wbGFuZXMoZGV2LCBzdGF0ZSk7
Ci0JaWYgKCFyZXQgJiYgIWFzeW5jICYmICFpOTE1X3Jlc2V0X2luX3Byb2dyZXNzKCZkZXZfcHJp
di0+Z3B1X2Vycm9yKSkgeworCWlmICghcmV0ICYmICFhc3luYyAmJiAhaTkxNV9yZXNldF9pbl9w
cm9ncmVzc19vcl93ZWRnZWQoJmRldl9wcml2LT5ncHVfZXJyb3IpKSB7CiAJCXUzMiByZXNldF9j
b3VudGVyOwogCi0JCXJlc2V0X2NvdW50ZXIgPSBhdG9taWNfcmVhZCgmZGV2X3ByaXYtPmdwdV9l
cnJvci5yZXNldF9jb3VudGVyKTsKKwkJcmVzZXRfY291bnRlciA9IGk5MTVfcmVzZXRfY291bnRl
cigmZGV2X3ByaXYtPmdwdV9lcnJvcik7CiAJCW11dGV4X3VubG9jaygmZGV2LT5zdHJ1Y3RfbXV0
ZXgpOwogCiAJCWZvcl9lYWNoX3BsYW5lX2luX3N0YXRlKHN0YXRlLCBwbGFuZSwgcGxhbmVfc3Rh
dGUsIGkpIHsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jIGIv
ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKaW5kZXggZTZlNjljMmYyMzg2Li40ZDJi
NzVlODgwZmEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jCisr
KyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jCkBAIC0xMDU4LDcgKzEwNTgsNyBA
QCB2b2lkIGludGVsX2xvZ2ljYWxfcmluZ19zdG9wKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVu
Z2luZSkKIAkJcmV0dXJuOwogCiAJcmV0ID0gaW50ZWxfZW5naW5lX2lkbGUoZW5naW5lKTsKLQlp
ZiAocmV0ICYmICFpOTE1X3Jlc2V0X2luX3Byb2dyZXNzKCZ0b19pOTE1KGVuZ2luZS0+ZGV2KS0+
Z3B1X2Vycm9yKSkKKwlpZiAocmV0ICYmICFpOTE1X3Jlc2V0X2luX3Byb2dyZXNzX29yX3dlZGdl
ZCgmZGV2X3ByaXYtPmdwdV9lcnJvcikpCiAJCURSTV9FUlJPUigiZmFpbGVkIHRvIHF1aWVzY2Ug
JXMgd2hpbHN0IGNsZWFuaW5nIHVwOiAlZFxuIiwKIAkJCSAgZW5naW5lLT5uYW1lLCByZXQpOwog
CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmMgYi9k
cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmMKaW5kZXggNDFiNjA0ZTY5ZGI3
Li45YjljZWMzMzBmZjcgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Jp
bmdidWZmZXIuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmMK
QEAgLTIzNjMsOCArMjM2Myw4IEBAIGludCBpbnRlbF9lbmdpbmVfaWRsZShzdHJ1Y3QgaW50ZWxf
ZW5naW5lX2NzICplbmdpbmUpCiAKIAkvKiBNYWtlIHN1cmUgd2UgZG8gbm90IHRyaWdnZXIgYW55
IHJldGlyZXMgKi8KIAlyZXR1cm4gX19pOTE1X3dhaXRfcmVxdWVzdChyZXEsCi0JCQkJICAgYXRv
bWljX3JlYWQoJnRvX2k5MTUoZW5naW5lLT5kZXYpLT5ncHVfZXJyb3IucmVzZXRfY291bnRlciks
Ci0JCQkJICAgdG9faTkxNShlbmdpbmUtPmRldiktPm1tLmludGVycnVwdGlibGUsCisJCQkJICAg
aTkxNV9yZXNldF9jb3VudGVyKCZyZXEtPmk5MTUtPmdwdV9lcnJvciksCisJCQkJICAgcmVxLT5p
OTE1LT5tbS5pbnRlcnJ1cHRpYmxlLAogCQkJCSAgIE5VTEwsIE5VTEwpOwogfQogCkBAIC0zMTg5
LDcgKzMxODksOCBAQCBpbnRlbF9zdG9wX2VuZ2luZShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpl
bmdpbmUpCiAJCXJldHVybjsKIAogCXJldCA9IGludGVsX2VuZ2luZV9pZGxlKGVuZ2luZSk7Ci0J
aWYgKHJldCAmJiAhaTkxNV9yZXNldF9pbl9wcm9ncmVzcygmdG9faTkxNShlbmdpbmUtPmRldikt
PmdwdV9lcnJvcikpCisJaWYgKHJldCAmJgorCSAgICAhaTkxNV9yZXNldF9pbl9wcm9ncmVzc19v
cl93ZWRnZWQoJnRvX2k5MTUoZW5naW5lLT5kZXYpLT5ncHVfZXJyb3IpKQogCQlEUk1fRVJST1Io
ImZhaWxlZCB0byBxdWllc2NlICVzIHdoaWxzdCBjbGVhbmluZyB1cDogJWRcbiIsCiAJCQkgIGVu
Z2luZS0+bmFtZSwgcmV0KTsKIAotLSAKMi44LjAucmMzCgpfX19fX19fX19fX19fX19fX19fX19f
X19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdm
eEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFp
bG1hbi9saXN0aW5mby9pbnRlbC1nZngK