From: Harry Wentland Subject: [PATCH 11/28] drm/amd/display: Unify DRM state variable namings. Date: Thu, 19 Oct 2017 13:46:30 -0400 Message-ID: <20171019174647.21260-12-harry.wentland@amd.com> References: <20171019174647.21260-1-harry.wentland@amd.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20171019174647.21260-1-harry.wentland-5C7GfCeVMHo@public.gmane.org> List-Id: Discussion list for AMD gfx List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Sender: "amd-gfx" To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Cc: "Leo (Sunpeng) Li" RnJvbTogIkxlbyAoU3VucGVuZykgTGkiIDxzdW5wZW5nLmxpQGFtZC5jb20+CgpVc2UgbmV3Xypf c3RhdGUgYW5kIG9sZF8qX3N0YXRlIGZvciB0aGVpciByZXNwZWN0aXZlIG5ldy9vbGQgRFJNIG9i amVjdApzdGF0ZXMuCgpTaWduZWQtb2ZmLWJ5OiBMZW8gKFN1bnBlbmcpIExpIDxzdW5wZW5nLmxp QGFtZC5jb20+ClJldmlld2VkLWJ5OiBUb255IENoZW5nIDxUb255LkNoZW5nQGFtZC5jb20+ClJl dmlld2VkLWJ5OiBIYXJyeSBXZW50bGFuZCA8SGFycnkuV2VudGxhbmRAYW1kLmNvbT4KLS0tCiBk cml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvYW1kZ3B1X2RtL2FtZGdwdV9kbS5jIHwgOTAgKysr KysrKysrKystLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCA0NSBpbnNlcnRpb25zKCspLCA0 NSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkv YW1kZ3B1X2RtL2FtZGdwdV9kbS5jIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2FtZGdw dV9kbS9hbWRncHVfZG0uYwppbmRleCA5MjRlMzMyMTFmOGIuLjFiMTFlYTIzZjExMiAxMDA2NDQK LS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2FtZGdwdV9kbS9hbWRncHVfZG0uYwor KysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvYW1kZ3B1X2RtL2FtZGdwdV9kbS5jCkBA IC02MDgsMTIgKzYwOCwxMiBAQCBhbWRncHVfZG1fZmluZF9maXJzdF9jcnRjX21hdGNoaW5nX2Nv bm5lY3RvcihzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGUsCiAJCQkJCSAgICAgc3RydWN0 IGRybV9jcnRjICpjcnRjKQogewogCXVpbnQzMl90IGk7Ci0Jc3RydWN0IGRybV9jb25uZWN0b3Jf c3RhdGUgKmNvbm5fc3RhdGU7CisJc3RydWN0IGRybV9jb25uZWN0b3Jfc3RhdGUgKm5ld19jb25f c3RhdGU7CiAJc3RydWN0IGRybV9jb25uZWN0b3IgKmNvbm5lY3RvcjsKIAlzdHJ1Y3QgZHJtX2Ny dGMgKmNydGNfZnJvbV9zdGF0ZTsKIAotCWZvcl9lYWNoX25ld19jb25uZWN0b3JfaW5fc3RhdGUo c3RhdGUsIGNvbm5lY3RvciwgY29ubl9zdGF0ZSwgaSkgewotCQljcnRjX2Zyb21fc3RhdGUgPSBj b25uX3N0YXRlLT5jcnRjOworCWZvcl9lYWNoX25ld19jb25uZWN0b3JfaW5fc3RhdGUoc3RhdGUs IGNvbm5lY3RvciwgbmV3X2Nvbl9zdGF0ZSwgaSkgeworCQljcnRjX2Zyb21fc3RhdGUgPSBuZXdf Y29uX3N0YXRlLT5jcnRjOwogCiAJCWlmIChjcnRjX2Zyb21fc3RhdGUgPT0gY3J0YykKIAkJCXJl dHVybiB0b19hbWRncHVfZG1fY29ubmVjdG9yKGNvbm5lY3Rvcik7CkBAIC02NDAsMTAgKzY0MCwx MCBAQCBpbnQgYW1kZ3B1X2RtX2Rpc3BsYXlfcmVzdW1lKHN0cnVjdCBhbWRncHVfZGV2aWNlICph ZGV2KQogCXN0cnVjdCBhbWRncHVfZG1fY29ubmVjdG9yICphY29ubmVjdG9yOwogCXN0cnVjdCBk cm1fY29ubmVjdG9yICpjb25uZWN0b3I7CiAJc3RydWN0IGRybV9jcnRjICpjcnRjOwotCXN0cnVj dCBkcm1fY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZTsKKwlzdHJ1Y3QgZHJtX2NydGNfc3RhdGUgKm5l d19jcnRjX3N0YXRlOwogCXN0cnVjdCBkbV9jcnRjX3N0YXRlICpkbV9jcnRjX3N0YXRlOwogCXN0 cnVjdCBkcm1fcGxhbmUgKnBsYW5lOwotCXN0cnVjdCBkcm1fcGxhbmVfc3RhdGUgKnBsYW5lX3N0 YXRlOworCXN0cnVjdCBkcm1fcGxhbmVfc3RhdGUgKm5ld19wbGFuZV9zdGF0ZTsKIAlzdHJ1Y3Qg ZG1fcGxhbmVfc3RhdGUgKmRtX3BsYW5lX3N0YXRlOwogCXN0cnVjdCBkbV9hdG9taWNfc3RhdGUg KmNhY2hlZF9zdGF0ZTsKIAlpbnQgcmV0ID0gMDsKQEAgLTY4MSw4ICs2ODEsOCBAQCBpbnQgYW1k Z3B1X2RtX2Rpc3BsYXlfcmVzdW1lKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2KQogCX0KIAog CS8qIEZvcmNlIG1vZGUgc2V0IGluIGF0b21pYyBjb21pdCAqLwotCWZvcl9lYWNoX25ld19jcnRj X2luX3N0YXRlKGFkZXYtPmRtLmNhY2hlZF9zdGF0ZSwgY3J0YywgY3J0Y19zdGF0ZSwgaSkKLQkJ CWNydGNfc3RhdGUtPmFjdGl2ZV9jaGFuZ2VkID0gdHJ1ZTsKKwlmb3JfZWFjaF9uZXdfY3J0Y19p bl9zdGF0ZShhZGV2LT5kbS5jYWNoZWRfc3RhdGUsIGNydGMsIG5ld19jcnRjX3N0YXRlLCBpKQor CQluZXdfY3J0Y19zdGF0ZS0+YWN0aXZlX2NoYW5nZWQgPSB0cnVlOwogCiAJY2FjaGVkX3N0YXRl ID0gdG9fZG1fYXRvbWljX3N0YXRlKGFkZXYtPmRtLmNhY2hlZF9zdGF0ZSk7CiAKQEAgLTY5OCw4 ICs2OTgsOCBAQCBpbnQgYW1kZ3B1X2RtX2Rpc3BsYXlfcmVzdW1lKHN0cnVjdCBhbWRncHVfZGV2 aWNlICphZGV2KQogCUFTU0VSVChjYWNoZWRfc3RhdGUtPmNvbnRleHQpOwogCWRjX3Jlc291cmNl X3N0YXRlX2NvcHlfY29uc3RydWN0X2N1cnJlbnQoYWRldi0+ZG0uZGMsIGNhY2hlZF9zdGF0ZS0+ Y29udGV4dCk7CiAKLQlmb3JfZWFjaF9uZXdfY3J0Y19pbl9zdGF0ZShhZGV2LT5kbS5jYWNoZWRf c3RhdGUsIGNydGMsIGNydGNfc3RhdGUsIGkpIHsKLQkJZG1fY3J0Y19zdGF0ZSA9IHRvX2RtX2Ny dGNfc3RhdGUoY3J0Y19zdGF0ZSk7CisJZm9yX2VhY2hfbmV3X2NydGNfaW5fc3RhdGUoYWRldi0+ ZG0uY2FjaGVkX3N0YXRlLCBjcnRjLCBuZXdfY3J0Y19zdGF0ZSwgaSkgeworCQlkbV9jcnRjX3N0 YXRlID0gdG9fZG1fY3J0Y19zdGF0ZShuZXdfY3J0Y19zdGF0ZSk7CiAJCWlmIChkbV9jcnRjX3N0 YXRlLT5zdHJlYW0pIHsKIAkJCVdBUk5fT04oa3JlZl9yZWFkKCZkbV9jcnRjX3N0YXRlLT5zdHJl YW0tPnJlZmNvdW50KSA+IDEpOwogCQkJZGNfc3RyZWFtX3JlbGVhc2UoZG1fY3J0Y19zdGF0ZS0+ c3RyZWFtKTsKQEAgLTcwNyw4ICs3MDcsOCBAQCBpbnQgYW1kZ3B1X2RtX2Rpc3BsYXlfcmVzdW1l KHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2KQogCQl9CiAJfQogCi0JZm9yX2VhY2hfbmV3X3Bs YW5lX2luX3N0YXRlKGFkZXYtPmRtLmNhY2hlZF9zdGF0ZSwgcGxhbmUsIHBsYW5lX3N0YXRlLCBp KSB7Ci0JCWRtX3BsYW5lX3N0YXRlID0gdG9fZG1fcGxhbmVfc3RhdGUocGxhbmVfc3RhdGUpOwor CWZvcl9lYWNoX25ld19wbGFuZV9pbl9zdGF0ZShhZGV2LT5kbS5jYWNoZWRfc3RhdGUsIHBsYW5l LCBuZXdfcGxhbmVfc3RhdGUsIGkpIHsKKwkJZG1fcGxhbmVfc3RhdGUgPSB0b19kbV9wbGFuZV9z dGF0ZShuZXdfcGxhbmVfc3RhdGUpOwogCQlpZiAoZG1fcGxhbmVfc3RhdGUtPmRjX3N0YXRlKSB7 CiAJCQlXQVJOX09OKGtyZWZfcmVhZCgmZG1fcGxhbmVfc3RhdGUtPmRjX3N0YXRlLT5yZWZjb3Vu dCkgPiAxKTsKIAkJCWRjX3BsYW5lX3N0YXRlX3JlbGVhc2UoZG1fcGxhbmVfc3RhdGUtPmRjX3N0 YXRlKTsKQEAgLTQwMTUsNyArNDAxNSw3IEBAIHN0YXRpYyBpbnQgYW1kZ3B1X2RtX2F0b21pY19j b21taXQoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAkJCQkgICBib29sIG5vbmJsb2NrKQogewog CXN0cnVjdCBkcm1fY3J0YyAqY3J0YzsKLQlzdHJ1Y3QgZHJtX2NydGNfc3RhdGUgKm9sZF9jcnRj X3N0YXRlLCAqbmV3X3N0YXRlOworCXN0cnVjdCBkcm1fY3J0Y19zdGF0ZSAqb2xkX2NydGNfc3Rh dGUsICpuZXdfY3J0Y19zdGF0ZTsKIAlzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiA9IGRldi0+ ZGV2X3ByaXZhdGU7CiAJaW50IGk7CiAKQEAgLTQwMjYsMTEgKzQwMjYsMTEgQEAgc3RhdGljIGlu dCBhbWRncHVfZG1fYXRvbWljX2NvbW1pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCSAqIGl0 IHdpbGwgdXBkYXRlIGNydGMtPmRtX2NydGNfc3RhdGUtPnN0cmVhbSBwb2ludGVyIHdoaWNoIGlz IHVzZWQgaW4KIAkgKiB0aGUgSVNScy4KIAkgKi8KLQlmb3JfZWFjaF9vbGRuZXdfY3J0Y19pbl9z dGF0ZShzdGF0ZSwgY3J0Yywgb2xkX2NydGNfc3RhdGUsIG5ld19zdGF0ZSwgaSkgeworCWZvcl9l YWNoX29sZG5ld19jcnRjX2luX3N0YXRlKHN0YXRlLCBjcnRjLCBvbGRfY3J0Y19zdGF0ZSwgbmV3 X2NydGNfc3RhdGUsIGkpIHsKIAkJc3RydWN0IGRtX2NydGNfc3RhdGUgKm9sZF9hY3J0Y19zdGF0 ZSA9IHRvX2RtX2NydGNfc3RhdGUob2xkX2NydGNfc3RhdGUpOwogCQlzdHJ1Y3QgYW1kZ3B1X2Ny dGMgKmFjcnRjID0gdG9fYW1kZ3B1X2NydGMoY3J0Yyk7CiAKLQkJaWYgKGRybV9hdG9taWNfY3J0 Y19uZWVkc19tb2Rlc2V0KG5ld19zdGF0ZSkgJiYgb2xkX2FjcnRjX3N0YXRlLT5zdHJlYW0pCisJ CWlmIChkcm1fYXRvbWljX2NydGNfbmVlZHNfbW9kZXNldChuZXdfY3J0Y19zdGF0ZSkgJiYgb2xk X2FjcnRjX3N0YXRlLT5zdHJlYW0pCiAJCQltYW5hZ2VfZG1faW50ZXJydXB0cyhhZGV2LCBhY3J0 YywgZmFsc2UpOwogCX0KIAkvKiBBZGQgY2hlY2sgaGVyZSBmb3IgU29DJ3MgdGhhdCBzdXBwb3J0 IGhhcmR3YXJlIGN1cnNvciBwbGFuZSwgdG8KQEAgLTQwNTYsNyArNDA1Niw3IEBAIHN0YXRpYyB2 b2lkIGFtZGdwdV9kbV9hdG9taWNfY29tbWl0X3RhaWwoc3RydWN0IGRybV9hdG9taWNfc3RhdGUg KnN0YXRlKQogCXVuc2lnbmVkIGxvbmcgZmxhZ3M7CiAJYm9vbCB3YWl0X2Zvcl92YmxhbmsgPSB0 cnVlOwogCXN0cnVjdCBkcm1fY29ubmVjdG9yICpjb25uZWN0b3I7Ci0Jc3RydWN0IGRybV9jb25u ZWN0b3Jfc3RhdGUgKm9sZF9jb25uX3N0YXRlLCAqbmV3X2Nvbl9zdGF0ZTsKKwlzdHJ1Y3QgZHJt X2Nvbm5lY3Rvcl9zdGF0ZSAqb2xkX2Nvbl9zdGF0ZSwgKm5ld19jb25fc3RhdGU7CiAJc3RydWN0 IGRtX2NydGNfc3RhdGUgKm9sZF9hY3J0Y19zdGF0ZSwgKm5ld19hY3J0Y19zdGF0ZTsKIAogCWRy bV9hdG9taWNfaGVscGVyX3VwZGF0ZV9sZWdhY3lfbW9kZXNldF9zdGF0ZShkZXYsIHN0YXRlKTsK QEAgLTQyMjEsOSArNDIyMSw5IEBAIHN0YXRpYyB2b2lkIGFtZGdwdV9kbV9hdG9taWNfY29tbWl0 X3RhaWwoc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlKQogCX0KIAogCS8qIEhhbmRsZSBz Y2FsaW5nIGFuZCB1bmRlcnNhY24gY2hhbmdlcyovCi0JZm9yX2VhY2hfb2xkbmV3X2Nvbm5lY3Rv cl9pbl9zdGF0ZShzdGF0ZSwgY29ubmVjdG9yLCBvbGRfY29ubl9zdGF0ZSwgbmV3X2Nvbl9zdGF0 ZSwgaSkgeworCWZvcl9lYWNoX29sZG5ld19jb25uZWN0b3JfaW5fc3RhdGUoc3RhdGUsIGNvbm5l Y3Rvciwgb2xkX2Nvbl9zdGF0ZSwgbmV3X2Nvbl9zdGF0ZSwgaSkgewogCQlzdHJ1Y3QgZG1fY29u bmVjdG9yX3N0YXRlICpjb25fbmV3X3N0YXRlID0gdG9fZG1fY29ubmVjdG9yX3N0YXRlKG5ld19j b25fc3RhdGUpOwotCQlzdHJ1Y3QgZG1fY29ubmVjdG9yX3N0YXRlICpjb25fb2xkX3N0YXRlID0g dG9fZG1fY29ubmVjdG9yX3N0YXRlKG9sZF9jb25uX3N0YXRlKTsKKwkJc3RydWN0IGRtX2Nvbm5l Y3Rvcl9zdGF0ZSAqY29uX29sZF9zdGF0ZSA9IHRvX2RtX2Nvbm5lY3Rvcl9zdGF0ZShvbGRfY29u X3N0YXRlKTsKIAkJc3RydWN0IGFtZGdwdV9jcnRjICphY3J0YyA9IHRvX2FtZGdwdV9jcnRjKGNv bl9uZXdfc3RhdGUtPmJhc2UuY3J0Yyk7CiAJCXN0cnVjdCBkY19zdHJlYW1fc3RhdHVzICpzdGF0 dXMgPSBOVUxMOwogCkBAIC00NDUxLDcgKzQ0NTEsNyBAQCBzdGF0aWMgaW50IGRtX3VwZGF0ZV9j cnRjc19zdGF0ZShzdHJ1Y3QgZGMgKmRjLAogCQkJCSBib29sICpsb2NrX2FuZF92YWxpZGF0aW9u X25lZWRlZCkKIHsKIAlzdHJ1Y3QgZHJtX2NydGMgKmNydGM7Ci0Jc3RydWN0IGRybV9jcnRjX3N0 YXRlICpvbGRfY3J0Y19zdGF0ZSwgKmNydGNfc3RhdGU7CisJc3RydWN0IGRybV9jcnRjX3N0YXRl ICpvbGRfY3J0Y19zdGF0ZSwgKm5ld19jcnRjX3N0YXRlOwogCWludCBpOwogCXN0cnVjdCBkbV9j cnRjX3N0YXRlICpvbGRfYWNydGNfc3RhdGUsICpuZXdfYWNydGNfc3RhdGU7CiAJc3RydWN0IGRt X2F0b21pY19zdGF0ZSAqZG1fc3RhdGUgPSB0b19kbV9hdG9taWNfc3RhdGUoc3RhdGUpOwpAQCAt NDQ2MCwxNiArNDQ2MCwxNiBAQCBzdGF0aWMgaW50IGRtX3VwZGF0ZV9jcnRjc19zdGF0ZShzdHJ1 Y3QgZGMgKmRjLAogCiAJLypUT0RPIE1vdmUgdGhpcyBjb2RlIGludG8gZG1fY3J0Y19hdG9taWNf Y2hlY2sgb25jZSB3ZSBnZXQgcmlkIG9mIGRjX3ZhbGlkYXRpb25fc2V0ICovCiAJLyogdXBkYXRl IGNoYW5nZWQgaXRlbXMgKi8KLQlmb3JfZWFjaF9vbGRuZXdfY3J0Y19pbl9zdGF0ZShzdGF0ZSwg Y3J0Yywgb2xkX2NydGNfc3RhdGUsIGNydGNfc3RhdGUsIGkpIHsKKwlmb3JfZWFjaF9vbGRuZXdf Y3J0Y19pbl9zdGF0ZShzdGF0ZSwgY3J0Yywgb2xkX2NydGNfc3RhdGUsIG5ld19jcnRjX3N0YXRl LCBpKSB7CiAJCXN0cnVjdCBhbWRncHVfY3J0YyAqYWNydGMgPSBOVUxMOwogCQlzdHJ1Y3QgYW1k Z3B1X2RtX2Nvbm5lY3RvciAqYWNvbm5lY3RvciA9IE5VTEw7Ci0JCXN0cnVjdCBkcm1fY29ubmVj dG9yX3N0YXRlICpjb25uX3N0YXRlID0gTlVMTDsKKwkJc3RydWN0IGRybV9jb25uZWN0b3Jfc3Rh dGUgKm5ld19jb25fc3RhdGUgPSBOVUxMOwogCQlzdHJ1Y3QgZG1fY29ubmVjdG9yX3N0YXRlICpk bV9jb25uX3N0YXRlID0gTlVMTDsKIAogCQluZXdfc3RyZWFtID0gTlVMTDsKIAogCQlvbGRfYWNy dGNfc3RhdGUgPSB0b19kbV9jcnRjX3N0YXRlKG9sZF9jcnRjX3N0YXRlKTsKLQkJbmV3X2FjcnRj X3N0YXRlID0gdG9fZG1fY3J0Y19zdGF0ZShjcnRjX3N0YXRlKTsKKwkJbmV3X2FjcnRjX3N0YXRl ID0gdG9fZG1fY3J0Y19zdGF0ZShuZXdfY3J0Y19zdGF0ZSk7CiAJCWFjcnRjID0gdG9fYW1kZ3B1 X2NydGMoY3J0Yyk7CiAKIAkJYWNvbm5lY3RvciA9IGFtZGdwdV9kbV9maW5kX2ZpcnN0X2NydGNf bWF0Y2hpbmdfY29ubmVjdG9yKHN0YXRlLCBjcnRjKTsKQEAgLTQ0NzcsMTggKzQ0NzcsMTggQEAg c3RhdGljIGludCBkbV91cGRhdGVfY3J0Y3Nfc3RhdGUoc3RydWN0IGRjICpkYywKIAkJLyogVE9E TyBUaGlzIGhhY2sgc2hvdWxkIGdvIGF3YXkgKi8KIAkJaWYgKGFjb25uZWN0b3IgJiYgZW5hYmxl KSB7CiAJCQkvLyBNYWtlIHN1cmUgZmFrZSBzaW5rIGlzIGNyZWF0ZWQgaW4gcGx1Zy1pbiBzY2Vu YXJpbwotCQkJY29ubl9zdGF0ZSA9IGRybV9hdG9taWNfZ2V0X2Nvbm5lY3Rvcl9zdGF0ZShzdGF0 ZSwKKwkJCW5ld19jb25fc3RhdGUgPSBkcm1fYXRvbWljX2dldF9jb25uZWN0b3Jfc3RhdGUoc3Rh dGUsCiAJCQkJCQkJCSAgICAmYWNvbm5lY3Rvci0+YmFzZSk7CiAKLQkJCWlmIChJU19FUlIoY29u bl9zdGF0ZSkpIHsKLQkJCQlyZXQgPSBQVFJfRVJSX09SX1pFUk8oY29ubl9zdGF0ZSk7CisJCQlp ZiAoSVNfRVJSKG5ld19jb25fc3RhdGUpKSB7CisJCQkJcmV0ID0gUFRSX0VSUl9PUl9aRVJPKG5l d19jb25fc3RhdGUpOwogCQkJCWJyZWFrOwogCQkJfQogCi0JCQlkbV9jb25uX3N0YXRlID0gdG9f ZG1fY29ubmVjdG9yX3N0YXRlKGNvbm5fc3RhdGUpOworCQkJZG1fY29ubl9zdGF0ZSA9IHRvX2Rt X2Nvbm5lY3Rvcl9zdGF0ZShuZXdfY29uX3N0YXRlKTsKIAogCQkJbmV3X3N0cmVhbSA9IGNyZWF0 ZV9zdHJlYW1fZm9yX3NpbmsoYWNvbm5lY3RvciwKLQkJCQkJCQkgICAgJmNydGNfc3RhdGUtPm1v ZGUsCisJCQkJCQkJICAgICZuZXdfY3J0Y19zdGF0ZS0+bW9kZSwKIAkJCQkJCQkgICAgZG1fY29u bl9zdGF0ZSk7CiAKIAkJCS8qCkBAIC00NTA4LDE0ICs0NTA4LDE0IEBAIHN0YXRpYyBpbnQgZG1f dXBkYXRlX2NydGNzX3N0YXRlKHN0cnVjdCBkYyAqZGMsCiAJCWlmIChkY19pc19zdHJlYW1fdW5j aGFuZ2VkKG5ld19zdHJlYW0sIG9sZF9hY3J0Y19zdGF0ZS0+c3RyZWFtKSAmJgogCQkJCWRjX2lz X3N0cmVhbV9zY2FsaW5nX3VuY2hhbmdlZChuZXdfc3RyZWFtLCBvbGRfYWNydGNfc3RhdGUtPnN0 cmVhbSkpIHsKIAotCQkJY3J0Y19zdGF0ZS0+bW9kZV9jaGFuZ2VkID0gZmFsc2U7CisJCQluZXdf Y3J0Y19zdGF0ZS0+bW9kZV9jaGFuZ2VkID0gZmFsc2U7CiAKIAkJCURSTV9ERUJVR19EUklWRVIo Ik1vZGUgY2hhbmdlIG5vdCByZXF1aXJlZCwgc2V0dGluZyBtb2RlX2NoYW5nZWQgdG8gJWQiLAot CQkJCSAgICAgICAgIGNydGNfc3RhdGUtPm1vZGVfY2hhbmdlZCk7CisJCQkJCSBuZXdfY3J0Y19z dGF0ZS0+bW9kZV9jaGFuZ2VkKTsKIAkJfQogCiAKLQkJaWYgKCFkcm1fYXRvbWljX2NydGNfbmVl ZHNfbW9kZXNldChjcnRjX3N0YXRlKSkKKwkJaWYgKCFkcm1fYXRvbWljX2NydGNfbmVlZHNfbW9k ZXNldChuZXdfY3J0Y19zdGF0ZSkpCiAJCQlnb3RvIG5leHRfY3J0YzsKIAogCQlEUk1fREVCVUdf RFJJVkVSKApAQCAtNDUyMywxMiArNDUyMywxMiBAQCBzdGF0aWMgaW50IGRtX3VwZGF0ZV9jcnRj c19zdGF0ZShzdHJ1Y3QgZGMgKmRjLAogCQkJInBsYW5lc19jaGFuZ2VkOiVkLCBtb2RlX2NoYW5n ZWQ6JWQsYWN0aXZlX2NoYW5nZWQ6JWQsIgogCQkJImNvbm5lY3RvcnNfY2hhbmdlZDolZFxuIiwK IAkJCWFjcnRjLT5jcnRjX2lkLAotCQkJY3J0Y19zdGF0ZS0+ZW5hYmxlLAotCQkJY3J0Y19zdGF0 ZS0+YWN0aXZlLAotCQkJY3J0Y19zdGF0ZS0+cGxhbmVzX2NoYW5nZWQsCi0JCQljcnRjX3N0YXRl LT5tb2RlX2NoYW5nZWQsCi0JCQljcnRjX3N0YXRlLT5hY3RpdmVfY2hhbmdlZCwKLQkJCWNydGNf c3RhdGUtPmNvbm5lY3RvcnNfY2hhbmdlZCk7CisJCQluZXdfY3J0Y19zdGF0ZS0+ZW5hYmxlLAor CQkJbmV3X2NydGNfc3RhdGUtPmFjdGl2ZSwKKwkJCW5ld19jcnRjX3N0YXRlLT5wbGFuZXNfY2hh bmdlZCwKKwkJCW5ld19jcnRjX3N0YXRlLT5tb2RlX2NoYW5nZWQsCisJCQluZXdfY3J0Y19zdGF0 ZS0+YWN0aXZlX2NoYW5nZWQsCisJCQluZXdfY3J0Y19zdGF0ZS0+Y29ubmVjdG9yc19jaGFuZ2Vk KTsKIAogCQkvKiBSZW1vdmUgc3RyZWFtIGZvciBhbnkgY2hhbmdlZC9kaXNhYmxlZCBDUlRDICov CiAJCWlmICghZW5hYmxlKSB7CkBAIC00NTYyLDEwICs0NTYyLDEwIEBAIHN0YXRpYyBpbnQgZG1f dXBkYXRlX2NydGNzX3N0YXRlKHN0cnVjdCBkYyAqZGMsCiAJCQlpZiAoIWFjb25uZWN0b3IgfHwg KCFhY29ubmVjdG9yLT5kY19zaW5rICYmIGFjb25uZWN0b3ItPm1zdF9wb3J0KSkKIAkJCQlnb3Rv IG5leHRfY3J0YzsKIAotCQkJaWYgKG1vZGVyZXNldF9yZXF1aXJlZChjcnRjX3N0YXRlKSkKKwkJ CWlmIChtb2RlcmVzZXRfcmVxdWlyZWQobmV3X2NydGNfc3RhdGUpKQogCQkJCWdvdG8gbmV4dF9j cnRjOwogCi0JCQlpZiAobW9kZXNldF9yZXF1aXJlZChjcnRjX3N0YXRlLCBuZXdfc3RyZWFtLAor CQkJaWYgKG1vZGVzZXRfcmVxdWlyZWQobmV3X2NydGNfc3RhdGUsIG5ld19zdHJlYW0sCiAJCQkJ CSAgICAgb2xkX2FjcnRjX3N0YXRlLT5zdHJlYW0pKSB7CiAKIAkJCQlXQVJOX09OKG5ld19hY3J0 Y19zdGF0ZS0+c3RyZWFtKTsKQEAgLTQ3MjksOSArNDcyOSw5IEBAIHN0YXRpYyBpbnQgYW1kZ3B1 X2RtX2F0b21pY19jaGVjayhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCXN0cnVjdCBkYyAqZGMg PSBhZGV2LT5kbS5kYzsKIAlzdHJ1Y3QgZG1fYXRvbWljX3N0YXRlICpkbV9zdGF0ZSA9IHRvX2Rt X2F0b21pY19zdGF0ZShzdGF0ZSk7CiAJc3RydWN0IGRybV9jb25uZWN0b3IgKmNvbm5lY3RvcjsK LQlzdHJ1Y3QgZHJtX2Nvbm5lY3Rvcl9zdGF0ZSAqb2xkX2Nvbl9zdGF0ZSwgKmNvbm5fc3RhdGU7 CisJc3RydWN0IGRybV9jb25uZWN0b3Jfc3RhdGUgKm9sZF9jb25fc3RhdGUsICpuZXdfY29uX3N0 YXRlOwogCXN0cnVjdCBkcm1fY3J0YyAqY3J0YzsKLQlzdHJ1Y3QgZHJtX2NydGNfc3RhdGUgKm9s ZF9jcnRjX3N0YXRlLCAqY3J0Y19zdGF0ZTsKKwlzdHJ1Y3QgZHJtX2NydGNfc3RhdGUgKm9sZF9j cnRjX3N0YXRlLCAqbmV3X2NydGNfc3RhdGU7CiAKIAkvKgogCSAqIFRoaXMgYm9vbCB3aWxsIGJl IHNldCBmb3IgdHJ1ZSBmb3IgYW55IG1vZGVzZXQvcmVzZXQKQEAgLTQ3NTIsMTYgKzQ3NTIsMTYg QEAgc3RhdGljIGludCBhbWRncHVfZG1fYXRvbWljX2NoZWNrKHN0cnVjdCBkcm1fZGV2aWNlICpk ZXYsCiAJICogd2Ugc2hvdWxkIG5vdCBhZGQgaXQgdG8gbGlzdCBvZiBhZmZlY3RlZCBwbGFuZXMu CiAJICovCiAJaWYgKHN0YXRlLT5sZWdhY3lfY3Vyc29yX3VwZGF0ZSkgewotCQlmb3JfZWFjaF9u ZXdfY3J0Y19pbl9zdGF0ZShzdGF0ZSwgY3J0YywgY3J0Y19zdGF0ZSwgaSkgewotCQkJaWYgKGNy dGNfc3RhdGUtPmNvbG9yX21nbXRfY2hhbmdlZCkgeworCQlmb3JfZWFjaF9uZXdfY3J0Y19pbl9z dGF0ZShzdGF0ZSwgY3J0YywgbmV3X2NydGNfc3RhdGUsIGkpIHsKKwkJCWlmIChuZXdfY3J0Y19z dGF0ZS0+Y29sb3JfbWdtdF9jaGFuZ2VkKSB7CiAJCQkJcmV0ID0gZHJtX2F0b21pY19hZGRfYWZm ZWN0ZWRfcGxhbmVzKHN0YXRlLCBjcnRjKTsKIAkJCQlpZiAocmV0KQogCQkJCQlnb3RvIGZhaWw7 CiAJCQl9CiAJCX0KIAl9IGVsc2UgewotCQlmb3JfZWFjaF9vbGRuZXdfY3J0Y19pbl9zdGF0ZShz dGF0ZSwgY3J0Yywgb2xkX2NydGNfc3RhdGUsIGNydGNfc3RhdGUsIGkpIHsKLQkJCWlmICghY3J0 Y19zdGF0ZS0+ZW5hYmxlKQorCQlmb3JfZWFjaF9vbGRuZXdfY3J0Y19pbl9zdGF0ZShzdGF0ZSwg Y3J0Yywgb2xkX2NydGNfc3RhdGUsIG5ld19jcnRjX3N0YXRlLCBpKSB7CisJCQlpZiAoIW5ld19j cnRjX3N0YXRlLT5lbmFibGUpCiAJCQkJY29udGludWU7CiAKIAkJCXJldCA9IGRybV9hdG9taWNf YWRkX2FmZmVjdGVkX2Nvbm5lY3RvcnMoc3RhdGUsIGNydGMpOwpAQCAtNDgxMiw5ICs0ODEyLDkg QEAgc3RhdGljIGludCBhbWRncHVfZG1fYXRvbWljX2NoZWNrKHN0cnVjdCBkcm1fZGV2aWNlICpk ZXYsCiAJICogbmV3IHN0cmVhbSBpbnRvIGNvbnRleHQgd1xvIGNhdXNpbmcgZnVsbCByZXNldC4g TmVlZCB0bwogCSAqIGRlY2lkZSBob3cgdG8gaGFuZGxlLgogCSAqLwotCWZvcl9lYWNoX29sZG5l d19jb25uZWN0b3JfaW5fc3RhdGUoc3RhdGUsIGNvbm5lY3Rvciwgb2xkX2Nvbl9zdGF0ZSwgY29u bl9zdGF0ZSwgaSkgeworCWZvcl9lYWNoX29sZG5ld19jb25uZWN0b3JfaW5fc3RhdGUoc3RhdGUs IGNvbm5lY3Rvciwgb2xkX2Nvbl9zdGF0ZSwgbmV3X2Nvbl9zdGF0ZSwgaSkgewogCQlzdHJ1Y3Qg ZG1fY29ubmVjdG9yX3N0YXRlICpjb25fb2xkX3N0YXRlID0gdG9fZG1fY29ubmVjdG9yX3N0YXRl KG9sZF9jb25fc3RhdGUpOwotCQlzdHJ1Y3QgZG1fY29ubmVjdG9yX3N0YXRlICpjb25fbmV3X3N0 YXRlID0gdG9fZG1fY29ubmVjdG9yX3N0YXRlKGNvbm5fc3RhdGUpOworCQlzdHJ1Y3QgZG1fY29u bmVjdG9yX3N0YXRlICpjb25fbmV3X3N0YXRlID0gdG9fZG1fY29ubmVjdG9yX3N0YXRlKG5ld19j b25fc3RhdGUpOwogCQlzdHJ1Y3QgYW1kZ3B1X2NydGMgKmFjcnRjID0gdG9fYW1kZ3B1X2NydGMo Y29uX25ld19zdGF0ZS0+YmFzZS5jcnRjKTsKIAogCQkvKiBTa2lwIGFueSBtb2Rlc2V0cy9yZXNl dHMgKi8KLS0gCjIuMTQuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX18KYW1kLWdmeCBtYWlsaW5nIGxpc3QKYW1kLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5v cmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9hbWQtZ2Z4 Cg==