From: =?UTF-8?q?Jos=C3=A9=20Roberto=20de=20Souza?= Subject: [PATCH 04/10] drm/i915: Move out non-display related calls from display/modeset init/cleanup Date: Thu, 26 Jul 2018 15:43:08 -0700 Message-ID: <20180726224314.30241-4-jose.souza@intel.com> References: <20180726224314.30241-1-jose.souza@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by gabe.freedesktop.org (Postfix) with ESMTPS id B692E6E14D for ; Thu, 26 Jul 2018 22:44:02 +0000 (UTC) In-Reply-To: <20180726224314.30241-1-jose.souza@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 aTkxNV9sb2FkX21vZGVzZXRfaW5pdCgpIGFuZCBpbnRlbF9tb2Rlc2V0X2NsZWFudXAoKSB3YXMg aW5pdGlhbGl6aW5nCmFuZCBjbGVhbmluZyB1cCB0aGluZ3MgdGhhdCBpcyBub3QgZGlzcGxheSBv bmx5LgpUaGlzIHdpbGwgbWFrZSBlYXN5IGluaXRpYWxpemUgZHJpdmVyIHdpdGhvdXQgZGlzcGxh eSBibG9jay4KCkFsc28gbW92aW5nIFZMVi9DSFYvQllUIGN6Y2xrIGFzIGl0IGlzIGEgY29yZSBj bG9jayB1c2VkIGFzIGJhc2UgYnkKc2V2ZXJhbCBvdGhlciBHUFUgYmxvY2tzIG5vdCBvbmx5IGRp c3BsYXksIGluY2x1ZGluZyBnZW0vR1QuClNwZWM6IDE0MzcwCgpTaWduZWQtb2ZmLWJ5OiBKb3PD qSBSb2JlcnRvIGRlIFNvdXphIDxqb3NlLnNvdXphQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2Rydi5jICAgICAgfCA4NiArKysrKysrKysrKysrKysrKystLS0tLS0t LS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oICAgICAgfCAgMSArCiBkcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgfCAyOCArKy0tLS0tLS0KIGRyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX3BtLmMgICAgICB8IDEwICsrKysKIDQgZmlsZXMgY2hhbmdlZCwgNzIg aW5zZXJ0aW9ucygrKSwgNTMgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9kcnYuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMKaW5k ZXggNjJmMzRmOGFhMDJiLi4zY2EzMGI5ZjIwOTYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZHJ2LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYwpA QCAtNjY1LDI4ICs2NjUsMTUgQEAgc3RhdGljIGludCBpOTE1X2xvYWRfbW9kZXNldF9pbml0KHN0 cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJaWYgKHJldCkKIAkJZ290byBjbGVhbnVwX3ZnYV9jbGll bnQ7CiAKLQkvKiBtdXN0IGhhcHBlbiBiZWZvcmUgaW50ZWxfcG93ZXJfZG9tYWluc19pbml0X2h3 KCkgb24gVkxWL0NIViAqLwotCWludGVsX3VwZGF0ZV9yYXdjbGsoZGV2X3ByaXYpOwotCi0JaW50 ZWxfcG93ZXJfZG9tYWluc19pbml0X2h3KGRldl9wcml2LCBmYWxzZSk7Ci0KIAlpbnRlbF9jc3Jf dWNvZGVfaW5pdChkZXZfcHJpdik7CiAKLQlyZXQgPSBpbnRlbF9pcnFfaW5zdGFsbChkZXZfcHJp dik7Ci0JaWYgKHJldCkKLQkJZ290byBjbGVhbnVwX2NzcjsKLQogCWludGVsX3NldHVwX2dtYnVz KGRldl9wcml2KTsKIAogCS8qIEltcG9ydGFudDogVGhlIG91dHB1dCBzZXR1cCBmdW5jdGlvbnMg Y2FsbGVkIGJ5IG1vZGVzZXRfaW5pdCBuZWVkCiAJICogd29ya2luZyBpcnFzIGZvciBlLmcuIGdt YnVzIGFuZCBkcCBhdXggdHJhbnNmZXJzLiAqLwogCXJldCA9IGludGVsX21vZGVzZXRfaW5pdChk ZXYpOwogCWlmIChyZXQpCi0JCWdvdG8gY2xlYW51cF9pcnE7Ci0KLQlyZXQgPSBpOTE1X2dlbV9p bml0KGRldl9wcml2KTsKLQlpZiAocmV0KQotCQlnb3RvIGNsZWFudXBfbW9kZXNldDsKKwkJZ290 byBjbGVhbnVwX2dtYnVzOwogCiAJaW50ZWxfc2V0dXBfb3ZlcmxheShkZXZfcHJpdik7CiAKQEAg LTY5NSwyNSArNjgyLDE4IEBAIHN0YXRpYyBpbnQgaTkxNV9sb2FkX21vZGVzZXRfaW5pdChzdHJ1 Y3QgZHJtX2RldmljZSAqZGV2KQogCiAJcmV0ID0gaW50ZWxfZmJkZXZfaW5pdChkZXYpOwogCWlm IChyZXQpCi0JCWdvdG8gY2xlYW51cF9nZW07CisJCWdvdG8gY2xlYW51cF9tb2Rlc2V0OwogCiAJ LyogT25seSBlbmFibGUgaG90cGx1ZyBoYW5kbGluZyBvbmNlIHRoZSBmYmRldiBpcyBmdWxseSBz ZXQgdXAuICovCiAJaW50ZWxfaHBkX2luaXQoZGV2X3ByaXYpOwogCiAJcmV0dXJuIDA7CiAKLWNs ZWFudXBfZ2VtOgotCWlmIChpOTE1X2dlbV9zdXNwZW5kKGRldl9wcml2KSkKLQkJRFJNX0VSUk9S KCJmYWlsZWQgdG8gaWRsZSBoYXJkd2FyZTsgY29udGludWluZyB0byB1bmxvYWQhXG4iKTsKLQlp OTE1X2dlbV9maW5pKGRldl9wcml2KTsKIGNsZWFudXBfbW9kZXNldDoKIAlpbnRlbF9tb2Rlc2V0 X2NsZWFudXAoZGV2KTsKLWNsZWFudXBfaXJxOgotCWRybV9pcnFfdW5pbnN0YWxsKGRldik7Citj bGVhbnVwX2dtYnVzOgogCWludGVsX3RlYXJkb3duX2dtYnVzKGRldl9wcml2KTsKLWNsZWFudXBf Y3NyOgogCWludGVsX2Nzcl91Y29kZV9maW5pKGRldl9wcml2KTsKLQlpbnRlbF9wb3dlcl9kb21h aW5zX2ZpbmkoZGV2X3ByaXYpOwogCXZnYV9zd2l0Y2hlcm9vX3VucmVnaXN0ZXJfY2xpZW50KHBk ZXYpOwogY2xlYW51cF92Z2FfY2xpZW50OgogCXZnYV9jbGllbnRfcmVnaXN0ZXIocGRldiwgTlVM TCwgTlVMTCwgTlVMTCk7CkBAIC0xMzk3LDkgKzEzNzcsMjUgQEAgaW50IGk5MTVfZHJpdmVyX2xv YWQoc3RydWN0IHBjaV9kZXYgKnBkZXYsIGNvbnN0IHN0cnVjdCBwY2lfZGV2aWNlX2lkICplbnQp CiAJCQlnb3RvIG91dF9jbGVhbnVwX2h3OwogCX0KIAorCS8qIG11c3QgaGFwcGVuIGJlZm9yZSBp bnRlbF9wb3dlcl9kb21haW5zX2luaXRfaHcoKSBvbiBWTFYvQ0hWICovCisJaW50ZWxfdXBkYXRl X3Jhd2NsayhkZXZfcHJpdik7CisKKwkvKiBpOTE1X2dlbV9pbml0KCkgY2FsbCBjaGFpbiB3aWxs IGNhbGwKKwkgKiBpbnRlbF9kaXNwbGF5X3Bvd2VyX3B1dChpOTE1LCBQT1dFUl9ET01BSU5fR1Rf SVJRKTsKKwkgKi8KKwlpbnRlbF9wb3dlcl9kb21haW5zX2luaXRfaHcoZGV2X3ByaXYsIGZhbHNl KTsKKworCXJldCA9IGludGVsX2lycV9pbnN0YWxsKGRldl9wcml2KTsKKwlpZiAocmV0KQorCQln b3RvIG91dF9jbGVhbnVwX3Bvd2VyOworCisJcmV0ID0gaTkxNV9nZW1faW5pdChkZXZfcHJpdik7 CisJaWYgKHJldCkKKwkJZ290byBjbGVhbnVwX2lycTsKKwogCXJldCA9IGk5MTVfbG9hZF9tb2Rl c2V0X2luaXQoJmRldl9wcml2LT5kcm0pOwogCWlmIChyZXQgPCAwKQotCQlnb3RvIG91dF9jbGVh bnVwX2h3OworCQlnb3RvIGNsZWFudXBfZ2VtOwogCiAJaTkxNV9kcml2ZXJfcmVnaXN0ZXIoZGV2 X3ByaXYpOwogCkBAIC0xNDEzLDYgKzE0MDksMTUgQEAgaW50IGk5MTVfZHJpdmVyX2xvYWQoc3Ry dWN0IHBjaV9kZXYgKnBkZXYsIGNvbnN0IHN0cnVjdCBwY2lfZGV2aWNlX2lkICplbnQpCiAKIAly ZXR1cm4gMDsKIAorY2xlYW51cF9nZW06CisJaWYgKGk5MTVfZ2VtX3N1c3BlbmQoZGV2X3ByaXYp KQorCQlEUk1fRVJST1IoImZhaWxlZCB0byBpZGxlIGhhcmR3YXJlOyBjb250aW51aW5nIHRvIHVu bG9hZCFcbiIpOworCWludGVsX2NsZWFudXBfZ3RfcG93ZXJzYXZlKGRldl9wcml2KTsKKwlpOTE1 X2dlbV9maW5pKGRldl9wcml2KTsKK2NsZWFudXBfaXJxOgorCWRybV9pcnFfdW5pbnN0YWxsKCZk ZXZfcHJpdi0+ZHJtKTsKK291dF9jbGVhbnVwX3Bvd2VyOgorCWludGVsX3Bvd2VyX2RvbWFpbnNf ZmluaShkZXZfcHJpdik7CiBvdXRfY2xlYW51cF9odzoKIAlpOTE1X2RyaXZlcl9jbGVhbnVwX2h3 KGRldl9wcml2KTsKIG91dF9jbGVhbnVwX21taW86CkBAIC0xNDMxLDExICsxNDM2LDI0IEBAIGlu dCBpOTE1X2RyaXZlcl9sb2FkKHN0cnVjdCBwY2lfZGV2ICpwZGV2LCBjb25zdCBzdHJ1Y3QgcGNp X2RldmljZV9pZCAqZW50KQogCXJldHVybiByZXQ7CiB9CiAKLXZvaWQgaTkxNV9kcml2ZXJfdW5s b2FkKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCisvKiB1bmxvYWQvY2xlYW51cCB0aGUgbGVmdG92 ZXIgb2YgaTkxNV9sb2FkX21vZGVzZXRfaW5pdCgpICovCitzdGF0aWMgdm9pZCBpOTE1X21vZGVz ZXRfdW5sb2FkKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiB7CiAJc3RydWN0IGRybV9pOTE1X3By aXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShkZXYpOwogCXN0cnVjdCBwY2lfZGV2ICpwZGV2ID0g ZGV2X3ByaXYtPmRybS5wZGV2OwogCisJaW50ZWxfYmlvc19jbGVhbnVwKGRldl9wcml2KTsKKwor CXZnYV9zd2l0Y2hlcm9vX3VucmVnaXN0ZXJfY2xpZW50KHBkZXYpOworCXZnYV9jbGllbnRfcmVn aXN0ZXIocGRldiwgTlVMTCwgTlVMTCwgTlVMTCk7CisKKwlpbnRlbF9jc3JfdWNvZGVfZmluaShk ZXZfcHJpdik7Cit9CisKK3ZvaWQgaTkxNV9kcml2ZXJfdW5sb2FkKHN0cnVjdCBkcm1fZGV2aWNl ICpkZXYpCit7CisJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShk ZXYpOworCiAJaTkxNV9kcml2ZXJfdW5yZWdpc3RlcihkZXZfcHJpdik7CiAKIAlpZiAoaTkxNV9n ZW1fc3VzcGVuZChkZXZfcHJpdikpCkBAIC0xNDQ3LDE0ICsxNDY1LDIyIEBAIHZvaWQgaTkxNV9k cml2ZXJfdW5sb2FkKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAKIAlpbnRlbF9ndnRfY2xlYW51 cChkZXZfcHJpdik7CiAKLQlpbnRlbF9tb2Rlc2V0X2NsZWFudXAoZGV2KTsKKwlpbnRlbF9tb2Rl c2V0X2NsZWFudXBfcHJlcGFyZShkZXYpOwogCi0JaW50ZWxfYmlvc19jbGVhbnVwKGRldl9wcml2 KTsKKwlpbnRlbF9kaXNhYmxlX2d0X3Bvd2Vyc2F2ZShkZXZfcHJpdik7CiAKLQl2Z2Ffc3dpdGNo ZXJvb191bnJlZ2lzdGVyX2NsaWVudChwZGV2KTsKLQl2Z2FfY2xpZW50X3JlZ2lzdGVyKHBkZXYs IE5VTEwsIE5VTEwsIE5VTEwpOworCS8qCisJICogSW50ZXJydXB0cyBhbmQgcG9sbGluZyBhcyB0 aGUgZmlyc3QgdGhpbmcgdG8gYXZvaWQgY3JlYXRpbmcgaGF2b2MuCisJICogVG9vIG11Y2ggc3R1 ZmYgaGVyZSAodHVybmluZyBvZiBjb25uZWN0b3JzLCAuLi4pIHdvdWxkCisJICogZXhwZXJpZW5j ZSBmYW5jeSByYWNlcyBvdGhlcndpc2UuCisJICovCisJaW50ZWxfaXJxX3VuaW5zdGFsbChkZXZf cHJpdik7CiAKLQlpbnRlbF9jc3JfdWNvZGVfZmluaShkZXZfcHJpdik7CisJaW50ZWxfbW9kZXNl dF9jbGVhbnVwKGRldik7CisKKwlpbnRlbF9jbGVhbnVwX2d0X3Bvd2Vyc2F2ZShkZXZfcHJpdik7 CisKKwlpOTE1X21vZGVzZXRfdW5sb2FkKGRldik7CiAKIAkvKiBGcmVlIGVycm9yIHN0YXRlIGFm dGVyIGludGVycnVwdHMgYXJlIGZ1bGx5IGRpc2FibGVkLiAqLwogCWNhbmNlbF9kZWxheWVkX3dv cmtfc3luYygmZGV2X3ByaXYtPmdwdV9lcnJvci5oYW5nY2hlY2tfd29yayk7CmRpZmYgLS1naXQg YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9kcnYuaAppbmRleCAwZjQ5Zjk5ODhkZmEuLmQ1MGZkOTgyNWIxMCAxMDA2NDQKLS0tIGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X2Rydi5oCkBAIC0zNDExLDYgKzM0MTEsNyBAQCBta3dyaXRlX2RldmljZV9pbmZvKHN0 cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIC8qIG1vZGVzZXR0aW5nICovCiBleHRl cm4gdm9pZCBpbnRlbF9tb2Rlc2V0X2luaXRfaHcoc3RydWN0IGRybV9kZXZpY2UgKmRldik7CiBl eHRlcm4gaW50IGludGVsX21vZGVzZXRfaW5pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KTsKK3Zv aWQgaW50ZWxfbW9kZXNldF9jbGVhbnVwX3ByZXBhcmUoc3RydWN0IGRybV9kZXZpY2UgKmRldik7 CiBleHRlcm4gdm9pZCBpbnRlbF9tb2Rlc2V0X2NsZWFudXAoc3RydWN0IGRybV9kZXZpY2UgKmRl dik7CiBleHRlcm4gaW50IGludGVsX2Nvbm5lY3Rvcl9yZWdpc3RlcihzdHJ1Y3QgZHJtX2Nvbm5l Y3RvciAqKTsKIGV4dGVybiB2b2lkIGludGVsX2Nvbm5lY3Rvcl91bnJlZ2lzdGVyKHN0cnVjdCBk cm1fY29ubmVjdG9yICopOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf ZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCmluZGV4IDU3 N2IzMGRkZTQ1Yi4uMWIwZWU3OTZmNjk3IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9kaXNwbGF5LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxh eS5jCkBAIC0yMTgsMTcgKzIxOCw2IEBAIGludCB2bHZfZ2V0X2Nja19jbG9ja19ocGxsKHN0cnVj dCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAkJCQkgZGV2X3ByaXYtPmhwbGxfZnJlcSk7 CiB9CiAKLXN0YXRpYyB2b2lkIGludGVsX3VwZGF0ZV9jemNsayhzdHJ1Y3QgZHJtX2k5MTVfcHJp dmF0ZSAqZGV2X3ByaXYpCi17Ci0JaWYgKCEoSVNfVkFMTEVZVklFVyhkZXZfcHJpdikgfHwgSVNf Q0hFUlJZVklFVyhkZXZfcHJpdikpKQotCQlyZXR1cm47Ci0KLQlkZXZfcHJpdi0+Y3pjbGtfZnJl cSA9IHZsdl9nZXRfY2NrX2Nsb2NrX2hwbGwoZGV2X3ByaXYsICJjemNsayIsCi0JCQkJCQkgICAg ICBDQ0tfQ1pfQ0xPQ0tfQ09OVFJPTCk7Ci0KLQlEUk1fREVCVUdfRFJJVkVSKCJDWiBjbG9jayBy YXRlOiAlZCBrSHpcbiIsIGRldl9wcml2LT5jemNsa19mcmVxKTsKLX0KLQogc3RhdGljIGlubGlu ZSB1MzIgLyogdW5pdHMgb2YgMTAwTUh6ICovCiBpbnRlbF9mZGlfbGlua19mcmVxKHN0cnVjdCBk cm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAkJICAgIGNvbnN0IHN0cnVjdCBpbnRlbF9jcnRj X3N0YXRlICpwaXBlX2NvbmZpZykKQEAgLTE1MjQ3LDcgKzE1MjM2LDYgQEAgaW50IGludGVsX21v ZGVzZXRfaW5pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCWludGVsX3NoYXJlZF9kcGxsX2lu aXQoZGV2KTsKIAlpbnRlbF91cGRhdGVfZmRpX3BsbF9mcmVxKGRldl9wcml2KTsKIAotCWludGVs X3VwZGF0ZV9jemNsayhkZXZfcHJpdik7CiAJaW50ZWxfbW9kZXNldF9pbml0X2h3KGRldik7CiAK IAlpZiAoZGV2X3ByaXYtPm1heF9jZGNsa19mcmVxID09IDApCkBAIC0xNTk2Miw3ICsxNTk1MCw3 IEBAIHN0YXRpYyB2b2lkIGludGVsX2hwZF9wb2xsX2Zpbmkoc3RydWN0IGRybV9kZXZpY2UgKmRl dikKIAlkcm1fY29ubmVjdG9yX2xpc3RfaXRlcl9lbmQoJmNvbm5faXRlcik7CiB9CiAKLXZvaWQg aW50ZWxfbW9kZXNldF9jbGVhbnVwKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCit2b2lkIGludGVs X21vZGVzZXRfY2xlYW51cF9wcmVwYXJlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiB7CiAJc3Ry dWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShkZXYpOwogCkBAIC0xNTk3 MCwxNSArMTU5NTgsMTEgQEAgdm9pZCBpbnRlbF9tb2Rlc2V0X2NsZWFudXAoc3RydWN0IGRybV9k ZXZpY2UgKmRldikKIAogCWZsdXNoX3dvcmsoJmRldl9wcml2LT5hdG9taWNfaGVscGVyLmZyZWVf d29yayk7CiAJV0FSTl9PTighbGxpc3RfZW1wdHkoJmRldl9wcml2LT5hdG9taWNfaGVscGVyLmZy ZWVfbGlzdCkpOworfQogCi0JaW50ZWxfZGlzYWJsZV9ndF9wb3dlcnNhdmUoZGV2X3ByaXYpOwot Ci0JLyoKLQkgKiBJbnRlcnJ1cHRzIGFuZCBwb2xsaW5nIGFzIHRoZSBmaXJzdCB0aGluZyB0byBh dm9pZCBjcmVhdGluZyBoYXZvYy4KLQkgKiBUb28gbXVjaCBzdHVmZiBoZXJlICh0dXJuaW5nIG9m IGNvbm5lY3RvcnMsIC4uLikgd291bGQKLQkgKiBleHBlcmllbmNlIGZhbmN5IHJhY2VzIG90aGVy d2lzZS4KLQkgKi8KLQlpbnRlbF9pcnFfdW5pbnN0YWxsKGRldl9wcml2KTsKK3ZvaWQgaW50ZWxf bW9kZXNldF9jbGVhbnVwKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCit7CisJc3RydWN0IGRybV9p OTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShkZXYpOwogCiAJLyoKIAkgKiBEdWUgdG8g dGhlIGhwZCBpcnEgc3Rvcm0gaGFuZGxpbmcgdGhlIGhvdHBsdWcgd29yayBjYW4gcmUtYXJtIHRo ZQpAQCAtMTYwMDAsOCArMTU5ODQsNiBAQCB2b2lkIGludGVsX21vZGVzZXRfY2xlYW51cChzdHJ1 Y3QgZHJtX2RldmljZSAqZGV2KQogCiAJaW50ZWxfY2xlYW51cF9vdmVybGF5KGRldl9wcml2KTsK IAotCWludGVsX2NsZWFudXBfZ3RfcG93ZXJzYXZlKGRldl9wcml2KTsKLQogCWludGVsX3RlYXJk b3duX2dtYnVzKGRldl9wcml2KTsKIAogCWRlc3Ryb3lfd29ya3F1ZXVlKGRldl9wcml2LT5tb2Rl c2V0X3dxKTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCmluZGV4IDczMTJlY2I3MzQxNS4uZTU0YTY1 NDA1NDQ4IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCisrKyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMKQEAgLTczNjUsNiArNzM2NSwxNCBAQCBz dGF0aWMgdm9pZCB2bHZfaW5pdF9ncGxsX3JlZl9mcmVxKHN0cnVjdCBkcm1faTkxNV9wcml2YXRl ICpkZXZfcHJpdikKIAkJCSBkZXZfcHJpdi0+Z3RfcG0ucnBzLmdwbGxfcmVmX2ZyZXEpOwogfQog CitzdGF0aWMgdm9pZCB2YWxsZXl2aWV3X3VwZGF0ZV9jemNsayhzdHJ1Y3QgZHJtX2k5MTVfcHJp dmF0ZSAqZGV2X3ByaXYpCit7CisJZGV2X3ByaXYtPmN6Y2xrX2ZyZXEgPSB2bHZfZ2V0X2Nja19j bG9ja19ocGxsKGRldl9wcml2LCAiY3pjbGsiLAorCQkJCQkJICAgICAgQ0NLX0NaX0NMT0NLX0NP TlRST0wpOworCisJRFJNX0RFQlVHX0RSSVZFUigiQ1ogY2xvY2sgcmF0ZTogJWQga0h6XG4iLCBk ZXZfcHJpdi0+Y3pjbGtfZnJlcSk7Cit9CisKIHN0YXRpYyB2b2lkIHZhbGxleXZpZXdfaW5pdF9n dF9wb3dlcnNhdmUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogewogCXN0cnVj dCBpbnRlbF9ycHMgKnJwcyA9ICZkZXZfcHJpdi0+Z3RfcG0ucnBzOwpAQCAtNzM3Miw2ICs3Mzgw LDcgQEAgc3RhdGljIHZvaWQgdmFsbGV5dmlld19pbml0X2d0X3Bvd2Vyc2F2ZShzdHJ1Y3QgZHJt X2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAKIAl2YWxsZXl2aWV3X3NldHVwX3BjdHgoZGV2X3By aXYpOwogCisJdmFsbGV5dmlld191cGRhdGVfY3pjbGsoZGV2X3ByaXYpOwogCXZsdl9pbml0X2dw bGxfcmVmX2ZyZXEoZGV2X3ByaXYpOwogCiAJdmFsID0gdmx2X3B1bml0X3JlYWQoZGV2X3ByaXYs IFBVTklUX1JFR19HUFVfRlJFUV9TVFMpOwpAQCAtNzQxOCw2ICs3NDI3LDcgQEAgc3RhdGljIHZv aWQgY2hlcnJ5dmlld19pbml0X2d0X3Bvd2Vyc2F2ZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAq ZGV2X3ByaXYpCiAKIAljaGVycnl2aWV3X3NldHVwX3BjdHgoZGV2X3ByaXYpOwogCisJdmFsbGV5 dmlld191cGRhdGVfY3pjbGsoZGV2X3ByaXYpOwogCXZsdl9pbml0X2dwbGxfcmVmX2ZyZXEoZGV2 X3ByaXYpOwogCiAJbXV0ZXhfbG9jaygmZGV2X3ByaXYtPnNiX2xvY2spOwotLSAKMi4xOC4wCgpf X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZngg bWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0 cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK