From: =?UTF-8?q?Jos=C3=A9=20Roberto=20de=20Souza?= Subject: [PATCH 10/20] drm/i915: Do not call modeset related functions when display is disabled Date: Wed, 8 Aug 2018 17:15:56 -0700 Message-ID: <20180809001606.26876-10-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 6D8B96E621 for ; Thu, 9 Aug 2018 00:16:54 +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 Tm8gbmVlZCB0byBydW4gaTkxNV9sb2FkX21vZGVzZXRfaW5pdCgpIHdoZW4gbnVtX3BpcGVzID09 IDAgYWxzbwprbXMgZGVwZW5kcyBvbiB0aGluZ3MgaW5pdGlhbGl6ZWQgaW4gaTkxNV9sb2FkX21v ZGVzZXRfaW5pdCgpIHNvIG5vdAppbml0aWFsaXppbmcgaXQgdG9vLiBmYmRldiBhbmQgYXVkaW8g aGF2ZSBndWFyZHMgYWdhaW5zdApudW1fcGlwZXMgPT0gMCBidXQgbGV0cyBtb3ZlIGl0IHRvIHRo ZSBpZiBibG9jayB0byBtYWtlIGl0IGV4cGxpY2l0CnRvIHJlYWRlcnMuCgpBbHNvIGFzIHBsYW5l cywgQ1JUQ3MsIGVuY29kZXJzIGFuZCBjb25uZWN0b3JzIGFyZSBub3QgYmVpbmcgYWRkZWQKaXQg aXMgbmVjZXNzYXJ5IHRvIHVuc2V0IHRoZSBNT0RFU0VUIGRyaXZlciBmZWF0dXJlIG90aGVyd2lz ZSBpdAp3aWxsIGNyYXNoIHdoZW4gcmVnaXN0ZXJpbmcgZHJpdmVyIGluIGRybSwgYWxzbyBkaXNh YmxpbmcgQVRPTUlDIGFzCmRvIG5vdCBtYWtlIHNlbnNlIGhhdmUgQVRPTUlDIGFuZCBkbyBub3Qg aGF2ZSBNT0RFU0VULgoKVGhlcmUgaXMgbW9yZSBtb2Rlc2V0L2Rpc3BsYXkgY2FsbHMgdGhhdCBz dGlsbCBuZWVkcyB0byBiZSByZW1vdmVkLAp0aGlzIGlzIGEgaW5pdGlhbCB3b3JrLgoKU2lnbmVk LW9mZi1ieTogSm9zw6kgUm9iZXJ0byBkZSBTb3V6YSA8am9zZS5zb3V6YUBpbnRlbC5jb20+Ci0t LQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYyAgICAgICAgIHwgMTU3ICsrKysrKysr KysrKysrKy0tLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9zdXNwZW5kLmMgICAg IHwgIDI0ICsrLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3J1bnRpbWVfcG0uYyB8ICAg MyArLQogMyBmaWxlcyBjaGFuZ2VkLCAxMTQgaW5zZXJ0aW9ucygrKSwgNzAgZGVsZXRpb25zKC0p CgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYyBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMKaW5kZXggZTlhNmNjN2IzZWZkLi5lOTNiZTkxYTY3MDEg MTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMKKysrIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYwpAQCAtOTE3LDcgKzkxNyw4IEBAIHN0YXRpYyBpbnQg aTkxNV9kcml2ZXJfaW5pdF9lYXJseShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYs CiAJaW50ZWxfd29wY21faW5pdF9lYXJseSgmZGV2X3ByaXYtPndvcGNtKTsKIAlpbnRlbF91Y19p bml0X2Vhcmx5KGRldl9wcml2KTsKIAlpbnRlbF9wbV9zZXR1cChkZXZfcHJpdik7Ci0JaW50ZWxf aW5pdF9kcGlvKGRldl9wcml2KTsKKwlpZiAoSU5URUxfSU5GTyhkZXZfcHJpdiktPm51bV9waXBl cykKKwkJaW50ZWxfaW5pdF9kcGlvKGRldl9wcml2KTsKIAlyZXQgPSBpbnRlbF9wb3dlcl9kb21h aW5zX2luaXQoZGV2X3ByaXYpOwogCWlmIChyZXQgPCAwKQogCQlnb3RvIGVycl91YzsKQEAgLTky NSw4ICs5MjYsMTAgQEAgc3RhdGljIGludCBpOTE1X2RyaXZlcl9pbml0X2Vhcmx5KHN0cnVjdCBk cm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAlpbnRlbF9oYW5nY2hlY2tfaW5pdChkZXZfcHJp dik7CiAJaW50ZWxfaW5pdF9kaXNwbGF5X2hvb2tzKGRldl9wcml2KTsKIAlpbnRlbF9pbml0X2Ns b2NrX2dhdGluZ19ob29rcyhkZXZfcHJpdik7Ci0JaW50ZWxfaW5pdF9hdWRpb19ob29rcyhkZXZf cHJpdik7Ci0JaW50ZWxfZGlzcGxheV9jcmNfaW5pdChkZXZfcHJpdik7CisJaWYgKElOVEVMX0lO Rk8oZGV2X3ByaXYpLT5udW1fcGlwZXMpIHsKKwkJaW50ZWxfaW5pdF9hdWRpb19ob29rcyhkZXZf cHJpdik7CisJCWludGVsX2Rpc3BsYXlfY3JjX2luaXQoZGV2X3ByaXYpOworCX0KIAogCWludGVs X2RldGVjdF9wcmVwcm9kdWN0aW9uX2h3KGRldl9wcml2KTsKIApAQCAtMTI1OCwyMyArMTI2MSwy NiBAQCBzdGF0aWMgdm9pZCBpOTE1X2RyaXZlcl9yZWdpc3RlcihzdHJ1Y3QgZHJtX2k5MTVfcHJp dmF0ZSAqZGV2X3ByaXYpCiAJaWYgKElTX0dFTjUoZGV2X3ByaXYpKQogCQlpbnRlbF9ncHVfaXBz X2luaXQoZGV2X3ByaXYpOwogCi0JaW50ZWxfYXVkaW9faW5pdChkZXZfcHJpdik7CisJaWYgKElO VEVMX0lORk8oZGV2X3ByaXYpLT5udW1fcGlwZXMpIHsKKwkJaW50ZWxfYXVkaW9faW5pdChkZXZf cHJpdik7CiAKLQkvKgotCSAqIFNvbWUgcG9ydHMgcmVxdWlyZSBjb3JyZWN0bHkgc2V0LXVwIGhw ZCByZWdpc3RlcnMgZm9yIGRldGVjdGlvbiB0bwotCSAqIHdvcmsgcHJvcGVybHkgKGxlYWRpbmcg dG8gZ2hvc3QgY29ubmVjdGVkIGNvbm5lY3RvciBzdGF0dXMpLCBlLmcuIFZHQQotCSAqIG9uIGdt NDUuICBIZW5jZSB3ZSBjYW4gb25seSBzZXQgdXAgdGhlIGluaXRpYWwgZmJkZXYgY29uZmlnIGFm dGVyIGhwZAotCSAqIGlycXMgYXJlIGZ1bGx5IGVuYWJsZWQuIFdlIGRvIGl0IGxhc3Qgc28gdGhh dCB0aGUgYXN5bmMgY29uZmlnCi0JICogY2Fubm90IHJ1biBiZWZvcmUgdGhlIGNvbm5lY3RvcnMg YXJlIHJlZ2lzdGVyZWQuCi0JICovCi0JaW50ZWxfZmJkZXZfaW5pdGlhbF9jb25maWdfYXN5bmMo ZGV2KTsKKwkJLyoKKwkJICogU29tZSBwb3J0cyByZXF1aXJlIGNvcnJlY3RseSBzZXQtdXAgaHBk IHJlZ2lzdGVycyBmb3IKKwkJICogZGV0ZWN0aW9uIHRvIHdvcmsgcHJvcGVybHkgKGxlYWRpbmcg dG8gZ2hvc3QgY29ubmVjdGVkCisJCSAqIGNvbm5lY3RvciBzdGF0dXMpLCBlLmcuIFZHQSBvbiBn bTQ1LiAgSGVuY2Ugd2UgY2FuIG9ubHkgc2V0CisJCSAqIHVwIHRoZSBpbml0aWFsIGZiZGV2IGNv bmZpZyBhZnRlciBocGQgaXJxcyBhcmUgZnVsbHkgZW5hYmxlZC4KKwkJICogV2UgZG8gaXQgbGFz dCBzbyB0aGF0IHRoZSBhc3luYyBjb25maWcgY2Fubm90IHJ1biBiZWZvcmUgdGhlCisJCSAqIGNv bm5lY3RvcnMgYXJlIHJlZ2lzdGVyZWQuCisJCSAqLworCQlpbnRlbF9mYmRldl9pbml0aWFsX2Nv bmZpZ19hc3luYyhkZXYpOwogCi0JLyoKLQkgKiBXZSBuZWVkIHRvIGNvb3JkaW5hdGUgdGhlIGhv dHBsdWdzIHdpdGggdGhlIGFzeW5jaHJvbm91cyBmYmRldgotCSAqIGNvbmZpZ3VyYXRpb24sIGZv ciB3aGljaCB3ZSB1c2UgdGhlIGZiZGV2LT5hc3luY19jb29raWUuCi0JICovCi0JaWYgKElOVEVM X0lORk8oZGV2X3ByaXYpLT5udW1fcGlwZXMpCisJCS8qCisJCSAqIFdlIG5lZWQgdG8gY29vcmRp bmF0ZSB0aGUgaG90cGx1Z3Mgd2l0aCB0aGUgYXN5bmNocm9ub3VzCisJCSAqIGZiZGV2IGNvbmZp Z3VyYXRpb24sIGZvciB3aGljaCB3ZSB1c2UgdGhlCisJCSAqIGZiZGV2LT5hc3luY19jb29raWUu CisJCSAqLwogCQlkcm1fa21zX2hlbHBlcl9wb2xsX2luaXQoZGV2KTsKKwl9CiB9CiAKIC8qKgpA QCAtMTI4MywxNSArMTI4OSwxNyBAQCBzdGF0aWMgdm9pZCBpOTE1X2RyaXZlcl9yZWdpc3Rlcihz dHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAgKi8KIHN0YXRpYyB2b2lkIGk5MTVf ZHJpdmVyX3VucmVnaXN0ZXIoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogewot CWludGVsX2ZiZGV2X3VucmVnaXN0ZXIoZGV2X3ByaXYpOwotCWludGVsX2F1ZGlvX2RlaW5pdChk ZXZfcHJpdik7CisJaWYgKElOVEVMX0lORk8oZGV2X3ByaXYpLT5udW1fcGlwZXMpIHsKKwkJaW50 ZWxfZmJkZXZfdW5yZWdpc3RlcihkZXZfcHJpdik7CisJCWludGVsX2F1ZGlvX2RlaW5pdChkZXZf cHJpdik7CiAKLQkvKgotCSAqIEFmdGVyIGZsdXNoaW5nIHRoZSBmYmRldiAoaW5jbC4gYSBsYXRl IGFzeW5jIGNvbmZpZyB3aGljaCB3aWxsCi0JICogaGF2ZSBkZWxheWVkIHF1ZXVpbmcgb2YgYSBo b3RwbHVnIGV2ZW50KSwgdGhlbiBmbHVzaCB0aGUgaG90cGx1ZwotCSAqIGV2ZW50cy4KLQkgKi8K LQlkcm1fa21zX2hlbHBlcl9wb2xsX2ZpbmkoJmRldl9wcml2LT5kcm0pOworCQkvKgorCQkgKiBB ZnRlciBmbHVzaGluZyB0aGUgZmJkZXYgKGluY2wuIGEgbGF0ZSBhc3luYyBjb25maWcgd2hpY2gK KwkJICogd2lsbCBoYXZlIGRlbGF5ZWQgcXVldWluZyBvZiBhIGhvdHBsdWcgZXZlbnQpLCB0aGVu IGZsdXNoIHRoZQorCQkgKiBob3RwbHVnIGV2ZW50cy4KKwkJICovCisJCWRybV9rbXNfaGVscGVy X3BvbGxfZmluaSgmZGV2X3ByaXYtPmRybSk7CisJfQogCiAJaW50ZWxfZ3B1X2lwc190ZWFyZG93 bigpOwogCWFjcGlfdmlkZW9fdW5yZWdpc3RlcigpOwpAQCAtMTM0Myw2ICsxMzUxLDkgQEAgaW50 IGk5MTVfZHJpdmVyX2xvYWQoc3RydWN0IHBjaV9kZXYgKnBkZXYsIGNvbnN0IHN0cnVjdCBwY2lf ZGV2aWNlX2lkICplbnQpCiAJaWYgKCFpOTE1X21vZHBhcmFtcy5udWNsZWFyX3BhZ2VmbGlwICYm IG1hdGNoX2luZm8tPmdlbiA8IDUpCiAJCWRyaXZlci5kcml2ZXJfZmVhdHVyZXMgJj0gfkRSSVZF Ul9BVE9NSUM7CiAKKwlpZiAoaTkxNV9tb2RwYXJhbXMuZGlzYWJsZV9kaXNwbGF5KQorCQlkcml2 ZXIuZHJpdmVyX2ZlYXR1cmVzICY9IH4oRFJJVkVSX01PREVTRVQgfCBEUklWRVJfQVRPTUlDKTsK KwogCXJldCA9IC1FTk9NRU07CiAJZGV2X3ByaXYgPSBremFsbG9jKHNpemVvZigqZGV2X3ByaXYp LCBHRlBfS0VSTkVMKTsKIAlpZiAoZGV2X3ByaXYpCkBAIC0xNDAwLDkgKzE0MTEsMTEgQEAgaW50 IGk5MTVfZHJpdmVyX2xvYWQoc3RydWN0IHBjaV9kZXYgKnBkZXYsIGNvbnN0IHN0cnVjdCBwY2lf ZGV2aWNlX2lkICplbnQpCiAJaWYgKHJldCkKIAkJZ290byBjbGVhbnVwX2lycTsKIAotCXJldCA9 IGk5MTVfbG9hZF9tb2Rlc2V0X2luaXQoJmRldl9wcml2LT5kcm0pOwotCWlmIChyZXQgPCAwKQot CQlnb3RvIGNsZWFudXBfZ2VtOworCWlmIChJTlRFTF9JTkZPKGRldl9wcml2KS0+bnVtX3BpcGVz KSB7CisJCXJldCA9IGk5MTVfbG9hZF9tb2Rlc2V0X2luaXQoJmRldl9wcml2LT5kcm0pOworCQlp ZiAocmV0IDwgMCkKKwkJCWdvdG8gY2xlYW51cF9nZW07CisJfQogCiAJLyogaW50ZWxfcG93ZXJf ZG9tYWluc19pbml0X2h3KCkgY291bnRlciBwYXJ0ICAqLwogCWludGVsX2Rpc3BsYXlfc2V0X2lu aXRfcG93ZXIoZGV2X3ByaXYsIGZhbHNlKTsKQEAgLTE0NjksMTEgKzE0ODIsMTMgQEAgdm9pZCBp OTE1X2RyaXZlcl91bmxvYWQoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAogCWludGVsX2Rpc3Bs YXlfcG93ZXJfZ2V0KGRldl9wcml2LCBQT1dFUl9ET01BSU5fSU5JVCk7CiAKLQlkcm1fYXRvbWlj X2hlbHBlcl9zaHV0ZG93bihkZXYpOworCWlmIChJTlRFTF9JTkZPKGRldl9wcml2KS0+bnVtX3Bp cGVzKQorCQlkcm1fYXRvbWljX2hlbHBlcl9zaHV0ZG93bihkZXYpOwogCiAJaW50ZWxfZ3Z0X2Ns ZWFudXAoZGV2X3ByaXYpOwogCi0JaW50ZWxfbW9kZXNldF9jbGVhbnVwX3ByZXBhcmUoZGV2KTsK KwlpZiAoSU5URUxfSU5GTyhkZXZfcHJpdiktPm51bV9waXBlcykKKwkJaW50ZWxfbW9kZXNldF9j bGVhbnVwX3ByZXBhcmUoZGV2KTsKIAogCWludGVsX2Rpc2FibGVfZ3RfcG93ZXJzYXZlKGRldl9w cml2KTsKIApAQCAtMTQ4NCwxMSArMTQ5OSwxMyBAQCB2b2lkIGk5MTVfZHJpdmVyX3VubG9hZChz dHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCSAqLwogCWludGVsX2lycV91bmluc3RhbGwoZGV2X3By aXYpOwogCi0JaW50ZWxfbW9kZXNldF9jbGVhbnVwKGRldik7CisJaWYgKElOVEVMX0lORk8oZGV2 X3ByaXYpLT5udW1fcGlwZXMpCisJCWludGVsX21vZGVzZXRfY2xlYW51cChkZXYpOwogCiAJaW50 ZWxfY2xlYW51cF9ndF9wb3dlcnNhdmUoZGV2X3ByaXYpOwogCi0JaTkxNV9tb2Rlc2V0X3VubG9h ZChkZXYpOworCWlmIChJTlRFTF9JTkZPKGRldl9wcml2KS0+bnVtX3BpcGVzKQorCQlpOTE1X21v ZGVzZXRfdW5sb2FkKGRldik7CiAKIAkvKiBGcmVlIGVycm9yIHN0YXRlIGFmdGVyIGludGVycnVw dHMgYXJlIGZ1bGx5IGRpc2FibGVkLiAqLwogCWNhbmNlbF9kZWxheWVkX3dvcmtfc3luYygmZGV2 X3ByaXYtPmdwdV9lcnJvci5oYW5nY2hlY2tfd29yayk7CkBAIC0xNTQwLDggKzE1NTcsMTIgQEAg c3RhdGljIGludCBpOTE1X2RyaXZlcl9vcGVuKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHN0cnVj dCBkcm1fZmlsZSAqZmlsZSkKICAqLwogc3RhdGljIHZvaWQgaTkxNV9kcml2ZXJfbGFzdGNsb3Nl KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiB7Ci0JaW50ZWxfZmJkZXZfcmVzdG9yZV9tb2RlKGRl dik7Ci0JdmdhX3N3aXRjaGVyb29fcHJvY2Vzc19kZWxheWVkX3N3aXRjaCgpOworCXN0cnVjdCBk cm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoZGV2KTsKKworCWlmIChJTlRFTF9J TkZPKGRldl9wcml2KS0+bnVtX3BpcGVzKSB7CisJCWludGVsX2ZiZGV2X3Jlc3RvcmVfbW9kZShk ZXYpOworCQl2Z2Ffc3dpdGNoZXJvb19wcm9jZXNzX2RlbGF5ZWRfc3dpdGNoKCk7CisJfQogfQog CiBzdGF0aWMgdm9pZCBpOTE1X2RyaXZlcl9wb3N0Y2xvc2Uoc3RydWN0IGRybV9kZXZpY2UgKmRl diwgc3RydWN0IGRybV9maWxlICpmaWxlKQpAQCAtMTYxMSwxOSArMTYzMiwyNCBAQCBzdGF0aWMg aW50IGk5MTVfZHJtX3N1c3BlbmQoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAkvKiBXZSBkbyBh IGxvdCBvZiBwb2tpbmcgaW4gYSBsb3Qgb2YgcmVnaXN0ZXJzLCBtYWtlIHN1cmUgdGhleSB3b3Jr CiAJICogcHJvcGVybHkuICovCiAJaW50ZWxfZGlzcGxheV9zZXRfaW5pdF9wb3dlcihkZXZfcHJp diwgdHJ1ZSk7Ci0KLQlkcm1fa21zX2hlbHBlcl9wb2xsX2Rpc2FibGUoZGV2KTsKKwlpZiAoSU5U RUxfSU5GTyhkZXZfcHJpdiktPm51bV9waXBlcykKKwkJZHJtX2ttc19oZWxwZXJfcG9sbF9kaXNh YmxlKGRldik7CiAKIAlwY2lfc2F2ZV9zdGF0ZShwZGV2KTsKIAotCWludGVsX2Rpc3BsYXlfc3Vz cGVuZChkZXYpOworCWlmIChJTlRFTF9JTkZPKGRldl9wcml2KS0+bnVtX3BpcGVzKSB7CisJCWlu dGVsX2Rpc3BsYXlfc3VzcGVuZChkZXYpOwogCi0JaW50ZWxfZHBfbXN0X3N1c3BlbmQoZGV2X3By aXYpOworCQlpbnRlbF9kcF9tc3Rfc3VzcGVuZChkZXZfcHJpdik7CisJfQogCiAJaW50ZWxfcnVu dGltZV9wbV9kaXNhYmxlX2ludGVycnVwdHMoZGV2X3ByaXYpOwotCWludGVsX2hwZF9jYW5jZWxf d29yayhkZXZfcHJpdik7CiAKLQlpbnRlbF9zdXNwZW5kX2VuY29kZXJzKGRldl9wcml2KTsKKwlp ZiAoSU5URUxfSU5GTyhkZXZfcHJpdiktPm51bV9waXBlcykgeworCQlpbnRlbF9ocGRfY2FuY2Vs X3dvcmsoZGV2X3ByaXYpOworCisJCWludGVsX3N1c3BlbmRfZW5jb2RlcnMoZGV2X3ByaXYpOwor CX0KIAogCWludGVsX3N1c3BlbmRfaHcoZGV2X3ByaXYpOwogCkBAIC0xNjM2LDExICsxNjYyLDEz IEBAIHN0YXRpYyBpbnQgaTkxNV9kcm1fc3VzcGVuZChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQog CiAJaW50ZWxfb3ByZWdpb25fdW5yZWdpc3RlcihkZXZfcHJpdik7CiAKLQlpbnRlbF9mYmRldl9z ZXRfc3VzcGVuZChkZXYsIEZCSU5GT19TVEFURV9TVVNQRU5ERUQsIHRydWUpOworCWlmIChJTlRF TF9JTkZPKGRldl9wcml2KS0+bnVtX3BpcGVzKQorCQlpbnRlbF9mYmRldl9zZXRfc3VzcGVuZChk ZXYsIEZCSU5GT19TVEFURV9TVVNQRU5ERUQsIHRydWUpOwogCiAJZGV2X3ByaXYtPnN1c3BlbmRf Y291bnQrKzsKIAotCWludGVsX2Nzcl91Y29kZV9zdXNwZW5kKGRldl9wcml2KTsKKwlpZiAoSU5U RUxfSU5GTyhkZXZfcHJpdiktPm51bV9waXBlcykKKwkJaW50ZWxfY3NyX3Vjb2RlX3N1c3BlbmQo ZGV2X3ByaXYpOwogCiAJZW5hYmxlX3JwbV93YWtlcmVmX2Fzc2VydHMoZGV2X3ByaXYpOwogCkBA IC0xNzUxLDEwICsxNzc5LDEyIEBAIHN0YXRpYyBpbnQgaTkxNV9kcm1fcmVzdW1lKHN0cnVjdCBk cm1fZGV2aWNlICpkZXYpCiAJaWYgKHJldCkKIAkJRFJNX0VSUk9SKCJmYWlsZWQgdG8gcmUtZW5h YmxlIEdHVFRcbiIpOwogCi0JaW50ZWxfY3NyX3Vjb2RlX3Jlc3VtZShkZXZfcHJpdik7CisJaWYg KElOVEVMX0lORk8oZGV2X3ByaXYpLT5udW1fcGlwZXMpCisJCWludGVsX2Nzcl91Y29kZV9yZXN1 bWUoZGV2X3ByaXYpOwogCiAJaTkxNV9yZXN0b3JlX3N0YXRlKGRldl9wcml2KTsKLQlpbnRlbF9w cHNfdW5sb2NrX3JlZ3Nfd2EoZGV2X3ByaXYpOworCWlmIChJTlRFTF9JTkZPKGRldl9wcml2KS0+ bnVtX3BpcGVzKQorCQlpbnRlbF9wcHNfdW5sb2NrX3JlZ3Nfd2EoZGV2X3ByaXYpOwogCWludGVs X29wcmVnaW9uX3NldHVwKGRldl9wcml2KTsKIAogCWludGVsX2luaXRfcGNoX3JlZmNsayhkZXZf cHJpdik7CkBAIC0xNzcxLDcgKzE4MDEsOCBAQCBzdGF0aWMgaW50IGk5MTVfZHJtX3Jlc3VtZShz dHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCSAqLwogCWludGVsX3J1bnRpbWVfcG1fZW5hYmxlX2lu dGVycnVwdHMoZGV2X3ByaXYpOwogCi0JZHJtX21vZGVfY29uZmlnX3Jlc2V0KGRldik7CisJaWYg KElOVEVMX0lORk8oZGV2X3ByaXYpLT5udW1fcGlwZXMpCisJCWRybV9tb2RlX2NvbmZpZ19yZXNl dChkZXYpOwogCiAJaTkxNV9nZW1fcmVzdW1lKGRldl9wcml2KTsKIApAQCAtMTc3OSwyNyArMTgx MCwzMCBAQCBzdGF0aWMgaW50IGk5MTVfZHJtX3Jlc3VtZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2 KQogCWludGVsX2luaXRfY2xvY2tfZ2F0aW5nKGRldl9wcml2KTsKIAogCXNwaW5fbG9ja19pcnEo JmRldl9wcml2LT5pcnFfbG9jayk7Ci0JaWYgKGRldl9wcml2LT5kaXNwbGF5LmhwZF9pcnFfc2V0 dXApCisJaWYgKGRldl9wcml2LT5kaXNwbGF5LmhwZF9pcnFfc2V0dXAgJiYgSU5URUxfSU5GTyhk ZXZfcHJpdiktPm51bV9waXBlcykKIAkJZGV2X3ByaXYtPmRpc3BsYXkuaHBkX2lycV9zZXR1cChk ZXZfcHJpdik7CiAJc3Bpbl91bmxvY2tfaXJxKCZkZXZfcHJpdi0+aXJxX2xvY2spOwogCi0JaW50 ZWxfZHBfbXN0X3Jlc3VtZShkZXZfcHJpdik7CisJaWYgKElOVEVMX0lORk8oZGV2X3ByaXYpLT5u dW1fcGlwZXMpIHsKKwkJaW50ZWxfZHBfbXN0X3Jlc3VtZShkZXZfcHJpdik7CiAKLQlpbnRlbF9k aXNwbGF5X3Jlc3VtZShkZXYpOworCQlpbnRlbF9kaXNwbGF5X3Jlc3VtZShkZXYpOwogCi0JZHJt X2ttc19oZWxwZXJfcG9sbF9lbmFibGUoZGV2KTsKKwkJZHJtX2ttc19oZWxwZXJfcG9sbF9lbmFi bGUoZGV2KTsKIAotCS8qCi0JICogLi4uIGJ1dCBhbHNvIG5lZWQgdG8gbWFrZSBzdXJlIHRoYXQg aG90cGx1ZyBwcm9jZXNzaW5nCi0JICogZG9lc24ndCBjYXVzZSBoYXZvYy4gTGlrZSBpbiB0aGUg ZHJpdmVyIGxvYWQgY29kZSB3ZSBkb24ndAotCSAqIGJvdGhlciB3aXRoIHRoZSB0aW55IHJhY2Ug aGVyZSB3aGVyZSB3ZSBtaWdodCBsb3NlIGhvdHBsdWcKLQkgKiBub3RpZmljYXRpb25zLgotCSAq ICovCi0JaW50ZWxfaHBkX2luaXQoZGV2X3ByaXYpOworCQkvKgorCQkgKiAuLi4gYnV0IGFsc28g bmVlZCB0byBtYWtlIHN1cmUgdGhhdCBob3RwbHVnIHByb2Nlc3NpbmcKKwkJICogZG9lc24ndCBj YXVzZSBoYXZvYy4gTGlrZSBpbiB0aGUgZHJpdmVyIGxvYWQgY29kZSB3ZSBkb24ndAorCQkgKiBi b3RoZXIgd2l0aCB0aGUgdGlueSByYWNlIGhlcmUgd2hlcmUgd2UgbWlnaHQgbG9zZSBob3RwbHVn CisJCSAqIG5vdGlmaWNhdGlvbnMuCisJCSAqLworCQlpbnRlbF9ocGRfaW5pdChkZXZfcHJpdik7 CisJfQogCiAJaW50ZWxfb3ByZWdpb25fcmVnaXN0ZXIoZGV2X3ByaXYpOwogCi0JaW50ZWxfZmJk ZXZfc2V0X3N1c3BlbmQoZGV2LCBGQklORk9fU1RBVEVfUlVOTklORywgZmFsc2UpOworCWlmIChJ TlRFTF9JTkZPKGRldl9wcml2KS0+bnVtX3BpcGVzKQorCQlpbnRlbF9mYmRldl9zZXRfc3VzcGVu ZChkZXYsIEZCSU5GT19TVEFURV9SVU5OSU5HLCBmYWxzZSk7CiAKIAlpbnRlbF9vcHJlZ2lvbl9u b3RpZnlfYWRhcHRlcihkZXZfcHJpdiwgUENJX0QwKTsKIApAQCAtMjcwMCw3ICsyNzM0LDggQEAg c3RhdGljIGludCBpbnRlbF9ydW50aW1lX3N1c3BlbmQoc3RydWN0IGRldmljZSAqa2RldikKIAog CWFzc2VydF9mb3JjZXdha2VzX2luYWN0aXZlKGRldl9wcml2KTsKIAotCWlmICghSVNfVkFMTEVZ VklFVyhkZXZfcHJpdikgJiYgIUlTX0NIRVJSWVZJRVcoZGV2X3ByaXYpKQorCWlmIChJTlRFTF9J TkZPKGRldl9wcml2KS0+bnVtX3BpcGVzICYmICghSVNfVkFMTEVZVklFVyhkZXZfcHJpdikgJiYK KwkJCQkJCSFJU19DSEVSUllWSUVXKGRldl9wcml2KSkpCiAJCWludGVsX2hwZF9wb2xsX2luaXQo ZGV2X3ByaXYpOwogCiAJRFJNX0RFQlVHX0tNUygiRGV2aWNlIHN1c3BlbmRlZFxuIik7CkBAIC0y NzU3LDEwICsyNzkyLDEyIEBAIHN0YXRpYyBpbnQgaW50ZWxfcnVudGltZV9yZXN1bWUoc3RydWN0 IGRldmljZSAqa2RldikKIAkgKiBwb3dlciB3ZWxsLCBzbyBocGQgaXMgcmVpbml0aWFsaXplZCBm cm9tIHRoZXJlLiBGb3IKIAkgKiBldmVyeW9uZSBlbHNlIGRvIGl0IGhlcmUuCiAJICovCi0JaWYg KCFJU19WQUxMRVlWSUVXKGRldl9wcml2KSAmJiAhSVNfQ0hFUlJZVklFVyhkZXZfcHJpdikpCisJ aWYgKElOVEVMX0lORk8oZGV2X3ByaXYpLT5udW1fcGlwZXMgJiYgKCFJU19WQUxMRVlWSUVXKGRl dl9wcml2KSAmJgorCQkJCQkJIUlTX0NIRVJSWVZJRVcoZGV2X3ByaXYpKSkKIAkJaW50ZWxfaHBk X2luaXQoZGV2X3ByaXYpOwogCi0JaW50ZWxfZW5hYmxlX2lwYyhkZXZfcHJpdik7CisJaWYgKElO VEVMX0lORk8oZGV2X3ByaXYpLT5udW1fcGlwZXMpCisJCWludGVsX2VuYWJsZV9pcGMoZGV2X3By aXYpOwogCiAJZW5hYmxlX3JwbV93YWtlcmVmX2Fzc2VydHMoZGV2X3ByaXYpOwogCmRpZmYgLS1n aXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3N1c3BlbmQuYyBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfc3VzcGVuZC5jCmluZGV4IDhmM2FhNGRjMGM5OC4uZjY5Nzg2NTIzNmE2IDEw MDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3N1c3BlbmQuYworKysgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3N1c3BlbmQuYwpAQCAtNjMsMTEgKzYzLDEzIEBAIGludCBp OTE1X3NhdmVfc3RhdGUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogCiAJbXV0 ZXhfbG9jaygmZGV2X3ByaXYtPmRybS5zdHJ1Y3RfbXV0ZXgpOwogCi0JaTkxNV9zYXZlX2Rpc3Bs YXkoZGV2X3ByaXYpOworCWlmIChJTlRFTF9JTkZPKGRldl9wcml2KS0+bnVtX3BpcGVzKSB7CisJ CWk5MTVfc2F2ZV9kaXNwbGF5KGRldl9wcml2KTsKIAotCWlmIChJU19HRU40KGRldl9wcml2KSkK LQkJcGNpX3JlYWRfY29uZmlnX3dvcmQocGRldiwgR0NER01CVVMsCi0JCQkJICAgICAmZGV2X3By aXYtPnJlZ2ZpbGUuc2F2ZUdDREdNQlVTKTsKKwkJaWYgKElTX0dFTjQoZGV2X3ByaXYpKQorCQkJ cGNpX3JlYWRfY29uZmlnX3dvcmQocGRldiwgR0NER01CVVMsCisJCQkJCSAgICAgJmRldl9wcml2 LT5yZWdmaWxlLnNhdmVHQ0RHTUJVUyk7CisJfQogCiAJLyogQ2FjaGUgbW9kZSBzdGF0ZSAqLwog CWlmIChJTlRFTF9HRU4oZGV2X3ByaXYpIDwgNykKQEAgLTEwOCwxMCArMTEwLDEzIEBAIGludCBp OTE1X3Jlc3RvcmVfc3RhdGUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogCiAJ bXV0ZXhfbG9jaygmZGV2X3ByaXYtPmRybS5zdHJ1Y3RfbXV0ZXgpOwogCi0JaWYgKElTX0dFTjQo ZGV2X3ByaXYpKQotCQlwY2lfd3JpdGVfY29uZmlnX3dvcmQocGRldiwgR0NER01CVVMsCi0JCQkJ ICAgICAgZGV2X3ByaXYtPnJlZ2ZpbGUuc2F2ZUdDREdNQlVTKTsKLQlpOTE1X3Jlc3RvcmVfZGlz cGxheShkZXZfcHJpdik7CisJaWYgKElOVEVMX0lORk8oZGV2X3ByaXYpLT5udW1fcGlwZXMpIHsK KwkJaWYgKElTX0dFTjQoZGV2X3ByaXYpKQorCQkJcGNpX3dyaXRlX2NvbmZpZ193b3JkKHBkZXYs IEdDREdNQlVTLAorCQkJCQkgICAgICBkZXZfcHJpdi0+cmVnZmlsZS5zYXZlR0NER01CVVMpOwor CisJCWk5MTVfcmVzdG9yZV9kaXNwbGF5KGRldl9wcml2KTsKKwl9CiAKIAkvKiBDYWNoZSBtb2Rl IHN0YXRlICovCiAJaWYgKElOVEVMX0dFTihkZXZfcHJpdikgPCA3KQpAQCAtMTQzLDcgKzE0OCw4 IEBAIGludCBpOTE1X3Jlc3RvcmVfc3RhdGUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9w cml2KQogCiAJbXV0ZXhfdW5sb2NrKCZkZXZfcHJpdi0+ZHJtLnN0cnVjdF9tdXRleCk7CiAKLQlp bnRlbF9pMmNfcmVzZXQoZGV2X3ByaXYpOworCWlmIChJTlRFTF9JTkZPKGRldl9wcml2KS0+bnVt X3BpcGVzKQorCQlpbnRlbF9pMmNfcmVzZXQoZGV2X3ByaXYpOwogCiAJcmV0dXJuIDA7CiB9CmRp ZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ydW50aW1lX3BtLmMgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ydW50aW1lX3BtLmMKaW5kZXggOTU3NWI3NDAyMTcyLi45 NzE3OGQ1MTI4NTIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3J1bnRp bWVfcG0uYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ydW50aW1lX3BtLmMKQEAg LTEwNDksNyArMTA0OSw4IEBAIHN0YXRpYyB2b2lkIHZsdl9kaXNwbGF5X3Bvd2VyX3dlbGxfZGVp bml0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAlpbnRlbF9wb3dlcl9zZXF1 ZW5jZXJfcmVzZXQoZGV2X3ByaXYpOwogCiAJLyogUHJldmVudCB1cyBmcm9tIHJlLWVuYWJsaW5n IHBvbGxpbmcgb24gYWNjaWRlbnQgaW4gbGF0ZSBzdXNwZW5kICovCi0JaWYgKCFkZXZfcHJpdi0+ ZHJtLmRldi0+cG93ZXIuaXNfc3VzcGVuZGVkKQorCWlmIChJTlRFTF9JTkZPKGRldl9wcml2KS0+ bnVtX3BpcGVzICYmCisJICAgICFkZXZfcHJpdi0+ZHJtLmRldi0+cG93ZXIuaXNfc3VzcGVuZGVk KQogCQlpbnRlbF9ocGRfcG9sbF9pbml0KGRldl9wcml2KTsKIH0KIAotLSAKMi4xOC4wCgpfX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFp bGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5m cmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK