From mboxrd@z Thu Jan  1 00:00:00 1970
From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Subject: [PATCH 02/42] drm/i915: get rid of intel_crtc_disable
	and related code, v2
Date: Mon, 11 May 2015 16:24:38 +0200
Message-ID: <1431354318-11995-3-git-send-email-maarten.lankhorst@linux.intel.com>
References: <1431354318-11995-1-git-send-email-maarten.lankhorst@linux.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 mblankhorst.nl (mblankhorst.nl [141.105.120.124])
 by gabe.freedesktop.org (Postfix) with ESMTP id 3CB8C6E3F2
 for <intel-gfx@lists.freedesktop.org>; Mon, 11 May 2015 07:25:43 -0700 (PDT)
In-Reply-To: <1431354318-11995-1-git-send-email-maarten.lankhorst@linux.intel.com>
List-Unsubscribe: <http://lists.freedesktop.org/mailman/options/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <http://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: <http://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: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
List-Id: intel-gfx@lists.freedesktop.org

Tm93IHRoYXQgdGhlIGRwbGwgdXBkYXRlcyBhcmUgKG1vc3RseSkgYXRvbWljLCB0aGUgLm9mZigp
IGNvZGUgaXMgbm8gbG9uZ2VyIHVzZWQsCmFuZCB0aGVyZSBhcmUgbm8gbW9yZSBjYWxsZXJzIGZv
ciBpbnRlbF9wdXRfc2hhcmVkX2RwbGwuIE1vdmUgYWxsIHRoZSB1cGRhdGVzCmRvbmUgaW4gaW50
ZWxfY3J0Y19kaXNhYmxlIHRvIGludGVsX21vZGVzZXRfdXBkYXRlX3N0YXRlLCBvbmUgbGVzcyBz
cGVjaWFsIGNhc2UKdG8gd29ycnkgYWJvdXQuCgpDaGFuZ2VzIHNpbmNlIHYxOgotIE1vdmUgZHJt
X2F0b21pY19oZWxwZXJfc3dhcF9zdGF0ZSB1cC4KClNpZ25lZC1vZmYtYnk6IE1hYXJ0ZW4gTGFu
a2hvcnN0IDxtYWFydGVuLmxhbmtob3JzdEBsaW51eC5pbnRlbC5jb20+Ci0tLQogZHJpdmVycy9n
cHUvZHJtL2k5MTUvaTkxNV9kcnYuaCAgICAgIHwgICAxIC0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1
L2ludGVsX2Rpc3BsYXkuYyB8IDEwNiArKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t
LQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmggICAgIHwgICAxIC0KIDMgZmlsZXMg
Y2hhbmdlZCwgMTkgaW5zZXJ0aW9ucygrKSwgODkgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEv
ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5
MTVfZHJ2LmgKaW5kZXggNmIzMTQyYTk5MTcxLi5hNmQzYWI5NGVjMTUgMTAwNjQ0Ci0tLSBhL2Ry
aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv
aTkxNV9kcnYuaApAQCAtNTc0LDcgKzU3NCw2IEBAIHN0cnVjdCBkcm1faTkxNV9kaXNwbGF5X2Z1
bmNzIHsKIAkJCQkgIHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0YXRlKTsKIAl2b2lk
ICgqY3J0Y19lbmFibGUpKHN0cnVjdCBkcm1fY3J0YyAqY3J0Yyk7CiAJdm9pZCAoKmNydGNfZGlz
YWJsZSkoc3RydWN0IGRybV9jcnRjICpjcnRjKTsKLQl2b2lkICgqb2ZmKShzdHJ1Y3QgZHJtX2Ny
dGMgKmNydGMpOwogCXZvaWQgKCphdWRpb19jb2RlY19lbmFibGUpKHN0cnVjdCBkcm1fY29ubmVj
dG9yICpjb25uZWN0b3IsCiAJCQkJICAgc3RydWN0IGludGVsX2VuY29kZXIgKmVuY29kZXIsCiAJ
CQkJICAgc3RydWN0IGRybV9kaXNwbGF5X21vZGUgKm1vZGUpOwpkaWZmIC0tZ2l0IGEvZHJpdmVy
cy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50
ZWxfZGlzcGxheS5jCmluZGV4IGM1NTQzZjBiY2RhOS4uYWY5NmQ2ODZhYWUyIDEwMDY0NAotLS0g
YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKKysrIGIvZHJpdmVycy9ncHUv
ZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCkBAIC00MjI4LDI3ICs0MjI4LDYgQEAgc3RhdGljIHZv
aWQgbHB0X3BjaF9lbmFibGUoc3RydWN0IGRybV9jcnRjICpjcnRjKQogCWxwdF9lbmFibGVfcGNo
X3RyYW5zY29kZXIoZGV2X3ByaXYsIGNwdV90cmFuc2NvZGVyKTsKIH0KIAotdm9pZCBpbnRlbF9w
dXRfc2hhcmVkX2RwbGwoc3RydWN0IGludGVsX2NydGMgKmNydGMpCi17Ci0Jc3RydWN0IGludGVs
X3NoYXJlZF9kcGxsICpwbGwgPSBpbnRlbF9jcnRjX3RvX3NoYXJlZF9kcGxsKGNydGMpOwotCi0J
aWYgKHBsbCA9PSBOVUxMKQotCQlyZXR1cm47Ci0KLQlpZiAoIShwbGwtPmNvbmZpZy5jcnRjX21h
c2sgJiAoMSA8PCBjcnRjLT5waXBlKSkpIHsKLQkJV0FSTigxLCAiYmFkICVzIGNydGMgbWFza1xu
IiwgcGxsLT5uYW1lKTsKLQkJcmV0dXJuOwotCX0KLQotCXBsbC0+Y29uZmlnLmNydGNfbWFzayAm
PSB+KDEgPDwgY3J0Yy0+cGlwZSk7Ci0JaWYgKHBsbC0+Y29uZmlnLmNydGNfbWFzayA9PSAwKSB7
Ci0JCVdBUk5fT04ocGxsLT5vbik7Ci0JCVdBUk5fT04ocGxsLT5hY3RpdmUpOwotCX0KLQotCWNy
dGMtPmNvbmZpZy0+c2hhcmVkX2RwbGwgPSBEUExMX0lEX1BSSVZBVEU7Ci19Ci0KIHN0cnVjdCBp
bnRlbF9zaGFyZWRfZHBsbCAqaW50ZWxfZ2V0X3NoYXJlZF9kcGxsKHN0cnVjdCBpbnRlbF9jcnRj
ICpjcnRjLAogCQkJCQkJc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNfc3RhdGUpCiB7CkBA
IC01MjI0LDEzICs1MjAzLDYgQEAgc3RhdGljIHZvaWQgaGFzd2VsbF9jcnRjX2Rpc2FibGUoc3Ry
dWN0IGRybV9jcnRjICpjcnRjKQogCQlpbnRlbF9kaXNhYmxlX3NoYXJlZF9kcGxsKGludGVsX2Ny
dGMpOwogfQogCi1zdGF0aWMgdm9pZCBpcm9ubGFrZV9jcnRjX29mZihzdHJ1Y3QgZHJtX2NydGMg
KmNydGMpCi17Ci0Jc3RydWN0IGludGVsX2NydGMgKmludGVsX2NydGMgPSB0b19pbnRlbF9jcnRj
KGNydGMpOwotCWludGVsX3B1dF9zaGFyZWRfZHBsbChpbnRlbF9jcnRjKTsKLX0KLQotCiBzdGF0
aWMgdm9pZCBpOXh4X3BmaXRfZW5hYmxlKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjKQogewogCXN0
cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBjcnRjLT5iYXNlLmRldjsKQEAgLTYwNjIsMTAgKzYwMzQs
NiBAQCBzdGF0aWMgdm9pZCBpOXh4X2NydGNfZGlzYWJsZShzdHJ1Y3QgZHJtX2NydGMgKmNydGMp
CiAJbXV0ZXhfdW5sb2NrKCZkZXYtPnN0cnVjdF9tdXRleCk7CiB9CiAKLXN0YXRpYyB2b2lkIGk5
eHhfY3J0Y19vZmYoc3RydWN0IGRybV9jcnRjICpjcnRjKQotewotfQotCiAvKiBNYXN0ZXIgZnVu
Y3Rpb24gdG8gZW5hYmxlL2Rpc2FibGUgQ1JUQyBhbmQgY29ycmVzcG9uZGluZyBwb3dlciB3ZWxs
cyAqLwogdm9pZCBpbnRlbF9jcnRjX2NvbnRyb2woc3RydWN0IGRybV9jcnRjICpjcnRjLCBib29s
IGVuYWJsZSkKIHsKQEAgLTYxMTUsMzQgKzYwODMsNiBAQCB2b2lkIGludGVsX2NydGNfdXBkYXRl
X2RwbXMoc3RydWN0IGRybV9jcnRjICpjcnRjKQogCWNydGMtPnN0YXRlLT5hY3RpdmUgPSBlbmFi
bGU7CiB9CiAKLXN0YXRpYyB2b2lkIGludGVsX2NydGNfZGlzYWJsZShzdHJ1Y3QgZHJtX2NydGMg
KmNydGMpCi17Ci0Jc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGNydGMtPmRldjsKLQlzdHJ1Y3Qg
ZHJtX2Nvbm5lY3RvciAqY29ubmVjdG9yOwotCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZf
cHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7Ci0KLQkvKiBjcnRjIHNob3VsZCBzdGlsbCBiZSBlbmFi
bGVkIHdoZW4gd2UgZGlzYWJsZSBpdC4gKi8KLQlXQVJOX09OKCFjcnRjLT5zdGF0ZS0+ZW5hYmxl
KTsKLQotCWludGVsX2NydGNfZGlzYWJsZV9wbGFuZXMoY3J0Yyk7Ci0JZGV2X3ByaXYtPmRpc3Bs
YXkuY3J0Y19kaXNhYmxlKGNydGMpOwotCWRldl9wcml2LT5kaXNwbGF5Lm9mZihjcnRjKTsKLQot
CWRybV9wbGFuZV9oZWxwZXJfZGlzYWJsZShjcnRjLT5wcmltYXJ5KTsKLQotCS8qIFVwZGF0ZSBj
b21wdXRlZCBzdGF0ZS4gKi8KLQlsaXN0X2Zvcl9lYWNoX2VudHJ5KGNvbm5lY3RvciwgJmRldi0+
bW9kZV9jb25maWcuY29ubmVjdG9yX2xpc3QsIGhlYWQpIHsKLQkJaWYgKCFjb25uZWN0b3ItPmVu
Y29kZXIgfHwgIWNvbm5lY3Rvci0+ZW5jb2Rlci0+Y3J0YykKLQkJCWNvbnRpbnVlOwotCi0JCWlm
IChjb25uZWN0b3ItPmVuY29kZXItPmNydGMgIT0gY3J0YykKLQkJCWNvbnRpbnVlOwotCi0JCWNv
bm5lY3Rvci0+ZHBtcyA9IERSTV9NT0RFX0RQTVNfT0ZGOwotCQl0b19pbnRlbF9lbmNvZGVyKGNv
bm5lY3Rvci0+ZW5jb2RlciktPmNvbm5lY3RvcnNfYWN0aXZlID0gZmFsc2U7Ci0JfQotfQotCiB2
b2lkIGludGVsX2VuY29kZXJfZGVzdHJveShzdHJ1Y3QgZHJtX2VuY29kZXIgKmVuY29kZXIpCiB7
CiAJc3RydWN0IGludGVsX2VuY29kZXIgKmludGVsX2VuY29kZXIgPSB0b19pbnRlbF9lbmNvZGVy
KGVuY29kZXIpOwpAQCAtMTE2MTQsMjYgKzExNTU0LDIyIEBAIGludGVsX21vZGVzZXRfdXBkYXRl
X3N0YXRlKHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSkKIAlzdHJ1Y3QgZHJtX2NydGMg
KmNydGM7CiAJc3RydWN0IGRybV9jcnRjX3N0YXRlICpjcnRjX3N0YXRlOwogCXN0cnVjdCBkcm1f
Y29ubmVjdG9yICpjb25uZWN0b3I7Ci0JaW50IGk7CiAKIAlpbnRlbF9zaGFyZWRfZHBsbF9jb21t
aXQoZGV2X3ByaXYpOworCWRybV9hdG9taWNfaGVscGVyX3N3YXBfc3RhdGUoc3RhdGUtPmRldiwg
c3RhdGUpOwogCiAJZm9yX2VhY2hfaW50ZWxfZW5jb2RlcihkZXYsIGludGVsX2VuY29kZXIpIHsK
IAkJaWYgKCFpbnRlbF9lbmNvZGVyLT5iYXNlLmNydGMpCiAJCQljb250aW51ZTsKIAotCQlmb3Jf
ZWFjaF9jcnRjX2luX3N0YXRlKHN0YXRlLCBjcnRjLCBjcnRjX3N0YXRlLCBpKQotCQkJaWYgKGNy
dGMgPT0gaW50ZWxfZW5jb2Rlci0+YmFzZS5jcnRjKQotCQkJCWJyZWFrOwotCi0JCWlmIChjcnRj
ICE9IGludGVsX2VuY29kZXItPmJhc2UuY3J0YykKKwkJY3J0YyA9IGludGVsX2VuY29kZXItPmJh
c2UuY3J0YzsKKwkJY3J0Y19zdGF0ZSA9IHN0YXRlLT5jcnRjX3N0YXRlc1tkcm1fY3J0Y19pbmRl
eChjcnRjKV07CisJCWlmICghY3J0Y19zdGF0ZSB8fCAhbmVlZHNfbW9kZXNldChjcnRjLT5zdGF0
ZSkpCiAJCQljb250aW51ZTsKIAotCQlpZiAoY3J0Y19zdGF0ZS0+ZW5hYmxlICYmIG5lZWRzX21v
ZGVzZXQoY3J0Y19zdGF0ZSkpCi0JCQlpbnRlbF9lbmNvZGVyLT5jb25uZWN0b3JzX2FjdGl2ZSA9
IGZhbHNlOworCQlpbnRlbF9lbmNvZGVyLT5jb25uZWN0b3JzX2FjdGl2ZSA9IGZhbHNlOwogCX0K
IAotCWRybV9hdG9taWNfaGVscGVyX3N3YXBfc3RhdGUoc3RhdGUtPmRldiwgc3RhdGUpOwogCWlu
dGVsX21vZGVzZXRfZml4dXBfc3RhdGUoc3RhdGUpOwogCiAJLyogRG91YmxlIGNoZWNrIHN0YXRl
LiAqLwpAQCAtMTE2NDUsMTQgKzExNTgxLDEyIEBAIGludGVsX21vZGVzZXRfdXBkYXRlX3N0YXRl
KHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSkKIAkJaWYgKCFjb25uZWN0b3ItPmVuY29k
ZXIgfHwgIWNvbm5lY3Rvci0+ZW5jb2Rlci0+Y3J0YykKIAkJCWNvbnRpbnVlOwogCi0JCWZvcl9l
YWNoX2NydGNfaW5fc3RhdGUoc3RhdGUsIGNydGMsIGNydGNfc3RhdGUsIGkpCi0JCQlpZiAoY3J0
YyA9PSBjb25uZWN0b3ItPmVuY29kZXItPmNydGMpCi0JCQkJYnJlYWs7Ci0KLQkJaWYgKGNydGMg
IT0gY29ubmVjdG9yLT5lbmNvZGVyLT5jcnRjKQorCQljcnRjID0gY29ubmVjdG9yLT5lbmNvZGVy
LT5jcnRjOworCQljcnRjX3N0YXRlID0gc3RhdGUtPmNydGNfc3RhdGVzW2RybV9jcnRjX2luZGV4
KGNydGMpXTsKKwkJaWYgKCFjcnRjX3N0YXRlIHx8ICFuZWVkc19tb2Rlc2V0KGNydGMtPnN0YXRl
KSkKIAkJCWNvbnRpbnVlOwogCi0JCWlmIChjcnRjLT5zdGF0ZS0+ZW5hYmxlICYmIG5lZWRzX21v
ZGVzZXQoY3J0Yy0+c3RhdGUpKSB7CisJCWlmIChjcnRjLT5zdGF0ZS0+ZW5hYmxlKSB7CiAJCQlz
dHJ1Y3QgZHJtX3Byb3BlcnR5ICpkcG1zX3Byb3BlcnR5ID0KIAkJCQlkZXYtPm1vZGVfY29uZmln
LmRwbXNfcHJvcGVydHk7CiAKQEAgLTExNjYzLDcgKzExNTk3LDggQEAgaW50ZWxfbW9kZXNldF91
cGRhdGVfc3RhdGUoc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlKQogCiAJCQlpbnRlbF9l
bmNvZGVyID0gdG9faW50ZWxfZW5jb2Rlcihjb25uZWN0b3ItPmVuY29kZXIpOwogCQkJaW50ZWxf
ZW5jb2Rlci0+Y29ubmVjdG9yc19hY3RpdmUgPSB0cnVlOwotCQl9CisJCX0gZWxzZQorCQkJY29u
bmVjdG9yLT5kcG1zID0gRFJNX01PREVfRFBNU19PRkY7CiAJfQogCiB9CkBAIC0xMjIxNCw2ICsx
MjE0OSwxMCBAQCBpbnRlbF9tb2Rlc2V0X2NvbXB1dGVfY29uZmlnKHN0cnVjdCBkcm1fY3J0YyAq
Y3J0YywKIAlpZiAoSVNfRVJSKHBpcGVfY29uZmlnKSkKIAkJcmV0dXJuIHBpcGVfY29uZmlnOwog
CisJaWYgKCFwaXBlX2NvbmZpZy0+YmFzZS5lbmFibGUgJiYKKwkgICAgV0FSTl9PTihwaXBlX2Nv
bmZpZy0+YmFzZS5hY3RpdmUpKQorCQlwaXBlX2NvbmZpZy0+YmFzZS5hY3RpdmUgPSBmYWxzZTsK
KwogCWlmICghcGlwZV9jb25maWctPmJhc2UuZW5hYmxlKQogCQlyZXR1cm4gcGlwZV9jb25maWc7
CiAKQEAgLTEyMzQxLDEyICsxMjI4MCwxMCBAQCBzdGF0aWMgaW50IF9faW50ZWxfc2V0X21vZGUo
c3RydWN0IGRybV9jcnRjICptb2Rlc2V0X2NydGMsCiAJCWlmICghbmVlZHNfbW9kZXNldChjcnRj
X3N0YXRlKSkKIAkJCWNvbnRpbnVlOwogCi0JCWlmICghY3J0Y19zdGF0ZS0+ZW5hYmxlKSB7Ci0J
CQlpbnRlbF9jcnRjX2Rpc2FibGUoY3J0Yyk7Ci0JCX0gZWxzZSBpZiAoY3J0Yy0+c3RhdGUtPmVu
YWJsZSkgewotCQkJaW50ZWxfY3J0Y19kaXNhYmxlX3BsYW5lcyhjcnRjKTsKLQkJCWRldl9wcml2
LT5kaXNwbGF5LmNydGNfZGlzYWJsZShjcnRjKTsKLQkJfQorCQlpbnRlbF9jcnRjX2Rpc2FibGVf
cGxhbmVzKGNydGMpOworCQlkZXZfcHJpdi0+ZGlzcGxheS5jcnRjX2Rpc2FibGUoY3J0Yyk7CisJ
CWlmICghY3J0Y19zdGF0ZS0+ZW5hYmxlKQorCQkJZHJtX3BsYW5lX2hlbHBlcl9kaXNhYmxlKGNy
dGMtPnByaW1hcnkpOwogCX0KIAogCS8qIGNydGMtPm1vZGUgaXMgYWxyZWFkeSB1c2VkIGJ5IHRo
ZSAtPm1vZGVfc2V0IGNhbGxiYWNrcywgaGVuY2Ugd2UgbmVlZApAQCAtMTQwNjQsNyArMTQwMDEs
NiBAQCBzdGF0aWMgdm9pZCBpbnRlbF9pbml0X2Rpc3BsYXkoc3RydWN0IGRybV9kZXZpY2UgKmRl
dikKIAkJCWhhc3dlbGxfY3J0Y19jb21wdXRlX2Nsb2NrOwogCQlkZXZfcHJpdi0+ZGlzcGxheS5j
cnRjX2VuYWJsZSA9IGhhc3dlbGxfY3J0Y19lbmFibGU7CiAJCWRldl9wcml2LT5kaXNwbGF5LmNy
dGNfZGlzYWJsZSA9IGhhc3dlbGxfY3J0Y19kaXNhYmxlOwotCQlkZXZfcHJpdi0+ZGlzcGxheS5v
ZmYgPSBpcm9ubGFrZV9jcnRjX29mZjsKIAkJZGV2X3ByaXYtPmRpc3BsYXkudXBkYXRlX3ByaW1h
cnlfcGxhbmUgPQogCQkJc2t5bGFrZV91cGRhdGVfcHJpbWFyeV9wbGFuZTsKIAl9IGVsc2UgaWYg
KEhBU19EREkoZGV2KSkgewpAQCAtMTQwNzUsNyArMTQwMTEsNiBAQCBzdGF0aWMgdm9pZCBpbnRl
bF9pbml0X2Rpc3BsYXkoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAkJCWhhc3dlbGxfY3J0Y19j
b21wdXRlX2Nsb2NrOwogCQlkZXZfcHJpdi0+ZGlzcGxheS5jcnRjX2VuYWJsZSA9IGhhc3dlbGxf
Y3J0Y19lbmFibGU7CiAJCWRldl9wcml2LT5kaXNwbGF5LmNydGNfZGlzYWJsZSA9IGhhc3dlbGxf
Y3J0Y19kaXNhYmxlOwotCQlkZXZfcHJpdi0+ZGlzcGxheS5vZmYgPSBpcm9ubGFrZV9jcnRjX29m
ZjsKIAkJZGV2X3ByaXYtPmRpc3BsYXkudXBkYXRlX3ByaW1hcnlfcGxhbmUgPQogCQkJaXJvbmxh
a2VfdXBkYXRlX3ByaW1hcnlfcGxhbmU7CiAJfSBlbHNlIGlmIChIQVNfUENIX1NQTElUKGRldikp
IHsKQEAgLTE0MDg2LDcgKzE0MDIxLDYgQEAgc3RhdGljIHZvaWQgaW50ZWxfaW5pdF9kaXNwbGF5
KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJCQlpcm9ubGFrZV9jcnRjX2NvbXB1dGVfY2xvY2s7
CiAJCWRldl9wcml2LT5kaXNwbGF5LmNydGNfZW5hYmxlID0gaXJvbmxha2VfY3J0Y19lbmFibGU7
CiAJCWRldl9wcml2LT5kaXNwbGF5LmNydGNfZGlzYWJsZSA9IGlyb25sYWtlX2NydGNfZGlzYWJs
ZTsKLQkJZGV2X3ByaXYtPmRpc3BsYXkub2ZmID0gaXJvbmxha2VfY3J0Y19vZmY7CiAJCWRldl9w
cml2LT5kaXNwbGF5LnVwZGF0ZV9wcmltYXJ5X3BsYW5lID0KIAkJCWlyb25sYWtlX3VwZGF0ZV9w
cmltYXJ5X3BsYW5lOwogCX0gZWxzZSBpZiAoSVNfVkFMTEVZVklFVyhkZXYpKSB7CkBAIC0xNDA5
Niw3ICsxNDAzMCw2IEBAIHN0YXRpYyB2b2lkIGludGVsX2luaXRfZGlzcGxheShzdHJ1Y3QgZHJt
X2RldmljZSAqZGV2KQogCQlkZXZfcHJpdi0+ZGlzcGxheS5jcnRjX2NvbXB1dGVfY2xvY2sgPSBp
OXh4X2NydGNfY29tcHV0ZV9jbG9jazsKIAkJZGV2X3ByaXYtPmRpc3BsYXkuY3J0Y19lbmFibGUg
PSB2YWxsZXl2aWV3X2NydGNfZW5hYmxlOwogCQlkZXZfcHJpdi0+ZGlzcGxheS5jcnRjX2Rpc2Fi
bGUgPSBpOXh4X2NydGNfZGlzYWJsZTsKLQkJZGV2X3ByaXYtPmRpc3BsYXkub2ZmID0gaTl4eF9j
cnRjX29mZjsKIAkJZGV2X3ByaXYtPmRpc3BsYXkudXBkYXRlX3ByaW1hcnlfcGxhbmUgPQogCQkJ
aTl4eF91cGRhdGVfcHJpbWFyeV9wbGFuZTsKIAl9IGVsc2UgewpAQCAtMTQxMDYsNyArMTQwMzks
NiBAQCBzdGF0aWMgdm9pZCBpbnRlbF9pbml0X2Rpc3BsYXkoc3RydWN0IGRybV9kZXZpY2UgKmRl
dikKIAkJZGV2X3ByaXYtPmRpc3BsYXkuY3J0Y19jb21wdXRlX2Nsb2NrID0gaTl4eF9jcnRjX2Nv
bXB1dGVfY2xvY2s7CiAJCWRldl9wcml2LT5kaXNwbGF5LmNydGNfZW5hYmxlID0gaTl4eF9jcnRj
X2VuYWJsZTsKIAkJZGV2X3ByaXYtPmRpc3BsYXkuY3J0Y19kaXNhYmxlID0gaTl4eF9jcnRjX2Rp
c2FibGU7Ci0JCWRldl9wcml2LT5kaXNwbGF5Lm9mZiA9IGk5eHhfY3J0Y19vZmY7CiAJCWRldl9w
cml2LT5kaXNwbGF5LnVwZGF0ZV9wcmltYXJ5X3BsYW5lID0KIAkJCWk5eHhfdXBkYXRlX3ByaW1h
cnlfcGxhbmU7CiAJfQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2
LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaAppbmRleCAyOTI2MjIyOGYyNjQu
LjRjNjkwNDAzOTQyYyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2
LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKQEAgLTEwODIsNyArMTA4
Miw2IEBAIHZvaWQgYXNzZXJ0X3NoYXJlZF9kcGxsKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpk
ZXZfcHJpdiwKICNkZWZpbmUgYXNzZXJ0X3NoYXJlZF9kcGxsX2Rpc2FibGVkKGQsIHApIGFzc2Vy
dF9zaGFyZWRfZHBsbChkLCBwLCBmYWxzZSkKIHN0cnVjdCBpbnRlbF9zaGFyZWRfZHBsbCAqaW50
ZWxfZ2V0X3NoYXJlZF9kcGxsKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjLAogCQkJCQkJc3RydWN0
IGludGVsX2NydGNfc3RhdGUgKnN0YXRlKTsKLXZvaWQgaW50ZWxfcHV0X3NoYXJlZF9kcGxsKHN0
cnVjdCBpbnRlbF9jcnRjICpjcnRjKTsKIAogdm9pZCB2bHZfZm9yY2VfcGxsX29uKHN0cnVjdCBk
cm1fZGV2aWNlICpkZXYsIGVudW0gcGlwZSBwaXBlLAogCQkgICAgICBjb25zdCBzdHJ1Y3QgZHBs
bCAqZHBsbCk7Ci0tIAoyLjEuMAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f
X19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRl
c2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9p
bnRlbC1nZngK