From: Subject: [PATCH 3/6] drm/amd/display: Unify DRM state variable namings. Date: Thu, 12 Oct 2017 17:15:08 -0400 Message-ID: <1507842911-16975-4-git-send-email-sunpeng.li@amd.com> References: <1507842911-16975-1-git-send-email-sunpeng.li@amd.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1507842911-16975-1-git-send-email-sunpeng.li@amd.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: airlied@gmail.com, amd-gfx@lists.freedesktop.org Cc: "Leo (Sunpeng) Li" , dri-devel@lists.freedesktop.org List-Id: amd-gfx.lists.freedesktop.org RnJvbTogIkxlbyAoU3VucGVuZykgTGkiIDxzdW5wZW5nLmxpQGFtZC5jb20+CgpVc2UgbmV3Xypf c3RhdGUgYW5kIG9sZF8qX3N0YXRlIGZvciB0aGVpciByZXNwZWN0aXZlIG5ldy9vbGQgRFJNIG9i amVjdApzdGF0ZXMuCgpTaWduZWQtb2ZmLWJ5OiBMZW8gKFN1bnBlbmcpIExpIDxzdW5wZW5nLmxp QGFtZC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2FtZGdwdV9kbS9hbWRn cHVfZG0uYyB8IDgwICsrKysrKysrKysrLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgNDAg aW5zZXJ0aW9ucygrKSwgNDAgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUv ZHJtL2FtZC9kaXNwbGF5L2FtZGdwdV9kbS9hbWRncHVfZG0uYyBiL2RyaXZlcnMvZ3B1L2RybS9h bWQvZGlzcGxheS9hbWRncHVfZG0vYW1kZ3B1X2RtLmMKaW5kZXggZDQ0MjZiMy4uZmUwYjY1OCAx MDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2FtZGdwdV9kbS9hbWRncHVf ZG0uYworKysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvYW1kZ3B1X2RtL2FtZGdwdV9k bS5jCkBAIC01NzMsMTIgKzU3MywxMiBAQCBzdHJ1Y3QgYW1kZ3B1X2RtX2Nvbm5lY3RvciAqYW1k Z3B1X2RtX2ZpbmRfZmlyc3RfY3JjdF9tYXRjaGluZ19jb25uZWN0b3IoCiAJc3RydWN0IGRybV9j cnRjICpjcnRjKQogewogCXVpbnQzMl90IGk7Ci0Jc3RydWN0IGRybV9jb25uZWN0b3Jfc3RhdGUg KmNvbm5fc3RhdGU7CisJc3RydWN0IGRybV9jb25uZWN0b3Jfc3RhdGUgKm5ld19jb25fc3RhdGU7 CiAJc3RydWN0IGRybV9jb25uZWN0b3IgKmNvbm5lY3RvcjsKIAlzdHJ1Y3QgZHJtX2NydGMgKmNy dGNfZnJvbV9zdGF0ZTsKIAotCWZvcl9lYWNoX25ld19jb25uZWN0b3JfaW5fc3RhdGUoc3RhdGUs IGNvbm5lY3RvciwgY29ubl9zdGF0ZSwgaSkgewotCQljcnRjX2Zyb21fc3RhdGUgPSBjb25uX3N0 YXRlLT5jcnRjOworCWZvcl9lYWNoX25ld19jb25uZWN0b3JfaW5fc3RhdGUoc3RhdGUsIGNvbm5l Y3RvciwgbmV3X2Nvbl9zdGF0ZSwgaSkgeworCQljcnRjX2Zyb21fc3RhdGUgPSBuZXdfY29uX3N0 YXRlLT5jcnRjOwogCiAJCWlmIChjcnRjX2Zyb21fc3RhdGUgPT0gY3J0YykKIAkJCXJldHVybiB0 b19hbWRncHVfZG1fY29ubmVjdG9yKGNvbm5lY3Rvcik7CkBAIC02MDgsNyArNjA4LDcgQEAgaW50 IGFtZGdwdV9kbV9kaXNwbGF5X3Jlc3VtZShzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldikKIAlz dHJ1Y3QgYW1kZ3B1X2RtX2Nvbm5lY3RvciAqYWNvbm5lY3RvcjsKIAlzdHJ1Y3QgZHJtX2Nvbm5l Y3RvciAqY29ubmVjdG9yOwogCXN0cnVjdCBkcm1fY3J0YyAqY3J0YzsKLQlzdHJ1Y3QgZHJtX2Ny dGNfc3RhdGUgKmNydGNfc3RhdGU7CisJc3RydWN0IGRybV9jcnRjX3N0YXRlICpuZXdfY3J0Y19z dGF0ZTsKIAlpbnQgcmV0ID0gMDsKIAlpbnQgaTsKIApAQCAtNjQ0LDggKzY0NCw4IEBAIGludCBh bWRncHVfZG1fZGlzcGxheV9yZXN1bWUoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYpCiAJfQog CiAJLyogRm9yY2UgbW9kZSBzZXQgaW4gYXRvbWljIGNvbWl0ICovCi0JZm9yX2VhY2hfbmV3X2Ny dGNfaW5fc3RhdGUoYWRldi0+ZG0uY2FjaGVkX3N0YXRlLCBjcnRjLCBjcnRjX3N0YXRlLCBpKQot CQkJY3J0Y19zdGF0ZS0+YWN0aXZlX2NoYW5nZWQgPSB0cnVlOworCWZvcl9lYWNoX25ld19jcnRj X2luX3N0YXRlKGFkZXYtPmRtLmNhY2hlZF9zdGF0ZSwgY3J0YywgbmV3X2NydGNfc3RhdGUsIGkp CisJCW5ld19jcnRjX3N0YXRlLT5hY3RpdmVfY2hhbmdlZCA9IHRydWU7CiAKIAlyZXQgPSBkcm1f YXRvbWljX2hlbHBlcl9yZXN1bWUoZGRldiwgYWRldi0+ZG0uY2FjaGVkX3N0YXRlKTsKIApAQCAt Mzk3MSw3ICszOTcxLDcgQEAgaW50IGFtZGdwdV9kbV9hdG9taWNfY29tbWl0KAogCQlib29sIG5v bmJsb2NrKQogewogCXN0cnVjdCBkcm1fY3J0YyAqY3J0YzsKLQlzdHJ1Y3QgZHJtX2NydGNfc3Rh dGUgKm9sZF9jcnRjX3N0YXRlLCAqbmV3X3N0YXRlOworCXN0cnVjdCBkcm1fY3J0Y19zdGF0ZSAq b2xkX2NydGNfc3RhdGUsICpuZXdfY3J0Y19zdGF0ZTsKIAlzdHJ1Y3QgYW1kZ3B1X2RldmljZSAq YWRldiA9IGRldi0+ZGV2X3ByaXZhdGU7CiAJaW50IGk7CiAKQEAgLTM5ODIsMTEgKzM5ODIsMTEg QEAgaW50IGFtZGdwdV9kbV9hdG9taWNfY29tbWl0KAogCSAqIGl0IHdpbGwgdXBkYXRlIGNydGMt PmRtX2NydGNfc3RhdGUtPnN0cmVhbSBwb2ludGVyIHdoaWNoIGlzIHVzZWQgaW4KIAkgKiB0aGUg SVNScy4KIAkgKi8KLQlmb3JfZWFjaF9vbGRuZXdfY3J0Y19pbl9zdGF0ZShzdGF0ZSwgY3J0Yywg b2xkX2NydGNfc3RhdGUsIG5ld19zdGF0ZSwgaSkgeworCWZvcl9lYWNoX29sZG5ld19jcnRjX2lu X3N0YXRlKHN0YXRlLCBjcnRjLCBvbGRfY3J0Y19zdGF0ZSwgbmV3X2NydGNfc3RhdGUsIGkpIHsK IAkJc3RydWN0IGRtX2NydGNfc3RhdGUgKm9sZF9hY3J0Y19zdGF0ZSA9IHRvX2RtX2NydGNfc3Rh dGUob2xkX2NydGNfc3RhdGUpOwogCQlzdHJ1Y3QgYW1kZ3B1X2NydGMgKmFjcnRjID0gdG9fYW1k Z3B1X2NydGMoY3J0Yyk7CiAKLQkJaWYgKGRybV9hdG9taWNfY3J0Y19uZWVkc19tb2Rlc2V0KG5l d19zdGF0ZSkgJiYgb2xkX2FjcnRjX3N0YXRlLT5zdHJlYW0pCisJCWlmIChkcm1fYXRvbWljX2Ny dGNfbmVlZHNfbW9kZXNldChuZXdfY3J0Y19zdGF0ZSkgJiYgb2xkX2FjcnRjX3N0YXRlLT5zdHJl YW0pCiAJCQltYW5hZ2VfZG1faW50ZXJydXB0cyhhZGV2LCBhY3J0YywgZmFsc2UpOwogCX0KIApA QCAtNDAxMSw3ICs0MDExLDcgQEAgdm9pZCBhbWRncHVfZG1fYXRvbWljX2NvbW1pdF90YWlsKAog CXVuc2lnbmVkIGxvbmcgZmxhZ3M7CiAJYm9vbCB3YWl0X2Zvcl92YmxhbmsgPSB0cnVlOwogCXN0 cnVjdCBkcm1fY29ubmVjdG9yICpjb25uZWN0b3I7Ci0Jc3RydWN0IGRybV9jb25uZWN0b3Jfc3Rh dGUgKm9sZF9jb25uX3N0YXRlLCAqbmV3X2Nvbl9zdGF0ZTsKKwlzdHJ1Y3QgZHJtX2Nvbm5lY3Rv cl9zdGF0ZSAqb2xkX2Nvbl9zdGF0ZSwgKm5ld19jb25fc3RhdGU7CiAJc3RydWN0IGRtX2NydGNf c3RhdGUgKm9sZF9hY3J0Y19zdGF0ZSwgKm5ld19hY3J0Y19zdGF0ZTsKIAogCWRybV9hdG9taWNf aGVscGVyX3VwZGF0ZV9sZWdhY3lfbW9kZXNldF9zdGF0ZShkZXYsIHN0YXRlKTsKQEAgLTQxNDUs OSArNDE0NSw5IEBAIHZvaWQgYW1kZ3B1X2RtX2F0b21pY19jb21taXRfdGFpbCgKIAl9CiAKIAkv KiBIYW5kbGUgc2NhbGluZyBhbmQgdW5kZXJzYWNuIGNoYW5nZXMqLwotCWZvcl9lYWNoX29sZG5l d19jb25uZWN0b3JfaW5fc3RhdGUoc3RhdGUsIGNvbm5lY3Rvciwgb2xkX2Nvbm5fc3RhdGUsIG5l d19jb25fc3RhdGUsIGkpIHsKKwlmb3JfZWFjaF9vbGRuZXdfY29ubmVjdG9yX2luX3N0YXRlKHN0 YXRlLCBjb25uZWN0b3IsIG9sZF9jb25fc3RhdGUsIG5ld19jb25fc3RhdGUsIGkpIHsKIAkJc3Ry dWN0IGRtX2Nvbm5lY3Rvcl9zdGF0ZSAqY29uX25ld19zdGF0ZSA9IHRvX2RtX2Nvbm5lY3Rvcl9z dGF0ZShuZXdfY29uX3N0YXRlKTsKLQkJc3RydWN0IGRtX2Nvbm5lY3Rvcl9zdGF0ZSAqY29uX29s ZF9zdGF0ZSA9IHRvX2RtX2Nvbm5lY3Rvcl9zdGF0ZShvbGRfY29ubl9zdGF0ZSk7CisJCXN0cnVj dCBkbV9jb25uZWN0b3Jfc3RhdGUgKmNvbl9vbGRfc3RhdGUgPSB0b19kbV9jb25uZWN0b3Jfc3Rh dGUob2xkX2Nvbl9zdGF0ZSk7CiAJCXN0cnVjdCBhbWRncHVfY3J0YyAqYWNydGMgPSB0b19hbWRn cHVfY3J0Yyhjb25fbmV3X3N0YXRlLT5iYXNlLmNydGMpOwogCQlzdHJ1Y3QgZGNfc3RyZWFtX3N0 YXR1cyAqc3RhdHVzID0gTlVMTDsKIApAQCAtNDM3NSw3ICs0Mzc1LDcgQEAgc3RhdGljIGludCBk bV91cGRhdGVfY3J0Y3Nfc3RhdGUoCiAJCWJvb2wgKmxvY2tfYW5kX3ZhbGlkYXRpb25fbmVlZGVk KQogewogCXN0cnVjdCBkcm1fY3J0YyAqY3J0YzsKLQlzdHJ1Y3QgZHJtX2NydGNfc3RhdGUgKm9s ZF9jcnRjX3N0YXRlLCAqY3J0Y19zdGF0ZTsKKwlzdHJ1Y3QgZHJtX2NydGNfc3RhdGUgKm9sZF9j cnRjX3N0YXRlLCAqbmV3X2NydGNfc3RhdGU7CiAJaW50IGk7CiAJc3RydWN0IGRtX2NydGNfc3Rh dGUgKm9sZF9hY3J0Y19zdGF0ZSwgKm5ld19hY3J0Y19zdGF0ZTsKIAlzdHJ1Y3QgZG1fYXRvbWlj X3N0YXRlICpkbV9zdGF0ZSA9IHRvX2RtX2F0b21pY19zdGF0ZShzdGF0ZSk7CkBAIC00Mzg0LDM0 ICs0Mzg0LDM0IEBAIHN0YXRpYyBpbnQgZG1fdXBkYXRlX2NydGNzX3N0YXRlKAogCiAJLypUT0RP IE1vdmUgdGhpcyBjb2RlIGludG8gZG1fY3J0Y19hdG9taWNfY2hlY2sgb25jZSB3ZSBnZXQgcmlk IG9mIGRjX3ZhbGlkYXRpb25fc2V0ICovCiAJLyogdXBkYXRlIGNoYW5nZWQgaXRlbXMgKi8KLQlm b3JfZWFjaF9vbGRuZXdfY3J0Y19pbl9zdGF0ZShzdGF0ZSwgY3J0Yywgb2xkX2NydGNfc3RhdGUs IGNydGNfc3RhdGUsIGkpIHsKKwlmb3JfZWFjaF9vbGRuZXdfY3J0Y19pbl9zdGF0ZShzdGF0ZSwg Y3J0Yywgb2xkX2NydGNfc3RhdGUsIG5ld19jcnRjX3N0YXRlLCBpKSB7CiAJCXN0cnVjdCBhbWRn cHVfY3J0YyAqYWNydGMgPSBOVUxMOwogCQlzdHJ1Y3QgYW1kZ3B1X2RtX2Nvbm5lY3RvciAqYWNv bm5lY3RvciA9IE5VTEw7Ci0JCXN0cnVjdCBkcm1fY29ubmVjdG9yX3N0YXRlICpjb25uX3N0YXRl ID0gTlVMTDsKKwkJc3RydWN0IGRybV9jb25uZWN0b3Jfc3RhdGUgKm5ld19jb25fc3RhdGUgPSBO VUxMOwogCQlzdHJ1Y3QgZG1fY29ubmVjdG9yX3N0YXRlICpkbV9jb25uX3N0YXRlID0gTlVMTDsK IAogCQluZXdfc3RyZWFtID0gTlVMTDsKIAogCQlvbGRfYWNydGNfc3RhdGUgPSB0b19kbV9jcnRj X3N0YXRlKG9sZF9jcnRjX3N0YXRlKTsKLQkJbmV3X2FjcnRjX3N0YXRlID0gdG9fZG1fY3J0Y19z dGF0ZShjcnRjX3N0YXRlKTsKKwkJbmV3X2FjcnRjX3N0YXRlID0gdG9fZG1fY3J0Y19zdGF0ZShu ZXdfY3J0Y19zdGF0ZSk7CiAJCWFjcnRjID0gdG9fYW1kZ3B1X2NydGMoY3J0Yyk7CiAKIAkJYWNv bm5lY3RvciA9IGFtZGdwdV9kbV9maW5kX2ZpcnN0X2NyY3RfbWF0Y2hpbmdfY29ubmVjdG9yKHN0 YXRlLCBjcnRjKTsKIAogCQkvKiBUT0RPIFRoaXMgaGFjayBzaG91bGQgZ28gYXdheSAqLwogCQlp ZiAoYWNvbm5lY3RvcikgewotCQkJY29ubl9zdGF0ZSA9IGRybV9hdG9taWNfZ2V0X2Nvbm5lY3Rv cl9zdGF0ZShzdGF0ZSwKLQkJCQkJCQkJICAgICZhY29ubmVjdG9yLT5iYXNlKTsKKwkJCW5ld19j b25fc3RhdGUgPSBkcm1fYXRvbWljX2dldF9jb25uZWN0b3Jfc3RhdGUoc3RhdGUsCisgCQkJCQkJ CQkgICAgJmFjb25uZWN0b3ItPmJhc2UpOwogCi0JCQlpZiAoSVNfRVJSKGNvbm5fc3RhdGUpKSB7 Ci0JCQkJcmV0ID0gUFRSX0VSUl9PUl9aRVJPKGNvbm5fc3RhdGUpOworCQkJaWYgKElTX0VSUihu ZXdfY29uX3N0YXRlKSkgeworCQkJCXJldCA9IFBUUl9FUlJfT1JfWkVSTyhuZXdfY29uX3N0YXRl KTsKIAkJCQlicmVhazsKIAkJCX0KIAotCQkJZG1fY29ubl9zdGF0ZSA9IHRvX2RtX2Nvbm5lY3Rv cl9zdGF0ZShjb25uX3N0YXRlKTsKKwkJCWRtX2Nvbm5fc3RhdGUgPSB0b19kbV9jb25uZWN0b3Jf c3RhdGUobmV3X2Nvbl9zdGF0ZSk7CiAKIAkJCW5ld19zdHJlYW0gPSBjcmVhdGVfc3RyZWFtX2Zv cl9zaW5rKGFjb25uZWN0b3IsCi0JCQkJCQkJICAgICZjcnRjX3N0YXRlLT5tb2RlLAorCQkJCQkJ CSAgICAgJm5ld19jcnRjX3N0YXRlLT5tb2RlLAogCQkJCQkJCSAgICBkbV9jb25uX3N0YXRlKTsK IAogCQkJLyoKQEAgLTQ0MzEsMTQgKzQ0MzEsMTQgQEAgc3RhdGljIGludCBkbV91cGRhdGVfY3J0 Y3Nfc3RhdGUoCiAJCWlmIChkY19pc19zdHJlYW1fdW5jaGFuZ2VkKG5ld19zdHJlYW0sCiAJCQkJ b2xkX2FjcnRjX3N0YXRlLT5zdHJlYW0pKSB7CiAKLQkJCQljcnRjX3N0YXRlLT5tb2RlX2NoYW5n ZWQgPSBmYWxzZTsKKwkJCW5ld19jcnRjX3N0YXRlLT5tb2RlX2NoYW5nZWQgPSBmYWxzZTsKIAot CQkJCURSTV9ERUJVR19EUklWRVIoIk1vZGUgY2hhbmdlIG5vdCByZXF1aXJlZCwgc2V0dGluZyBt b2RlX2NoYW5nZWQgdG8gJWQiLAotCQkJCQkgICAgICBjcnRjX3N0YXRlLT5tb2RlX2NoYW5nZWQp OworCQkJRFJNX0RFQlVHX0RSSVZFUigiTW9kZSBjaGFuZ2Ugbm90IHJlcXVpcmVkLCBzZXR0aW5n IG1vZGVfY2hhbmdlZCB0byAlZCIsCisJCQkJCW5ld19jcnRjX3N0YXRlLT5tb2RlX2NoYW5nZWQp OwogCQl9CiAKIAotCQlpZiAoIWRybV9hdG9taWNfY3J0Y19uZWVkc19tb2Rlc2V0KGNydGNfc3Rh dGUpKQorCQlpZiAoIWRybV9hdG9taWNfY3J0Y19uZWVkc19tb2Rlc2V0KG5ld19jcnRjX3N0YXRl KSkKIAkJCWdvdG8gbmV4dF9jcnRjOwogCiAJCURSTV9ERUJVR19EUklWRVIoCkBAIC00NDQ2LDEy ICs0NDQ2LDEyIEBAIHN0YXRpYyBpbnQgZG1fdXBkYXRlX2NydGNzX3N0YXRlKAogCQkJInBsYW5l c19jaGFuZ2VkOiVkLCBtb2RlX2NoYW5nZWQ6JWQsYWN0aXZlX2NoYW5nZWQ6JWQsIgogCQkJImNv bm5lY3RvcnNfY2hhbmdlZDolZFxuIiwKIAkJCWFjcnRjLT5jcnRjX2lkLAotCQkJY3J0Y19zdGF0 ZS0+ZW5hYmxlLAotCQkJY3J0Y19zdGF0ZS0+YWN0aXZlLAotCQkJY3J0Y19zdGF0ZS0+cGxhbmVz X2NoYW5nZWQsCi0JCQljcnRjX3N0YXRlLT5tb2RlX2NoYW5nZWQsCi0JCQljcnRjX3N0YXRlLT5h Y3RpdmVfY2hhbmdlZCwKLQkJCWNydGNfc3RhdGUtPmNvbm5lY3RvcnNfY2hhbmdlZCk7CisJCQlu ZXdfY3J0Y19zdGF0ZS0+ZW5hYmxlLAorCQkJbmV3X2NydGNfc3RhdGUtPmFjdGl2ZSwKKwkJCW5l d19jcnRjX3N0YXRlLT5wbGFuZXNfY2hhbmdlZCwKKwkJCW5ld19jcnRjX3N0YXRlLT5tb2RlX2No YW5nZWQsCisJCQluZXdfY3J0Y19zdGF0ZS0+YWN0aXZlX2NoYW5nZWQsCisJCQluZXdfY3J0Y19z dGF0ZS0+Y29ubmVjdG9yc19jaGFuZ2VkKTsKIAogCQkvKiBSZW1vdmUgc3RyZWFtIGZvciBhbnkg Y2hhbmdlZC9kaXNhYmxlZCBDUlRDICovCiAJCWlmICghZW5hYmxlKSB7CkBAIC00NDc4LDEwICs0 NDc4LDEwIEBAIHN0YXRpYyBpbnQgZG1fdXBkYXRlX2NydGNzX3N0YXRlKAogCiAJCX0gZWxzZSB7 LyogQWRkIHN0cmVhbSBmb3IgYW55IHVwZGF0ZWQvZW5hYmxlZCBDUlRDICovCiAKLQkJCWlmICht b2RlcmVzZXRfcmVxdWlyZWQoY3J0Y19zdGF0ZSkpCisJCQlpZiAobW9kZXJlc2V0X3JlcXVpcmVk KG5ld19jcnRjX3N0YXRlKSkKIAkJCQlnb3RvIG5leHRfY3J0YzsKIAotCQkJaWYgKG1vZGVzZXRf cmVxdWlyZWQoY3J0Y19zdGF0ZSwgbmV3X3N0cmVhbSwKKwkJCWlmIChtb2Rlc2V0X3JlcXVpcmVk KG5ld19jcnRjX3N0YXRlLCBuZXdfc3RyZWFtLAogCQkJCQkgICAgIG9sZF9hY3J0Y19zdGF0ZS0+ c3RyZWFtKSkgewogCiAJCQkJV0FSTl9PTihuZXdfYWNydGNfc3RhdGUtPnN0cmVhbSk7CkBAIC00 NjQ2LDkgKzQ2NDYsOSBAQCBpbnQgYW1kZ3B1X2RtX2F0b21pY19jaGVjayhzdHJ1Y3QgZHJtX2Rl dmljZSAqZGV2LAogCXN0cnVjdCBkYyAqZGMgPSBhZGV2LT5kbS5kYzsKIAlzdHJ1Y3QgZG1fYXRv bWljX3N0YXRlICpkbV9zdGF0ZSA9IHRvX2RtX2F0b21pY19zdGF0ZShzdGF0ZSk7CiAJc3RydWN0 IGRybV9jb25uZWN0b3IgKmNvbm5lY3RvcjsKLQlzdHJ1Y3QgZHJtX2Nvbm5lY3Rvcl9zdGF0ZSAq b2xkX2Nvbl9zdGF0ZSwgKmNvbm5fc3RhdGU7CisJc3RydWN0IGRybV9jb25uZWN0b3Jfc3RhdGUg Km9sZF9jb25fc3RhdGUsICpuZXdfY29uX3N0YXRlOwogCXN0cnVjdCBkcm1fY3J0YyAqY3J0YzsK LQlzdHJ1Y3QgZHJtX2NydGNfc3RhdGUgKmNydGNfc3RhdGU7CisJc3RydWN0IGRybV9jcnRjX3N0 YXRlICpuZXdfY3J0Y19zdGF0ZTsKIAogCS8qCiAJICogVGhpcyBib29sIHdpbGwgYmUgc2V0IGZv ciB0cnVlIGZvciBhbnkgbW9kZXNldC9yZXNldApAQCAtNDY2Nyw4ICs0NjY3LDggQEAgaW50IGFt ZGdwdV9kbV9hdG9taWNfY2hlY2soc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAkgKiBIYWNrOiBD b21taXQgbmVlZHMgcGxhbmVzIHJpZ2h0IG5vdywgc3BlY2lmaWNhbGx5IGZvciBnYW1tYQogCSAq IFRPRE8gcmV3b3JrIGNvbW1pdCB0byBjaGVjayBDUlRDIGZvciBnYW1tYSBjaGFuZ2UKIAkgKi8K LQlmb3JfZWFjaF9uZXdfY3J0Y19pbl9zdGF0ZShzdGF0ZSwgY3J0YywgY3J0Y19zdGF0ZSwgaSkg ewotCQlpZiAoY3J0Y19zdGF0ZS0+Y29sb3JfbWdtdF9jaGFuZ2VkKSB7CisJZm9yX2VhY2hfbmV3 X2NydGNfaW5fc3RhdGUoc3RhdGUsIGNydGMsIG5ld19jcnRjX3N0YXRlLCBpKSB7CisJCWlmIChu ZXdfY3J0Y19zdGF0ZS0+Y29sb3JfbWdtdF9jaGFuZ2VkKSB7CiAJCQlyZXQgPSBkcm1fYXRvbWlj X2FkZF9hZmZlY3RlZF9wbGFuZXMoc3RhdGUsIGNydGMpOwogCQkJaWYgKHJldCkKIAkJCQlnb3Rv IGZhaWw7CkBAIC00NzEzLDkgKzQ3MTMsOSBAQCBpbnQgYW1kZ3B1X2RtX2F0b21pY19jaGVjayhz dHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCSAqIG5ldyBzdHJlYW0gaW50byBjb250ZXh0IHdcbyBj YXVzaW5nIGZ1bGwgcmVzZXQuIE5lZWQgdG8KIAkgKiBkZWNpZGUgaG93IHRvIGhhbmRsZS4KIAkg Ki8KLQlmb3JfZWFjaF9vbGRuZXdfY29ubmVjdG9yX2luX3N0YXRlKHN0YXRlLCBjb25uZWN0b3Is IG9sZF9jb25fc3RhdGUsIGNvbm5fc3RhdGUsIGkpIHsKKwlmb3JfZWFjaF9vbGRuZXdfY29ubmVj dG9yX2luX3N0YXRlKHN0YXRlLCBjb25uZWN0b3IsIG9sZF9jb25fc3RhdGUsIG5ld19jb25fc3Rh dGUsIGkpIHsKIAkJc3RydWN0IGRtX2Nvbm5lY3Rvcl9zdGF0ZSAqY29uX29sZF9zdGF0ZSA9IHRv X2RtX2Nvbm5lY3Rvcl9zdGF0ZShvbGRfY29uX3N0YXRlKTsKLQkJc3RydWN0IGRtX2Nvbm5lY3Rv cl9zdGF0ZSAqY29uX25ld19zdGF0ZSA9IHRvX2RtX2Nvbm5lY3Rvcl9zdGF0ZShjb25uX3N0YXRl KTsKKwkJc3RydWN0IGRtX2Nvbm5lY3Rvcl9zdGF0ZSAqY29uX25ld19zdGF0ZSA9IHRvX2RtX2Nv bm5lY3Rvcl9zdGF0ZShuZXdfY29uX3N0YXRlKTsKIAkJc3RydWN0IGFtZGdwdV9jcnRjICphY3J0 YyA9IHRvX2FtZGdwdV9jcnRjKGNvbl9uZXdfc3RhdGUtPmJhc2UuY3J0Yyk7CiAKIAkJLyogU2tp cCBhbnkgbW9kZXNldHMvcmVzZXRzICovCi0tIAoyLjcuNAoKX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2 ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21h aWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg==