From mboxrd@z Thu Jan  1 00:00:00 1970
From: maarten.lankhorst@linux.intel.com
Subject: [PATCH RFC 1/5] drm/i915: Get rid of intel_crtc_disable
	and related code.
Date: Wed, 22 Apr 2015 13:24:18 +0200
Message-ID: <1429701862-22970-2-git-send-email-maarten.lankhorst@linux.intel.com>
References: <1429701862-22970-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 5804E6E0C3
 for <intel-gfx@lists.freedesktop.org>; Wed, 22 Apr 2015 04:24:38 -0700 (PDT)
In-Reply-To: <1429701862-22970-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

RnJvbTogTWFhcnRlbiBMYW5raG9yc3QgPG1hYXJ0ZW4ubGFua2hvcnN0QGxpbnV4LmludGVsLmNv
bT4KCk5vdyB0aGF0IHRoZSBkcGxsIHVwZGF0ZXMgYXJlIChtb3N0bHkpIGF0b21pYywgdGhlIC5v
ZmYoKSBjb2RlIGlzIG5vIGxvbmdlciB1c2VkLAphbmQgdGhlcmUgYXJlIG5vIG1vcmUgY2FsbGVy
cyBmb3IgaW50ZWxfcHV0X3NoYXJlZF9kcGxsLiBNb3ZlIGFsbCB0aGUgdXBkYXRlcwpkb25lIGlu
IGludGVsX2NydGNfZGlzYWJsZSB0byBpbnRlbF9tb2Rlc2V0X3VwZGF0ZV9zdGF0ZSwgb25lIGxl
c3Mgc3BlY2lhbCBjYXNlCnRvIHdvcnJ5IGFib3V0LgoKU2lnbmVkLW9mZi1ieTogTWFhcnRlbiBM
YW5raG9yc3QgPG1hYXJ0ZW4ubGFua2hvcnN0QGxpbnV4LmludGVsLmNvbT4KLS0tCiBkcml2ZXJz
L2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oICAgICAgfCAgIDEgLQogZHJpdmVycy9ncHUvZHJtL2k5
MTUvaW50ZWxfZGlzcGxheS5jIHwgMTAwICsrKysrLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t
LS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaCAgICAgfCAgIDEgLQogMyBmaWxl
cyBjaGFuZ2VkLCAxNCBpbnNlcnRpb25zKCspLCA4OCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQg
YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv
aTkxNV9kcnYuaAppbmRleCA2MWI3NTZiZGJhYWQuLjllNjI5MjZlNzFmMCAxMDA2NDQKLS0tIGEv
ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkx
NS9pOTE1X2Rydi5oCkBAIC01NzIsNyArNTcyLDYgQEAgc3RydWN0IGRybV9pOTE1X2Rpc3BsYXlf
ZnVuY3MgewogCQkJCSAgc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNfc3RhdGUpOwogCXZv
aWQgKCpjcnRjX2VuYWJsZSkoc3RydWN0IGRybV9jcnRjICpjcnRjKTsKIAl2b2lkICgqY3J0Y19k
aXNhYmxlKShzdHJ1Y3QgZHJtX2NydGMgKmNydGMpOwotCXZvaWQgKCpvZmYpKHN0cnVjdCBkcm1f
Y3J0YyAqY3J0Yyk7CiAJdm9pZCAoKmF1ZGlvX2NvZGVjX2VuYWJsZSkoc3RydWN0IGRybV9jb25u
ZWN0b3IgKmNvbm5lY3RvciwKIAkJCQkgICBzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqZW5jb2RlciwK
IAkJCQkgICBzdHJ1Y3QgZHJtX2Rpc3BsYXlfbW9kZSAqbW9kZSk7CmRpZmYgLS1naXQgYS9kcml2
ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p
bnRlbF9kaXNwbGF5LmMKaW5kZXggMzVmZGUyMzljMjAwLi45MmQ1NGRkMzBkN2UgMTAwNjQ0Ci0t
LSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYworKysgYi9kcml2ZXJzL2dw
dS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKQEAgLTQxMjMsMjcgKzQxMjMsNiBAQCBzdGF0aWMg
dm9pZCBscHRfcGNoX2VuYWJsZShzdHJ1Y3QgZHJtX2NydGMgKmNydGMpCiAJbHB0X2VuYWJsZV9w
Y2hfdHJhbnNjb2RlcihkZXZfcHJpdiwgY3B1X3RyYW5zY29kZXIpOwogfQogCi12b2lkIGludGVs
X3B1dF9zaGFyZWRfZHBsbChzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YykKLXsKLQlzdHJ1Y3QgaW50
ZWxfc2hhcmVkX2RwbGwgKnBsbCA9IGludGVsX2NydGNfdG9fc2hhcmVkX2RwbGwoY3J0Yyk7Ci0K
LQlpZiAocGxsID09IE5VTEwpCi0JCXJldHVybjsKLQotCWlmICghKHBsbC0+Y29uZmlnLmNydGNf
bWFzayAmICgxIDw8IGNydGMtPnBpcGUpKSkgewotCQlXQVJOKDEsICJiYWQgJXMgY3J0YyBtYXNr
XG4iLCBwbGwtPm5hbWUpOwotCQlyZXR1cm47Ci0JfQotCi0JcGxsLT5jb25maWcuY3J0Y19tYXNr
ICY9IH4oMSA8PCBjcnRjLT5waXBlKTsKLQlpZiAocGxsLT5jb25maWcuY3J0Y19tYXNrID09IDAp
IHsKLQkJV0FSTl9PTihwbGwtPm9uKTsKLQkJV0FSTl9PTihwbGwtPmFjdGl2ZSk7Ci0JfQotCi0J
Y3J0Yy0+Y29uZmlnLT5zaGFyZWRfZHBsbCA9IERQTExfSURfUFJJVkFURTsKLX0KLQogc3RydWN0
IGludGVsX3NoYXJlZF9kcGxsICppbnRlbF9nZXRfc2hhcmVkX2RwbGwoc3RydWN0IGludGVsX2Ny
dGMgKmNydGMsCiAJCQkJCQlzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSkKIHsK
QEAgLTUwODksMTMgKzUwNjgsNiBAQCBzdGF0aWMgdm9pZCBoYXN3ZWxsX2NydGNfZGlzYWJsZShz
dHJ1Y3QgZHJtX2NydGMgKmNydGMpCiAJCWludGVsX2Rpc2FibGVfc2hhcmVkX2RwbGwoaW50ZWxf
Y3J0Yyk7CiB9CiAKLXN0YXRpYyB2b2lkIGlyb25sYWtlX2NydGNfb2ZmKHN0cnVjdCBkcm1fY3J0
YyAqY3J0YykKLXsKLQlzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0YyA9IHRvX2ludGVsX2Ny
dGMoY3J0Yyk7Ci0JaW50ZWxfcHV0X3NoYXJlZF9kcGxsKGludGVsX2NydGMpOwotfQotCi0KIHN0
YXRpYyB2b2lkIGk5eHhfcGZpdF9lbmFibGUoc3RydWN0IGludGVsX2NydGMgKmNydGMpCiB7CiAJ
c3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGNydGMtPmJhc2UuZGV2OwpAQCAtNTcyMiwxMCArNTY5
NCw2IEBAIHN0YXRpYyB2b2lkIGk5eHhfY3J0Y19kaXNhYmxlKHN0cnVjdCBkcm1fY3J0YyAqY3J0
YykKIAltdXRleF91bmxvY2soJmRldi0+c3RydWN0X211dGV4KTsKIH0KIAotc3RhdGljIHZvaWQg
aTl4eF9jcnRjX29mZihzdHJ1Y3QgZHJtX2NydGMgKmNydGMpCi17Ci19Ci0KIC8qIE1hc3RlciBm
dW5jdGlvbiB0byBlbmFibGUvZGlzYWJsZSBDUlRDIGFuZCBjb3JyZXNwb25kaW5nIHBvd2VyIHdl
bGxzICovCiB2b2lkIGludGVsX2NydGNfY29udHJvbChzdHJ1Y3QgZHJtX2NydGMgKmNydGMsIGJv
b2wgZW5hYmxlKQogewpAQCAtNTc3NSwzNCArNTc0Myw2IEBAIHZvaWQgaW50ZWxfY3J0Y191cGRh
dGVfZHBtcyhzdHJ1Y3QgZHJtX2NydGMgKmNydGMpCiAJY3J0Yy0+c3RhdGUtPmFjdGl2ZSA9IGVu
YWJsZTsKIH0KIAotc3RhdGljIHZvaWQgaW50ZWxfY3J0Y19kaXNhYmxlKHN0cnVjdCBkcm1fY3J0
YyAqY3J0YykKLXsKLQlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gY3J0Yy0+ZGV2OwotCXN0cnVj
dCBkcm1fY29ubmVjdG9yICpjb25uZWN0b3I7Ci0Jc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRl
dl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKLQotCS8qIGNydGMgc2hvdWxkIHN0aWxsIGJlIGVu
YWJsZWQgd2hlbiB3ZSBkaXNhYmxlIGl0LiAqLwotCVdBUk5fT04oIWNydGMtPnN0YXRlLT5lbmFi
bGUpOwotCi0JaW50ZWxfY3J0Y19kaXNhYmxlX3BsYW5lcyhjcnRjKTsKLQlkZXZfcHJpdi0+ZGlz
cGxheS5jcnRjX2Rpc2FibGUoY3J0Yyk7Ci0JZGV2X3ByaXYtPmRpc3BsYXkub2ZmKGNydGMpOwot
Ci0JZHJtX3BsYW5lX2hlbHBlcl9kaXNhYmxlKGNydGMtPnByaW1hcnkpOwotCi0JLyogVXBkYXRl
IGNvbXB1dGVkIHN0YXRlLiAqLwotCWxpc3RfZm9yX2VhY2hfZW50cnkoY29ubmVjdG9yLCAmZGV2
LT5tb2RlX2NvbmZpZy5jb25uZWN0b3JfbGlzdCwgaGVhZCkgewotCQlpZiAoIWNvbm5lY3Rvci0+
ZW5jb2RlciB8fCAhY29ubmVjdG9yLT5lbmNvZGVyLT5jcnRjKQotCQkJY29udGludWU7Ci0KLQkJ
aWYgKGNvbm5lY3Rvci0+ZW5jb2Rlci0+Y3J0YyAhPSBjcnRjKQotCQkJY29udGludWU7Ci0KLQkJ
Y29ubmVjdG9yLT5kcG1zID0gRFJNX01PREVfRFBNU19PRkY7Ci0JCXRvX2ludGVsX2VuY29kZXIo
Y29ubmVjdG9yLT5lbmNvZGVyKS0+Y29ubmVjdG9yc19hY3RpdmUgPSBmYWxzZTsKLQl9Ci19Ci0K
IHZvaWQgaW50ZWxfZW5jb2Rlcl9kZXN0cm95KHN0cnVjdCBkcm1fZW5jb2RlciAqZW5jb2RlcikK
IHsKIAlzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqaW50ZWxfZW5jb2RlciA9IHRvX2ludGVsX2VuY29k
ZXIoZW5jb2Rlcik7CkBAIC0xMTIxOSw3ICsxMTE1OSw2IEBAIGludGVsX21vZGVzZXRfdXBkYXRl
X3N0YXRlKHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSkKIAlzdHJ1Y3QgZHJtX2NydGMg
KmNydGM7CiAJc3RydWN0IGRybV9jcnRjX3N0YXRlICpjcnRjX3N0YXRlOwogCXN0cnVjdCBkcm1f
Y29ubmVjdG9yICpjb25uZWN0b3I7Ci0JaW50IGk7CiAKIAlpbnRlbF9zaGFyZWRfZHBsbF9jb21t
aXQoZGV2X3ByaXYpOwogCkBAIC0xMTIyNywxNSArMTExNjYsMTIgQEAgaW50ZWxfbW9kZXNldF91
cGRhdGVfc3RhdGUoc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlKQogCQlpZiAoIWludGVs
X2VuY29kZXItPmJhc2UuY3J0YykKIAkJCWNvbnRpbnVlOwogCi0JCWZvcl9lYWNoX2NydGNfaW5f
c3RhdGUoc3RhdGUsIGNydGMsIGNydGNfc3RhdGUsIGkpCi0JCQlpZiAoY3J0YyA9PSBpbnRlbF9l
bmNvZGVyLT5iYXNlLmNydGMpCi0JCQkJYnJlYWs7Ci0KLQkJaWYgKGNydGMgIT0gaW50ZWxfZW5j
b2Rlci0+YmFzZS5jcnRjKQorCQljcnRjID0gaW50ZWxfZW5jb2Rlci0+YmFzZS5jcnRjOworCQlj
cnRjX3N0YXRlID0gc3RhdGUtPmNydGNfc3RhdGVzW2RybV9jcnRjX2luZGV4KGNydGMpXTsKKwkJ
aWYgKCFjcnRjX3N0YXRlIHx8ICFuZWVkc19tb2Rlc2V0KGNydGMtPnN0YXRlKSkKIAkJCWNvbnRp
bnVlOwogCi0JCWlmIChjcnRjX3N0YXRlLT5lbmFibGUgJiYgbmVlZHNfbW9kZXNldChjcnRjX3N0
YXRlKSkKLQkJCWludGVsX2VuY29kZXItPmNvbm5lY3RvcnNfYWN0aXZlID0gZmFsc2U7CisJCWlu
dGVsX2VuY29kZXItPmNvbm5lY3RvcnNfYWN0aXZlID0gZmFsc2U7CiAJfQogCiAJZHJtX2F0b21p
Y19oZWxwZXJfc3dhcF9zdGF0ZShzdGF0ZS0+ZGV2LCBzdGF0ZSk7CkBAIC0xMTI1MCwxNCArMTEx
ODYsMTIgQEAgaW50ZWxfbW9kZXNldF91cGRhdGVfc3RhdGUoc3RydWN0IGRybV9hdG9taWNfc3Rh
dGUgKnN0YXRlKQogCQlpZiAoIWNvbm5lY3Rvci0+ZW5jb2RlciB8fCAhY29ubmVjdG9yLT5lbmNv
ZGVyLT5jcnRjKQogCQkJY29udGludWU7CiAKLQkJZm9yX2VhY2hfY3J0Y19pbl9zdGF0ZShzdGF0
ZSwgY3J0YywgY3J0Y19zdGF0ZSwgaSkKLQkJCWlmIChjcnRjID09IGNvbm5lY3Rvci0+ZW5jb2Rl
ci0+Y3J0YykKLQkJCQlicmVhazsKLQotCQlpZiAoY3J0YyAhPSBjb25uZWN0b3ItPmVuY29kZXIt
PmNydGMpCisJCWNydGMgPSBjb25uZWN0b3ItPmVuY29kZXItPmNydGM7CisJCWNydGNfc3RhdGUg
PSBzdGF0ZS0+Y3J0Y19zdGF0ZXNbZHJtX2NydGNfaW5kZXgoY3J0YyldOworCQlpZiAoIWNydGNf
c3RhdGUgfHwgIW5lZWRzX21vZGVzZXQoY3J0Yy0+c3RhdGUpKQogCQkJY29udGludWU7CiAKLQkJ
aWYgKGNydGMtPnN0YXRlLT5lbmFibGUgJiYgbmVlZHNfbW9kZXNldChjcnRjLT5zdGF0ZSkpIHsK
KwkJaWYgKGNydGMtPnN0YXRlLT5lbmFibGUpIHsKIAkJCXN0cnVjdCBkcm1fcHJvcGVydHkgKmRw
bXNfcHJvcGVydHkgPQogCQkJCWRldi0+bW9kZV9jb25maWcuZHBtc19wcm9wZXJ0eTsKIApAQCAt
MTEyNjgsNyArMTEyMDIsOCBAQCBpbnRlbF9tb2Rlc2V0X3VwZGF0ZV9zdGF0ZShzdHJ1Y3QgZHJt
X2F0b21pY19zdGF0ZSAqc3RhdGUpCiAKIAkJCWludGVsX2VuY29kZXIgPSB0b19pbnRlbF9lbmNv
ZGVyKGNvbm5lY3Rvci0+ZW5jb2Rlcik7CiAJCQlpbnRlbF9lbmNvZGVyLT5jb25uZWN0b3JzX2Fj
dGl2ZSA9IHRydWU7Ci0JCX0KKwkJfSBlbHNlCisJCQljb25uZWN0b3ItPmRwbXMgPSBEUk1fTU9E
RV9EUE1TX09GRjsKIAl9CiAKIH0KQEAgLTExOTQ2LDEyICsxMTg4MSwxMCBAQCBzdGF0aWMgaW50
IF9faW50ZWxfc2V0X21vZGUoc3RydWN0IGRybV9jcnRjICptb2Rlc2V0X2NydGMsCiAJCWlmICgh
bmVlZHNfbW9kZXNldChjcnRjX3N0YXRlKSkKIAkJCWNvbnRpbnVlOwogCi0JCWlmICghY3J0Y19z
dGF0ZS0+ZW5hYmxlKSB7Ci0JCQlpbnRlbF9jcnRjX2Rpc2FibGUoY3J0Yyk7Ci0JCX0gZWxzZSBp
ZiAoY3J0Yy0+c3RhdGUtPmVuYWJsZSkgewotCQkJaW50ZWxfY3J0Y19kaXNhYmxlX3BsYW5lcyhj
cnRjKTsKLQkJCWRldl9wcml2LT5kaXNwbGF5LmNydGNfZGlzYWJsZShjcnRjKTsKLQkJfQorCQlp
bnRlbF9jcnRjX2Rpc2FibGVfcGxhbmVzKGNydGMpOworCQlkZXZfcHJpdi0+ZGlzcGxheS5jcnRj
X2Rpc2FibGUoY3J0Yyk7CisJCWlmICghY3J0Y19zdGF0ZS0+ZW5hYmxlKQorCQkJZHJtX3BsYW5l
X2hlbHBlcl9kaXNhYmxlKGNydGMtPnByaW1hcnkpOwogCX0KIAogCS8qIGNydGMtPm1vZGUgaXMg
YWxyZWFkeSB1c2VkIGJ5IHRoZSAtPm1vZGVfc2V0IGNhbGxiYWNrcywgaGVuY2Ugd2UgbmVlZApA
QCAtMTM2MTUsNyArMTM1NDgsNiBAQCBzdGF0aWMgdm9pZCBpbnRlbF9pbml0X2Rpc3BsYXkoc3Ry
dWN0IGRybV9kZXZpY2UgKmRldikKIAkJCWhhc3dlbGxfY3J0Y19jb21wdXRlX2Nsb2NrOwogCQlk
ZXZfcHJpdi0+ZGlzcGxheS5jcnRjX2VuYWJsZSA9IGhhc3dlbGxfY3J0Y19lbmFibGU7CiAJCWRl
dl9wcml2LT5kaXNwbGF5LmNydGNfZGlzYWJsZSA9IGhhc3dlbGxfY3J0Y19kaXNhYmxlOwotCQlk
ZXZfcHJpdi0+ZGlzcGxheS5vZmYgPSBpcm9ubGFrZV9jcnRjX29mZjsKIAkJZGV2X3ByaXYtPmRp
c3BsYXkudXBkYXRlX3ByaW1hcnlfcGxhbmUgPQogCQkJc2t5bGFrZV91cGRhdGVfcHJpbWFyeV9w
bGFuZTsKIAl9IGVsc2UgaWYgKEhBU19EREkoZGV2KSkgewpAQCAtMTM2MjYsNyArMTM1NTgsNiBA
QCBzdGF0aWMgdm9pZCBpbnRlbF9pbml0X2Rpc3BsYXkoc3RydWN0IGRybV9kZXZpY2UgKmRldikK
IAkJCWhhc3dlbGxfY3J0Y19jb21wdXRlX2Nsb2NrOwogCQlkZXZfcHJpdi0+ZGlzcGxheS5jcnRj
X2VuYWJsZSA9IGhhc3dlbGxfY3J0Y19lbmFibGU7CiAJCWRldl9wcml2LT5kaXNwbGF5LmNydGNf
ZGlzYWJsZSA9IGhhc3dlbGxfY3J0Y19kaXNhYmxlOwotCQlkZXZfcHJpdi0+ZGlzcGxheS5vZmYg
PSBpcm9ubGFrZV9jcnRjX29mZjsKIAkJZGV2X3ByaXYtPmRpc3BsYXkudXBkYXRlX3ByaW1hcnlf
cGxhbmUgPQogCQkJaXJvbmxha2VfdXBkYXRlX3ByaW1hcnlfcGxhbmU7CiAJfSBlbHNlIGlmIChI
QVNfUENIX1NQTElUKGRldikpIHsKQEAgLTEzNjM3LDcgKzEzNTY4LDYgQEAgc3RhdGljIHZvaWQg
aW50ZWxfaW5pdF9kaXNwbGF5KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJCQlpcm9ubGFrZV9j
cnRjX2NvbXB1dGVfY2xvY2s7CiAJCWRldl9wcml2LT5kaXNwbGF5LmNydGNfZW5hYmxlID0gaXJv
bmxha2VfY3J0Y19lbmFibGU7CiAJCWRldl9wcml2LT5kaXNwbGF5LmNydGNfZGlzYWJsZSA9IGly
b25sYWtlX2NydGNfZGlzYWJsZTsKLQkJZGV2X3ByaXYtPmRpc3BsYXkub2ZmID0gaXJvbmxha2Vf
Y3J0Y19vZmY7CiAJCWRldl9wcml2LT5kaXNwbGF5LnVwZGF0ZV9wcmltYXJ5X3BsYW5lID0KIAkJ
CWlyb25sYWtlX3VwZGF0ZV9wcmltYXJ5X3BsYW5lOwogCX0gZWxzZSBpZiAoSVNfVkFMTEVZVklF
VyhkZXYpKSB7CkBAIC0xMzY0Nyw3ICsxMzU3Nyw2IEBAIHN0YXRpYyB2b2lkIGludGVsX2luaXRf
ZGlzcGxheShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCQlkZXZfcHJpdi0+ZGlzcGxheS5jcnRj
X2NvbXB1dGVfY2xvY2sgPSBpOXh4X2NydGNfY29tcHV0ZV9jbG9jazsKIAkJZGV2X3ByaXYtPmRp
c3BsYXkuY3J0Y19lbmFibGUgPSB2YWxsZXl2aWV3X2NydGNfZW5hYmxlOwogCQlkZXZfcHJpdi0+
ZGlzcGxheS5jcnRjX2Rpc2FibGUgPSBpOXh4X2NydGNfZGlzYWJsZTsKLQkJZGV2X3ByaXYtPmRp
c3BsYXkub2ZmID0gaTl4eF9jcnRjX29mZjsKIAkJZGV2X3ByaXYtPmRpc3BsYXkudXBkYXRlX3By
aW1hcnlfcGxhbmUgPQogCQkJaTl4eF91cGRhdGVfcHJpbWFyeV9wbGFuZTsKIAl9IGVsc2UgewpA
QCAtMTM2NTcsNyArMTM1ODYsNiBAQCBzdGF0aWMgdm9pZCBpbnRlbF9pbml0X2Rpc3BsYXkoc3Ry
dWN0IGRybV9kZXZpY2UgKmRldikKIAkJZGV2X3ByaXYtPmRpc3BsYXkuY3J0Y19jb21wdXRlX2Ns
b2NrID0gaTl4eF9jcnRjX2NvbXB1dGVfY2xvY2s7CiAJCWRldl9wcml2LT5kaXNwbGF5LmNydGNf
ZW5hYmxlID0gaTl4eF9jcnRjX2VuYWJsZTsKIAkJZGV2X3ByaXYtPmRpc3BsYXkuY3J0Y19kaXNh
YmxlID0gaTl4eF9jcnRjX2Rpc2FibGU7Ci0JCWRldl9wcml2LT5kaXNwbGF5Lm9mZiA9IGk5eHhf
Y3J0Y19vZmY7CiAJCWRldl9wcml2LT5kaXNwbGF5LnVwZGF0ZV9wcmltYXJ5X3BsYW5lID0KIAkJ
CWk5eHhfdXBkYXRlX3ByaW1hcnlfcGxhbmU7CiAJfQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUv
ZHJtL2k5MTUvaW50ZWxfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaApp
bmRleCA3MGI3MGU5YmUxNjcuLmZiODlmNWYzNDk4YyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUv
ZHJtL2k5MTUvaW50ZWxfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2
LmgKQEAgLTEwNzgsNyArMTA3OCw2IEBAIHZvaWQgYXNzZXJ0X3NoYXJlZF9kcGxsKHN0cnVjdCBk
cm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKICNkZWZpbmUgYXNzZXJ0X3NoYXJlZF9kcGxsX2Rp
c2FibGVkKGQsIHApIGFzc2VydF9zaGFyZWRfZHBsbChkLCBwLCBmYWxzZSkKIHN0cnVjdCBpbnRl
bF9zaGFyZWRfZHBsbCAqaW50ZWxfZ2V0X3NoYXJlZF9kcGxsKHN0cnVjdCBpbnRlbF9jcnRjICpj
cnRjLAogCQkJCQkJc3RydWN0IGludGVsX2NydGNfc3RhdGUgKnN0YXRlKTsKLXZvaWQgaW50ZWxf
cHV0X3NoYXJlZF9kcGxsKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjKTsKIAogdm9pZCB2bHZfZm9y
Y2VfcGxsX29uKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIGVudW0gcGlwZSBwaXBlLAogCQkgICAg
ICBjb25zdCBzdHJ1Y3QgZHBsbCAqZHBsbCk7Ci0tIAoyLjEuMAoKX19fX19fX19fX19fX19fX19f
X19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRl
bC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcv
bWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK