From: =?UTF-8?q?Jos=C3=A9=20Roberto=20de=20Souza?= Subject: [PATCH 04/20] drm/i915: Move out non-display related calls from display/modeset init/cleanup Date: Wed, 8 Aug 2018 17:15:50 -0700 Message-ID: <20180809001606.26876-4-jose.souza@intel.com> References: <20180809001606.26876-1-jose.souza@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by gabe.freedesktop.org (Postfix) with ESMTPS id C9D816E621 for ; Thu, 9 Aug 2018 00:16:53 +0000 (UTC) In-Reply-To: <20180809001606.26876-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 ZXggNzk1MmY1ODc3NDAyLi4xZjc4NGQ3MWYyNzQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZHJ2LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYwpA QCAtNjY0LDI4ICs2NjQsMTUgQEAgc3RhdGljIGludCBpOTE1X2xvYWRfbW9kZXNldF9pbml0KHN0 cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJaWYgKHJldCkKIAkJZ290byBjbGVhbnVwX3ZnYV9jbGll bnQ7CiAKLQkvKiBtdXN0IGhhcHBlbiBiZWZvcmUgaW50ZWxfcG93ZXJfZG9tYWluc19pbml0X2h3 KCkgb24gVkxWL0NIViAqLwotCWludGVsX3VwZGF0ZV9yYXdjbGsoZGV2X3ByaXYpOwotCi0JaW50 ZWxfcG93ZXJfZG9tYWluc19pbml0X2h3KGRldl9wcml2LCBmYWxzZSk7Ci0KIAlpbnRlbF9jc3Jf dWNvZGVfaW5pdChkZXZfcHJpdik7CiAKLQlyZXQgPSBpbnRlbF9pcnFfaW5zdGFsbChkZXZfcHJp dik7Ci0JaWYgKHJldCkKLQkJZ290byBjbGVhbnVwX2NzcjsKLQogCWludGVsX3NldHVwX2dtYnVz KGRldl9wcml2KTsKIAogCS8qIEltcG9ydGFudDogVGhlIG91dHB1dCBzZXR1cCBmdW5jdGlvbnMg Y2FsbGVkIGJ5IG1vZGVzZXRfaW5pdCBuZWVkCiAJICogd29ya2luZyBpcnFzIGZvciBlLmcuIGdt YnVzIGFuZCBkcCBhdXggdHJhbnNmZXJzLiAqLwogCXJldCA9IGludGVsX21vZGVzZXRfaW5pdChk ZXYpOwogCWlmIChyZXQpCi0JCWdvdG8gY2xlYW51cF9pcnE7Ci0KLQlyZXQgPSBpOTE1X2dlbV9p bml0KGRldl9wcml2KTsKLQlpZiAocmV0KQotCQlnb3RvIGNsZWFudXBfbW9kZXNldDsKKwkJZ290 byBjbGVhbnVwX2dtYnVzOwogCiAJaW50ZWxfc2V0dXBfb3ZlcmxheShkZXZfcHJpdik7CiAKQEAg LTY5NCwyNSArNjgxLDE4IEBAIHN0YXRpYyBpbnQgaTkxNV9sb2FkX21vZGVzZXRfaW5pdChzdHJ1 Y3QgZHJtX2RldmljZSAqZGV2KQogCiAJcmV0ID0gaW50ZWxfZmJkZXZfaW5pdChkZXYpOwogCWlm IChyZXQpCi0JCWdvdG8gY2xlYW51cF9nZW07CisJCWdvdG8gY2xlYW51cF9tb2Rlc2V0OwogCiAJ LyogT25seSBlbmFibGUgaG90cGx1ZyBoYW5kbGluZyBvbmNlIHRoZSBmYmRldiBpcyBmdWxseSBz ZXQgdXAuICovCiAJaW50ZWxfaHBkX2luaXQoZGV2X3ByaXYpOwogCiAJcmV0dXJuIDA7CiAKLWNs ZWFudXBfZ2VtOgotCWlmIChpOTE1X2dlbV9zdXNwZW5kKGRldl9wcml2KSkKLQkJRFJNX0VSUk9S KCJmYWlsZWQgdG8gaWRsZSBoYXJkd2FyZTsgY29udGludWluZyB0byB1bmxvYWQhXG4iKTsKLQlp OTE1X2dlbV9maW5pKGRldl9wcml2KTsKIGNsZWFudXBfbW9kZXNldDoKIAlpbnRlbF9tb2Rlc2V0 X2NsZWFudXAoZGV2KTsKLWNsZWFudXBfaXJxOgotCWRybV9pcnFfdW5pbnN0YWxsKGRldik7Citj bGVhbnVwX2dtYnVzOgogCWludGVsX3RlYXJkb3duX2dtYnVzKGRldl9wcml2KTsKLWNsZWFudXBf Y3NyOgogCWludGVsX2Nzcl91Y29kZV9maW5pKGRldl9wcml2KTsKLQlpbnRlbF9wb3dlcl9kb21h aW5zX2ZpbmlfaHcoZGV2X3ByaXYpOwogCXZnYV9zd2l0Y2hlcm9vX3VucmVnaXN0ZXJfY2xpZW50 KHBkZXYpOwogY2xlYW51cF92Z2FfY2xpZW50OgogCXZnYV9jbGllbnRfcmVnaXN0ZXIocGRldiwg TlVMTCwgTlVMTCwgTlVMTCk7CkBAIC0xNDA3LDkgKzEzODcsMjUgQEAgaW50IGk5MTVfZHJpdmVy X2xvYWQoc3RydWN0IHBjaV9kZXYgKnBkZXYsIGNvbnN0IHN0cnVjdCBwY2lfZGV2aWNlX2lkICpl bnQpCiAJCQlnb3RvIG91dF9jbGVhbnVwX2h3OwogCX0KIAorCS8qIG11c3QgaGFwcGVuIGJlZm9y ZSBpbnRlbF9wb3dlcl9kb21haW5zX2luaXRfaHcoKSBvbiBWTFYvQ0hWICovCisJaW50ZWxfdXBk YXRlX3Jhd2NsayhkZXZfcHJpdik7CisKKwkvKiBpOTE1X2dlbV9pbml0KCkgY2FsbCBjaGFpbiB3 aWxsIGNhbGwKKwkgKiBpbnRlbF9kaXNwbGF5X3Bvd2VyX3B1dChpOTE1LCBQT1dFUl9ET01BSU5f R1RfSVJRKTsKKwkgKi8KKwlpbnRlbF9wb3dlcl9kb21haW5zX2luaXRfaHcoZGV2X3ByaXYsIGZh bHNlKTsKKworCXJldCA9IGludGVsX2lycV9pbnN0YWxsKGRldl9wcml2KTsKKwlpZiAocmV0KQor CQlnb3RvIG91dF9jbGVhbnVwX3Bvd2VyOworCisJcmV0ID0gaTkxNV9nZW1faW5pdChkZXZfcHJp dik7CisJaWYgKHJldCkKKwkJZ290byBjbGVhbnVwX2lycTsKKwogCXJldCA9IGk5MTVfbG9hZF9t b2Rlc2V0X2luaXQoJmRldl9wcml2LT5kcm0pOwogCWlmIChyZXQgPCAwKQotCQlnb3RvIG91dF9j bGVhbnVwX2h3OworCQlnb3RvIGNsZWFudXBfZ2VtOwogCiAJaTkxNV9kcml2ZXJfcmVnaXN0ZXIo ZGV2X3ByaXYpOwogCkBAIC0xNDIzLDYgKzE0MTksMTUgQEAgaW50IGk5MTVfZHJpdmVyX2xvYWQo c3RydWN0IHBjaV9kZXYgKnBkZXYsIGNvbnN0IHN0cnVjdCBwY2lfZGV2aWNlX2lkICplbnQpCiAK IAlyZXR1cm4gMDsKIAorY2xlYW51cF9nZW06CisJaWYgKGk5MTVfZ2VtX3N1c3BlbmQoZGV2X3By aXYpKQorCQlEUk1fRVJST1IoImZhaWxlZCB0byBpZGxlIGhhcmR3YXJlOyBjb250aW51aW5nIHRv IHVubG9hZCFcbiIpOworCWludGVsX2NsZWFudXBfZ3RfcG93ZXJzYXZlKGRldl9wcml2KTsKKwlp OTE1X2dlbV9maW5pKGRldl9wcml2KTsKK2NsZWFudXBfaXJxOgorCWRybV9pcnFfdW5pbnN0YWxs KCZkZXZfcHJpdi0+ZHJtKTsKK291dF9jbGVhbnVwX3Bvd2VyOgorCWludGVsX3Bvd2VyX2RvbWFp bnNfZmluaV9odyhkZXZfcHJpdik7CiBvdXRfY2xlYW51cF9odzoKIAlpOTE1X2RyaXZlcl9jbGVh bnVwX2h3KGRldl9wcml2KTsKIG91dF9jbGVhbnVwX21taW86CkBAIC0xNDQxLDExICsxNDQ2LDI0 IEBAIGludCBpOTE1X2RyaXZlcl9sb2FkKHN0cnVjdCBwY2lfZGV2ICpwZGV2LCBjb25zdCBzdHJ1 Y3QgcGNpX2RldmljZV9pZCAqZW50KQogCXJldHVybiByZXQ7CiB9CiAKLXZvaWQgaTkxNV9kcml2 ZXJfdW5sb2FkKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCisvKiB1bmxvYWQvY2xlYW51cCB0aGUg bGVmdG92ZXIgb2YgaTkxNV9sb2FkX21vZGVzZXRfaW5pdCgpICovCitzdGF0aWMgdm9pZCBpOTE1 X21vZGVzZXRfdW5sb2FkKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiB7CiAJc3RydWN0IGRybV9p OTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShkZXYpOwogCXN0cnVjdCBwY2lfZGV2ICpw ZGV2ID0gZGV2X3ByaXYtPmRybS5wZGV2OwogCisJaW50ZWxfYmlvc19jbGVhbnVwKGRldl9wcml2 KTsKKworCXZnYV9zd2l0Y2hlcm9vX3VucmVnaXN0ZXJfY2xpZW50KHBkZXYpOworCXZnYV9jbGll bnRfcmVnaXN0ZXIocGRldiwgTlVMTCwgTlVMTCwgTlVMTCk7CisKKwlpbnRlbF9jc3JfdWNvZGVf ZmluaShkZXZfcHJpdik7Cit9CisKK3ZvaWQgaTkxNV9kcml2ZXJfdW5sb2FkKHN0cnVjdCBkcm1f ZGV2aWNlICpkZXYpCit7CisJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9f aTkxNShkZXYpOworCiAJaTkxNV9kcml2ZXJfdW5yZWdpc3RlcihkZXZfcHJpdik7CiAKIAlpZiAo aTkxNV9nZW1fc3VzcGVuZChkZXZfcHJpdikpCkBAIC0xNDU3LDE0ICsxNDc1LDIyIEBAIHZvaWQg aTkxNV9kcml2ZXJfdW5sb2FkKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAKIAlpbnRlbF9ndnRf Y2xlYW51cChkZXZfcHJpdik7CiAKLQlpbnRlbF9tb2Rlc2V0X2NsZWFudXAoZGV2KTsKKwlpbnRl bF9tb2Rlc2V0X2NsZWFudXBfcHJlcGFyZShkZXYpOwogCi0JaW50ZWxfYmlvc19jbGVhbnVwKGRl dl9wcml2KTsKKwlpbnRlbF9kaXNhYmxlX2d0X3Bvd2Vyc2F2ZShkZXZfcHJpdik7CiAKLQl2Z2Ff c3dpdGNoZXJvb191bnJlZ2lzdGVyX2NsaWVudChwZGV2KTsKLQl2Z2FfY2xpZW50X3JlZ2lzdGVy KHBkZXYsIE5VTEwsIE5VTEwsIE5VTEwpOworCS8qCisJICogSW50ZXJydXB0cyBhbmQgcG9sbGlu ZyBhcyB0aGUgZmlyc3QgdGhpbmcgdG8gYXZvaWQgY3JlYXRpbmcgaGF2b2MuCisJICogVG9vIG11 Y2ggc3R1ZmYgaGVyZSAodHVybmluZyBvZiBjb25uZWN0b3JzLCAuLi4pIHdvdWxkCisJICogZXhw ZXJpZW5jZSBmYW5jeSByYWNlcyBvdGhlcndpc2UuCisJICovCisJaW50ZWxfaXJxX3VuaW5zdGFs bChkZXZfcHJpdik7CiAKLQlpbnRlbF9jc3JfdWNvZGVfZmluaShkZXZfcHJpdik7CisJaW50ZWxf bW9kZXNldF9jbGVhbnVwKGRldik7CisKKwlpbnRlbF9jbGVhbnVwX2d0X3Bvd2Vyc2F2ZShkZXZf cHJpdik7CisKKwlpOTE1X21vZGVzZXRfdW5sb2FkKGRldik7CiAKIAkvKiBGcmVlIGVycm9yIHN0 YXRlIGFmdGVyIGludGVycnVwdHMgYXJlIGZ1bGx5IGRpc2FibGVkLiAqLwogCWNhbmNlbF9kZWxh eWVkX3dvcmtfc3luYygmZGV2X3ByaXYtPmdwdV9lcnJvci5oYW5nY2hlY2tfd29yayk7CmRpZmYg LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9kcnYuaAppbmRleCAwYjEwYTMwYjdkOTYuLjNkOTU2ZmJkYjE3NCAxMDA2NDQK LS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAorKysgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2Rydi5oCkBAIC0zNDM5LDYgKzM0MzksNyBAQCBta3dyaXRlX2RldmljZV9p bmZvKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIC8qIG1vZGVzZXR0aW5nICov CiBleHRlcm4gdm9pZCBpbnRlbF9tb2Rlc2V0X2luaXRfaHcoc3RydWN0IGRybV9kZXZpY2UgKmRl dik7CiBleHRlcm4gaW50IGludGVsX21vZGVzZXRfaW5pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2 KTsKK3ZvaWQgaW50ZWxfbW9kZXNldF9jbGVhbnVwX3ByZXBhcmUoc3RydWN0IGRybV9kZXZpY2Ug KmRldik7CiBleHRlcm4gdm9pZCBpbnRlbF9tb2Rlc2V0X2NsZWFudXAoc3RydWN0IGRybV9kZXZp Y2UgKmRldik7CiBleHRlcm4gaW50IGludGVsX2Nvbm5lY3Rvcl9yZWdpc3RlcihzdHJ1Y3QgZHJt X2Nvbm5lY3RvciAqKTsKIGV4dGVybiB2b2lkIGludGVsX2Nvbm5lY3Rvcl91bnJlZ2lzdGVyKHN0 cnVjdCBkcm1fY29ubmVjdG9yICopOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCmlu ZGV4IDUzZTdhN2U3NTM4NC4uNzZkMGQyYmIzYmFhIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf ZGlzcGxheS5jCkBAIC0yMTgsMTcgKzIxOCw2IEBAIGludCB2bHZfZ2V0X2Nja19jbG9ja19ocGxs KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAkJCQkgZGV2X3ByaXYtPmhwbGxf ZnJlcSk7CiB9CiAKLXN0YXRpYyB2b2lkIGludGVsX3VwZGF0ZV9jemNsayhzdHJ1Y3QgZHJtX2k5 MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCi17Ci0JaWYgKCEoSVNfVkFMTEVZVklFVyhkZXZfcHJpdikg fHwgSVNfQ0hFUlJZVklFVyhkZXZfcHJpdikpKQotCQlyZXR1cm47Ci0KLQlkZXZfcHJpdi0+Y3pj bGtfZnJlcSA9IHZsdl9nZXRfY2NrX2Nsb2NrX2hwbGwoZGV2X3ByaXYsICJjemNsayIsCi0JCQkJ CQkgICAgICBDQ0tfQ1pfQ0xPQ0tfQ09OVFJPTCk7Ci0KLQlEUk1fREVCVUdfRFJJVkVSKCJDWiBj bG9jayByYXRlOiAlZCBrSHpcbiIsIGRldl9wcml2LT5jemNsa19mcmVxKTsKLX0KLQogc3RhdGlj IGlubGluZSB1MzIgLyogdW5pdHMgb2YgMTAwTUh6ICovCiBpbnRlbF9mZGlfbGlua19mcmVxKHN0 cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAkJICAgIGNvbnN0IHN0cnVjdCBpbnRl bF9jcnRjX3N0YXRlICpwaXBlX2NvbmZpZykKQEAgLTE1MjY3LDcgKzE1MjU2LDYgQEAgaW50IGlu dGVsX21vZGVzZXRfaW5pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCWludGVsX3NoYXJlZF9k cGxsX2luaXQoZGV2KTsKIAlpbnRlbF91cGRhdGVfZmRpX3BsbF9mcmVxKGRldl9wcml2KTsKIAot CWludGVsX3VwZGF0ZV9jemNsayhkZXZfcHJpdik7CiAJaW50ZWxfbW9kZXNldF9pbml0X2h3KGRl dik7CiAKIAlpZiAoZGV2X3ByaXYtPm1heF9jZGNsa19mcmVxID09IDApCkBAIC0xNTk4Miw3ICsx NTk3MCw3IEBAIHN0YXRpYyB2b2lkIGludGVsX2hwZF9wb2xsX2Zpbmkoc3RydWN0IGRybV9kZXZp Y2UgKmRldikKIAlkcm1fY29ubmVjdG9yX2xpc3RfaXRlcl9lbmQoJmNvbm5faXRlcik7CiB9CiAK LXZvaWQgaW50ZWxfbW9kZXNldF9jbGVhbnVwKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCit2b2lk IGludGVsX21vZGVzZXRfY2xlYW51cF9wcmVwYXJlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiB7 CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShkZXYpOwogCkBA IC0xNTk5MCwxNSArMTU5NzgsMTEgQEAgdm9pZCBpbnRlbF9tb2Rlc2V0X2NsZWFudXAoc3RydWN0 IGRybV9kZXZpY2UgKmRldikKIAogCWZsdXNoX3dvcmsoJmRldl9wcml2LT5hdG9taWNfaGVscGVy LmZyZWVfd29yayk7CiAJV0FSTl9PTighbGxpc3RfZW1wdHkoJmRldl9wcml2LT5hdG9taWNfaGVs cGVyLmZyZWVfbGlzdCkpOworfQogCi0JaW50ZWxfZGlzYWJsZV9ndF9wb3dlcnNhdmUoZGV2X3By aXYpOwotCi0JLyoKLQkgKiBJbnRlcnJ1cHRzIGFuZCBwb2xsaW5nIGFzIHRoZSBmaXJzdCB0aGlu ZyB0byBhdm9pZCBjcmVhdGluZyBoYXZvYy4KLQkgKiBUb28gbXVjaCBzdHVmZiBoZXJlICh0dXJu aW5nIG9mIGNvbm5lY3RvcnMsIC4uLikgd291bGQKLQkgKiBleHBlcmllbmNlIGZhbmN5IHJhY2Vz IG90aGVyd2lzZS4KLQkgKi8KLQlpbnRlbF9pcnFfdW5pbnN0YWxsKGRldl9wcml2KTsKK3ZvaWQg aW50ZWxfbW9kZXNldF9jbGVhbnVwKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCit7CisJc3RydWN0 IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShkZXYpOwogCiAJLyoKIAkgKiBE dWUgdG8gdGhlIGhwZCBpcnEgc3Rvcm0gaGFuZGxpbmcgdGhlIGhvdHBsdWcgd29yayBjYW4gcmUt YXJtIHRoZQpAQCAtMTYwMjAsOCArMTYwMDQsNiBAQCB2b2lkIGludGVsX21vZGVzZXRfY2xlYW51 cChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCiAJaW50ZWxfY2xlYW51cF9vdmVybGF5KGRldl9w cml2KTsKIAotCWludGVsX2NsZWFudXBfZ3RfcG93ZXJzYXZlKGRldl9wcml2KTsKLQogCWludGVs X3RlYXJkb3duX2dtYnVzKGRldl9wcml2KTsKIAogCWRlc3Ryb3lfd29ya3F1ZXVlKGRldl9wcml2 LT5tb2Rlc2V0X3dxKTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Bt LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCmluZGV4IDAzNjU0ZjVmNjhjMy4u MzBjYTc3YjgxYjBjIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5j CisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMKQEAgLTc0MTksNiArNzQxOSwx NCBAQCBzdGF0aWMgdm9pZCB2bHZfaW5pdF9ncGxsX3JlZl9mcmVxKHN0cnVjdCBkcm1faTkxNV9w cml2YXRlICpkZXZfcHJpdikKIAkJCSBkZXZfcHJpdi0+Z3RfcG0ucnBzLmdwbGxfcmVmX2ZyZXEp OwogfQogCitzdGF0aWMgdm9pZCB2YWxsZXl2aWV3X3VwZGF0ZV9jemNsayhzdHJ1Y3QgZHJtX2k5 MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCit7CisJZGV2X3ByaXYtPmN6Y2xrX2ZyZXEgPSB2bHZfZ2V0 X2Nja19jbG9ja19ocGxsKGRldl9wcml2LCAiY3pjbGsiLAorCQkJCQkJICAgICAgQ0NLX0NaX0NM T0NLX0NPTlRST0wpOworCisJRFJNX0RFQlVHX0RSSVZFUigiQ1ogY2xvY2sgcmF0ZTogJWQga0h6 XG4iLCBkZXZfcHJpdi0+Y3pjbGtfZnJlcSk7Cit9CisKIHN0YXRpYyB2b2lkIHZhbGxleXZpZXdf aW5pdF9ndF9wb3dlcnNhdmUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogewog CXN0cnVjdCBpbnRlbF9ycHMgKnJwcyA9ICZkZXZfcHJpdi0+Z3RfcG0ucnBzOwpAQCAtNzQyNiw2 ICs3NDM0LDcgQEAgc3RhdGljIHZvaWQgdmFsbGV5dmlld19pbml0X2d0X3Bvd2Vyc2F2ZShzdHJ1 Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAKIAl2YWxsZXl2aWV3X3NldHVwX3BjdHgo ZGV2X3ByaXYpOwogCisJdmFsbGV5dmlld191cGRhdGVfY3pjbGsoZGV2X3ByaXYpOwogCXZsdl9p bml0X2dwbGxfcmVmX2ZyZXEoZGV2X3ByaXYpOwogCiAJdmFsID0gdmx2X3B1bml0X3JlYWQoZGV2 X3ByaXYsIFBVTklUX1JFR19HUFVfRlJFUV9TVFMpOwpAQCAtNzQ3Miw2ICs3NDgxLDcgQEAgc3Rh dGljIHZvaWQgY2hlcnJ5dmlld19pbml0X2d0X3Bvd2Vyc2F2ZShzdHJ1Y3QgZHJtX2k5MTVfcHJp dmF0ZSAqZGV2X3ByaXYpCiAKIAljaGVycnl2aWV3X3NldHVwX3BjdHgoZGV2X3ByaXYpOwogCisJ dmFsbGV5dmlld191cGRhdGVfY3pjbGsoZGV2X3ByaXYpOwogCXZsdl9pbml0X2dwbGxfcmVmX2Zy ZXEoZGV2X3ByaXYpOwogCiAJbXV0ZXhfbG9jaygmZGV2X3ByaXYtPnNiX2xvY2spOwotLSAKMi4x OC4wCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRl bC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6 Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK