From: =?UTF-8?q?Michel=20D=C3=A4nzer?= Subject: [PATCH xf86-video-ati 10/10] glamor: Use GBM for BO allocation when possible Date: Thu, 5 Jul 2018 14:13:07 +0200 Message-ID: <20180705121307.7835-11-michel@daenzer.net> References: <20180705121307.7835-1-michel@daenzer.net> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20180705121307.7835-1-michel-otUistvHUpPR7s880joybQ@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 RnJvbTogTWljaGVsIETDpG56ZXIgPG1pY2hlbC5kYWVuemVyQGFtZC5jb20+CgpJbnNwaXJlZCBi eSBhbWRncHUuIFRoaXMgYXZvaWRzIHZhcmlvdXMgaXNzdWVzIGR1ZSB0byBhIEdFTSBoYW5kbGUK bGlmZXRpbWUgY29uZmxpY3QgYmV0d2VlbiB1cyBhbmQgTWVzYSB3aXRoIGN1cnJlbnQgZ2xhbW9y LgoKQnVnemlsbGE6IGh0dHBzOi8vYnVncy5mcmVlZGVza3RvcC5vcmcvMTA1MzgxClNpZ25lZC1v ZmYtYnk6IE1pY2hlbCBEw6RuemVyIDxtaWNoZWwuZGFlbnplckBhbWQuY29tPgotLS0KIGNvbmZp Z3VyZS5hYyAgICAgICAgICAgfCAgMTAgKysrKwogc3JjL01ha2VmaWxlLmFtICAgICAgICB8ICAg NCArLQogc3JjL2RybW1vZGVfZGlzcGxheS5jICB8ICAzOSArKysrKysrKy0tLS0tLQogc3JjL3Jh ZGVvbi5oICAgICAgICAgICB8ICAgNyArKy0KIHNyYy9yYWRlb25fYm9faGVscGVyLmMgfCAxMTgg KysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKy0KIHNyYy9yYWRlb25fYm9f aGVscGVyLmggfCAgMjAgKysrKysrLQogc3JjL3JhZGVvbl9kcmkyLmMgICAgICB8ICAgNyArLS0K IHNyYy9yYWRlb25fZHJpMy5jICAgICAgfCAgMTMgKysrLS0KIHNyYy9yYWRlb25fZ2xhbW9yLmMg ICAgfCAgNDcgKysrKysrKysrKy0tLS0tLQogc3JjL3JhZGVvbl9nbGFtb3IuaCAgICB8ICAyOCAr KysrKysrKystCiBzcmMvcmFkZW9uX2ttcy5jICAgICAgIHwgIDQwICsrKysrKysrKy0tLS0tCiAx MSBmaWxlcyBjaGFuZ2VkLCAyNjYgaW5zZXJ0aW9ucygrKSwgNjcgZGVsZXRpb25zKC0pCgpkaWZm IC0tZ2l0IGEvY29uZmlndXJlLmFjIGIvY29uZmlndXJlLmFjCmluZGV4IDExZWZkZjBhZS4uZjU2 MTQ3NDlmIDEwMDY0NAotLS0gYS9jb25maWd1cmUuYWMKKysrIGIvY29uZmlndXJlLmFjCkBAIC0x MzgsMTIgKzEzOCwyMiBAQCBpZiB0ZXN0ICJ4JEdMQU1PUiIgIT0gInhubyI7IHRoZW4KIAkJCQkJ IFtIYXZlIGdsYW1vcl9lZ2xfZGVzdHJveV90ZXh0dXJlZF9waXhtYXAgQVBJXSldLCBbXSwKIAkJ CSAgICAgIFsjaW5jbHVkZSAieG9yZy1zZXJ2ZXIuaCIKIAkJCSAgICAgICAjaW5jbHVkZSAiZ2xh bW9yLmgiXSkKKworCQlBQ19DSEVDS19ERUNMKGdsYW1vcl9maW5pc2gsCisJCQkgICAgICBbQUNf REVGSU5FKEhBVkVfR0xBTU9SX0ZJTklTSCwgMSwKKwkJCQkJIFtIYXZlIGdsYW1vcl9maW5pc2gg QVBJXSldLAorCQkJCQkgW1BLR19DSEVDS19NT0RVTEVTKExJQkdMLCBbZ2xdKV0sCisJCQkgICAg ICBbI2luY2x1ZGUgInhvcmctc2VydmVyLmgiCisJCQkgICAgICAgI2luY2x1ZGUgImdsYW1vci5o Il0pCiAJZmkKIAogCWlmIHRlc3QgIngkR0xBTU9SX1hTRVJWRVIiICE9IHh5ZXM7IHRoZW4KIAkJ UEtHX0NIRUNLX01PRFVMRVMoTElCR0xBTU9SLCBbZ2xhbW9yID49IDAuNi4wXSkKIAkJUEtHX0NI RUNLX01PRFVMRVMoTElCR0xBTU9SX0VHTCwgW2dsYW1vci1lZ2xdKQogCWZpCisKKwlQS0dfQ0hF Q0tfTU9EVUxFUyhHQk0sIFtnYm0gPj0gMTAuNl0pCisKIAlBQ19ERUZJTkUoVVNFX0dMQU1PUiwg MSwgW0VuYWJsZSBnbGFtb3IgYWNjZWxlcmF0aW9uXSkKIGVsc2UKIAlBQ19NU0dfUkVTVUxUKFsk R0xBTU9SXSkKZGlmZiAtLWdpdCBhL3NyYy9NYWtlZmlsZS5hbSBiL3NyYy9NYWtlZmlsZS5hbQpp bmRleCBlZDFiZmE5ZTYuLmRmNGE5NWU0ZiAxMDA2NDQKLS0tIGEvc3JjL01ha2VmaWxlLmFtCisr KyBiL3NyYy9NYWtlZmlsZS5hbQpAQCAtNjIsOCArNjIsOCBAQCByYWRlb25fZHJ2X2xhX1NPVVJD RVMgPSBcCiAJJChSQURFT05fS01TX1NSQ1MpCiAKIGlmIEdMQU1PUgotQU1fQ0ZMQUdTICs9IEBM SUJHTEFNT1JfQ0ZMQUdTQAotcmFkZW9uX2Rydl9sYV9MSUJBREQgKz0gQExJQkdMQU1PUl9MSUJT QAorQU1fQ0ZMQUdTICs9IEBMSUJHTEFNT1JfQ0ZMQUdTQCBAR0JNX0NGTEFHU0AKK3JhZGVvbl9k cnZfbGFfTElCQUREICs9IEBMSUJHTEFNT1JfTElCU0AgQEdCTV9MSUJTQAogcmFkZW9uX2Rydl9s YV9TT1VSQ0VTICs9IFwKIAkgcmFkZW9uX2dsYW1vcl93cmFwcGVycy5jIFwKIAkgcmFkZW9uX2ds YW1vci5jCmRpZmYgLS1naXQgYS9zcmMvZHJtbW9kZV9kaXNwbGF5LmMgYi9zcmMvZHJtbW9kZV9k aXNwbGF5LmMKaW5kZXggYzkxZjViYjIwLi4yNzczY2U2NzIgMTAwNjQ0Ci0tLSBhL3NyYy9kcm1t b2RlX2Rpc3BsYXkuYworKysgYi9zcmMvZHJtbW9kZV9kaXNwbGF5LmMKQEAgLTE0Miw4ICsxNDIs NyBAQCBzdGF0aWMgUGl4bWFwUHRyIGRybW1vZGVfY3JlYXRlX2JvX3BpeG1hcChTY3JuSW5mb1B0 ciBwU2NybiwKIAl9CiAKIAlpZiAoIWluZm8tPnVzZV9nbGFtb3IgfHwKLQkgICAgcmFkZW9uX2ds YW1vcl9jcmVhdGVfdGV4dHVyZWRfcGl4bWFwKHBpeG1hcCwKLQkJCQkJCSByYWRlb25fZ2V0X3Bp eG1hcF9wcml2YXRlKHBpeG1hcCkpKQorCSAgICByYWRlb25fZ2xhbW9yX2NyZWF0ZV90ZXh0dXJl ZF9waXhtYXAocGl4bWFwLCBibykpCiAJCXJldHVybiBwaXhtYXA7CiAKIGZhaWw6CkBAIC00MzUs OCArNDM0LDE0IEBAIGRlc3Ryb3lfcGl4bWFwX2Zvcl9mYmNvbihTY3JuSW5mb1B0ciBwU2NybikK IAkvKiBYWFg6IFRoZSBjdXJyZW50IEdQVVZNIHN1cHBvcnQgaW4gdGhlIGtlcm5lbCBkb2Vzbid0 IGFsbG93IHJlbW92aW5nCiAJICogdGhlIHZpcnR1YWwgYWRkcmVzcyByYW5nZSBmb3IgdGhpcyBC Tywgc28gd2UgbmVlZCB0byBrZWVwIGFyb3VuZAogCSAqIHRoZSBwaXhtYXAgdG8gYXZvaWQgYnJl YWtpbmcgZ2xhbW9yIHdpdGggR1BVVk0KKwkgKgorCSAqIFNpbWlsYXJseSwgbmVlZCB0byBrZWVw IGFyb3VuZCB0aGUgcGl4bWFwIHdpdGggY3VycmVudCBnbGFtb3IsIHRvCisJICogYXZvaWQgaXNz dWVzIGR1ZSB0byBhIEdFTSBoYW5kbGUgbGlmZXRpbWUgY29uZmxpY3QgYmV0d2VlbiB1cyBhbmQK KwkgKiBNZXNhCiAJICovCi0JaWYgKGluZm8tPnVzZV9nbGFtb3IgJiYgaW5mby0+Q2hpcEZhbWls eSA+PSBDSElQX0ZBTUlMWV9DQVlNQU4pCisJaWYgKGluZm8tPnVzZV9nbGFtb3IgJiYKKwkgICAg KGluZm8tPkNoaXBGYW1pbHkgPj0gQ0hJUF9GQU1JTFlfQ0FZTUFOIHx8CisJICAgICB4b3JnR2V0 VmVyc2lvbigpID49IFhPUkdfVkVSU0lPTl9OVU1FUklDKDEsMTksOTksMSwwKSkpCiAJCXJldHVy bjsKIAogCWlmIChpbmZvLT5mYmNvbl9waXhtYXApCkBAIC0yMjc3LDIxICsyMjgyLDIzIEBAIGRy bW1vZGVfeGY4NmNydGNfcmVzaXplIChTY3JuSW5mb1B0ciBzY3JuLCBpbnQgd2lkdGgsIGludCBo ZWlnaHQpCiAKIAlzY3JuLT5kaXNwbGF5V2lkdGggPSBwaXRjaCAvIGNwcDsKIAorCWlmICghaW5m by0+dXNlX2dsYW1vcikgewogI2lmIFhfQllURV9PUkRFUiA9PSBYX0JJR19FTkRJQU4KLQlzd2l0 Y2ggKGNwcCkgewotCWNhc2UgNDoKLQkgICAgdGlsaW5nX2ZsYWdzIHw9IFJBREVPTl9USUxJTkdf U1dBUF8zMkJJVDsKLQkgICAgYnJlYWs7Ci0JY2FzZSAyOgotCSAgICB0aWxpbmdfZmxhZ3MgfD0g UkFERU9OX1RJTElOR19TV0FQXzE2QklUOwotCSAgICBicmVhazsKLQl9Ci0JaWYgKGluZm8tPkNo aXBGYW1pbHkgPCBDSElQX0ZBTUlMWV9SNjAwICYmCi0JICAgIGluZm8tPnI2MDBfc2hhZG93X2Zi ICYmIHRpbGluZ19mbGFncykKLQkgICAgdGlsaW5nX2ZsYWdzIHw9IFJBREVPTl9USUxJTkdfU1VS RkFDRTsKKwkJc3dpdGNoIChjcHApIHsKKwkJY2FzZSA0OgorCQkJdGlsaW5nX2ZsYWdzIHw9IFJB REVPTl9USUxJTkdfU1dBUF8zMkJJVDsKKwkJCWJyZWFrOworCQljYXNlIDI6CisJCQl0aWxpbmdf ZmxhZ3MgfD0gUkFERU9OX1RJTElOR19TV0FQXzE2QklUOworCQkJYnJlYWs7CisJCX0KKwkJaWYg KGluZm8tPkNoaXBGYW1pbHkgPCBDSElQX0ZBTUlMWV9SNjAwICYmCisJCSAgICBpbmZvLT5yNjAw X3NoYWRvd19mYiAmJiB0aWxpbmdfZmxhZ3MpCisJCQl0aWxpbmdfZmxhZ3MgfD0gUkFERU9OX1RJ TElOR19TVVJGQUNFOwogI2VuZGlmCi0JaWYgKHRpbGluZ19mbGFncykKLQkgICAgcmFkZW9uX2Jv X3NldF90aWxpbmcoaW5mby0+ZnJvbnRfYnVmZmVyLT5iby5yYWRlb24sIHRpbGluZ19mbGFncywg cGl0Y2gpOworCQlpZiAodGlsaW5nX2ZsYWdzKQorCQkJcmFkZW9uX2JvX3NldF90aWxpbmcoaW5m by0+ZnJvbnRfYnVmZmVyLT5iby5yYWRlb24sIHRpbGluZ19mbGFncywgcGl0Y2gpOworCX0KIAog CWlmICghaW5mby0+cjYwMF9zaGFkb3dfZmIpIHsKIAkJaWYgKGluZm8tPnN1cmZfbWFuICYmICFp bmZvLT51c2VfZ2xhbW9yKQpkaWZmIC0tZ2l0IGEvc3JjL3JhZGVvbi5oIGIvc3JjL3JhZGVvbi5o CmluZGV4IDY0OGZkOThhNS4uMmJjZmE0MWIxIDEwMDY0NAotLS0gYS9zcmMvcmFkZW9uLmgKKysr IGIvc3JjL3JhZGVvbi5oCkBAIC02MDYsNiArNjA2LDggQEAgdHlwZWRlZiBzdHJ1Y3QgewogICAg IHVuc2lnbmVkIGh3Y3Vyc29yX2Rpc2FibGVkOwogCiAjaWZkZWYgVVNFX0dMQU1PUgorICAgIHN0 cnVjdCBnYm1fZGV2aWNlICpnYm07CisKICAgICBzdHJ1Y3QgewogCUNyZWF0ZUdDUHJvY1B0ciBT YXZlZENyZWF0ZUdDOwogCVJlZ2lvblB0ciAoKlNhdmVkQ29weUFyZWEpKERyYXdhYmxlUHRyLCBE cmF3YWJsZVB0ciwgR0NQdHIsIGludCwgaW50LApAQCAtNzQ0LDggKzc0Niw2IEBAIHN0YXRpYyBp bmxpbmUgQm9vbCByYWRlb25fc2V0X3BpeG1hcF9ibyhQaXhtYXBQdHIgcFBpeCwgc3RydWN0IHJh ZGVvbl9idWZmZXIgKmJvCiAJfQogCiAJaWYgKGJvKSB7Ci0JICAgIHVpbnQzMl90IHBpdGNoOwot CiAJICAgIGlmICghcHJpdikgewogCQlwcml2ID0gY2FsbG9jKDEsIHNpemVvZiAoc3RydWN0IHJh ZGVvbl9waXhtYXApKTsKIAkJaWYgKCFwcml2KQpAQCAtNzU0LDExICs3NTQsMTAgQEAgc3RhdGlj IGlubGluZSBCb29sIHJhZGVvbl9zZXRfcGl4bWFwX2JvKFBpeG1hcFB0ciBwUGl4LCBzdHJ1Y3Qg cmFkZW9uX2J1ZmZlciAqYm8KIAogCSAgICByYWRlb25fYnVmZmVyX3JlZihibyk7CiAJICAgIHBy aXYtPmJvID0gYm87Ci0KLQkgICAgcmFkZW9uX2JvX2dldF90aWxpbmcoYm8tPmJvLnJhZGVvbiwg JnByaXYtPnRpbGluZ19mbGFncywgJnBpdGNoKTsKIAl9CiAKIAlyYWRlb25fc2V0X3BpeG1hcF9w cml2YXRlKHBQaXgsIHByaXYpOworCXJhZGVvbl9nZXRfcGl4bWFwX3RpbGluZ19mbGFncyhwUGl4 KTsKIAlyZXR1cm4gVFJVRTsKICAgICB9IGVsc2UKICNlbmRpZiAvKiBVU0VfR0xBTU9SICovCmRp ZmYgLS1naXQgYS9zcmMvcmFkZW9uX2JvX2hlbHBlci5jIGIvc3JjL3JhZGVvbl9ib19oZWxwZXIu YwppbmRleCAyYjgzNmJiZjYuLjc5ZThmZjFiZCAxMDA2NDQKLS0tIGEvc3JjL3JhZGVvbl9ib19o ZWxwZXIuYworKysgYi9zcmMvcmFkZW9uX2JvX2hlbHBlci5jCkBAIC0yOCw2ICsyOCwzNyBAQAog I2luY2x1ZGUgInJhZGVvbl9nbGFtb3IuaCIKICNpbmNsdWRlICJyYWRlb25fYm9fZ2VtLmgiCiAK KworI2lmZGVmIFVTRV9HTEFNT1IKKworc3RhdGljIHVpbnQzMl90CityYWRlb25fZ2V0X2dibV9m b3JtYXQoaW50IGRlcHRoLCBpbnQgYml0c1BlclBpeGVsKQoreworICAgIHN3aXRjaCAoZGVwdGgp IHsKKyNpZmRlZiBHQk1fRk9STUFUX1I4CisgICAgY2FzZSA4OgorCXJldHVybiBHQk1fRk9STUFU X1I4OworI2VuZGlmCisgICAgY2FzZSAxNjoKKwlyZXR1cm4gR0JNX0ZPUk1BVF9SR0I1NjU7Cisg ICAgY2FzZSAzMjoKKwlyZXR1cm4gR0JNX0ZPUk1BVF9BUkdCODg4ODsKKyAgICBjYXNlIDMwOgor CXJldHVybiBHQk1fRk9STUFUX1hSR0IyMTAxMDEwOworICAgIGNhc2UgMjQ6CisJaWYgKGJpdHNQ ZXJQaXhlbCA9PSAzMikKKwkgICAgcmV0dXJuIEdCTV9GT1JNQVRfWFJHQjg4ODg7CisJLyogZmFs bCB0aHJvdWdoICovCisgICAgZGVmYXVsdDoKKwlFcnJvckYoIiVzOiBVbnN1cHBvcnRlZCBkZXB0 aC9icHAgJWQvJWRcbiIsIF9fZnVuY19fLCBkZXB0aCwKKwkgICAgICAgYml0c1BlclBpeGVsKTsK KwlyZXR1cm4gfjBVOworICAgIH0KK30KKworI2VuZGlmIC8qIFVTRV9HTEFNT1IgKi8KKworCiBz dGF0aWMgY29uc3QgdW5zaWduZWQgTWljcm9CbG9ja1RhYmxlWzVdWzNdWzJdID0gewogICAgIC8q bGluZWFyICB0aWxlZCAgIHNxdWFyZS10aWxlZCAqLwogICAgIHt7MzIsIDF9LCB7OCwgNH0sIHsw LCAwfX0sIC8qICAgOCBiaXRzIHBlciBwaXhlbCAqLwpAQCAtMTU4LDYgKzE4OSw0NiBAQCByYWRl b25fYWxsb2NfcGl4bWFwX2JvKFNjcm5JbmZvUHRyIHBTY3JuLCBpbnQgd2lkdGgsIGludCBoZWln aHQsIGludCBkZXB0aCwKICAgICBzdHJ1Y3QgcmFkZW9uX3N1cmZhY2Ugc3VyZmFjZTsKICAgICBz dHJ1Y3QgcmFkZW9uX2J1ZmZlciAqYm87CiAgICAgaW50IGRvbWFpbiA9IFJBREVPTl9HRU1fRE9N QUlOX1ZSQU07CisKKyNpZmRlZiBVU0VfR0xBTU9SCisgICAgaWYgKGluZm8tPnVzZV9nbGFtb3Ig JiYKKwkhKHVzYWdlX2hpbnQgPT0gQ1JFQVRFX1BJWE1BUF9VU0FHRV9CQUNLSU5HX1BJWE1BUCAm JgorCSAgaW5mby0+c2hhZG93X3ByaW1hcnkpKSB7CisJdWludDMyX3QgYm9fdXNlID0gR0JNX0JP X1VTRV9SRU5ERVJJTkc7CisJdWludDMyX3QgZ2JtX2Zvcm1hdCA9IHJhZGVvbl9nZXRfZ2JtX2Zv cm1hdChkZXB0aCwgYml0c1BlclBpeGVsKTsKKworCWlmIChnYm1fZm9ybWF0ID09IH4wVSkKKwkg ICAgcmV0dXJuIE5VTEw7CisKKwlibyA9IGNhbGxvYygxLCBzaXplb2Yoc3RydWN0IHJhZGVvbl9i dWZmZXIpKTsKKwlpZiAoIWJvKQorCSAgICByZXR1cm4gTlVMTDsKKworCWJvLT5yZWZfY291bnQg PSAxOworCisJaWYgKGJpdHNQZXJQaXhlbCA9PSBwU2Nybi0+Yml0c1BlclBpeGVsKQorCSAgICBi b191c2UgfD0gR0JNX0JPX1VTRV9TQ0FOT1VUOworCisJaWYgKCh1c2FnZV9oaW50ID09IENSRUFU RV9QSVhNQVBfVVNBR0VfQkFDS0lOR19QSVhNQVAgJiYKKwkgICAgIGluZm8tPnNoYWRvd19wcmlt YXJ5KSB8fAorCSAgICAodXNhZ2VfaGludCAmIDB4ZmZmZikgPT0gQ1JFQVRFX1BJWE1BUF9VU0FH RV9TSEFSRUQpCisJICAgIGJvX3VzZSB8PSBHQk1fQk9fVVNFX0xJTkVBUjsKKworCWJvLT5iby5n Ym0gPSBnYm1fYm9fY3JlYXRlKGluZm8tPmdibSwgd2lkdGgsIGhlaWdodCwgZ2JtX2Zvcm1hdCwg Ym9fdXNlKTsKKwlpZiAoIWJvLT5iby5nYm0pIHsKKwkgICAgZnJlZShibyk7CisJICAgIHJldHVy biBOVUxMOworCX0KKworCWJvLT5mbGFncyB8PSBSQURFT05fQk9fRkxBR1NfR0JNOworCisJaWYg KG5ld19waXRjaCkKKwkgICAgKm5ld19waXRjaCA9IGdibV9ib19nZXRfc3RyaWRlKGJvLT5iby5n Ym0pOworCisJcmV0dXJuIGJvOworICAgIH0KKyNlbmRpZgorCiAgICAgaWYgKHVzYWdlX2hpbnQp IHsKIAlpZiAoaW5mby0+YWxsb3dDb2xvclRpbGluZykgewogCSAgICBpZiAodXNhZ2VfaGludCAm IFJBREVPTl9DUkVBVEVfUElYTUFQX1RJTElOR19NQUNSTykKQEAgLTI0NSw2ICszMTYsMTMgQEAg cmFkZW9uX2FsbG9jX3BpeG1hcF9ibyhTY3JuSW5mb1B0ciBwU2NybiwgaW50IHdpZHRoLCBpbnQg aGVpZ2h0LCBpbnQgZGVwdGgsCiB2b2lkCiByYWRlb25fZmluaXNoKFNjcm5JbmZvUHRyIHNjcm4s IHN0cnVjdCByYWRlb25fYnVmZmVyICpibykKIHsKKyAgICBSQURFT05JbmZvUHRyIGluZm8gPSBS QURFT05QVFIoc2Nybik7CisKKyAgICBpZiAoaW5mby0+dXNlX2dsYW1vcikgeworCXJhZGVvbl9n bGFtb3JfZmluaXNoKHNjcm4pOworCXJldHVybjsKKyAgICB9CisKICAgICByYWRlb25fY3NfZmx1 c2hfaW5kaXJlY3Qoc2Nybik7CiAgICAgcmFkZW9uX2JvX3dhaXQoYm8tPmJvLnJhZGVvbik7CiB9 CkBAIC0yODIsNyArMzYwLDcgQEAgQm9vbCByYWRlb25fZ2V0X3BpeG1hcF9oYW5kbGUoUGl4bWFw UHRyIHBpeG1hcCwgdWludDMyX3QgKmhhbmRsZSkKICAgICBSQURFT05JbmZvUHRyIGluZm8gPSBS QURFT05QVFIoc2Nybik7CiAjZW5kaWYKIAotICAgIGlmIChibykgeworICAgIGlmIChibyAmJiAh KGJvLT5mbGFncyAmIFJBREVPTl9CT19GTEFHU19HQk0pKSB7CiAJKmhhbmRsZSA9IGJvLT5iby5y YWRlb24tPmhhbmRsZTsKIAlyZXR1cm4gVFJVRTsKICAgICB9CkBAIC0zODAsNiArNDU4LDQ0IEBA IEJvb2wgcmFkZW9uX3NldF9zaGFyZWRfcGl4bWFwX2JhY2tpbmcoUGl4bWFwUHRyIHBwaXgsIHZv aWQgKmZkX2hhbmRsZSwKICAgICBpZiAoIWJvKQogCWdvdG8gZXJyb3I7CiAKKyNpZmRlZiBVU0Vf R0xBTU9SCisgICAgaWYgKGluZm8tPnVzZV9nbGFtb3IpIHsKKwlzdHJ1Y3QgZ2JtX2ltcG9ydF9m ZF9kYXRhIGRhdGE7CisJdWludDMyX3QgYm9fdXNlID0gR0JNX0JPX1VTRV9SRU5ERVJJTkc7CisK KwlkYXRhLmZvcm1hdCA9IHJhZGVvbl9nZXRfZ2JtX2Zvcm1hdChwcGl4LT5kcmF3YWJsZS5kZXB0 aCwKKwkJCQkJICAgIHBwaXgtPmRyYXdhYmxlLmJpdHNQZXJQaXhlbCk7CisJaWYgKGRhdGEuZm9y bWF0ID09IH4wVSkKKwkgICAgZ290byBlcnJvcjsKKworCWJvLT5yZWZfY291bnQgPSAxOworCisJ ZGF0YS5mZCA9IGloYW5kbGU7CisJZGF0YS53aWR0aCA9IHBwaXgtPmRyYXdhYmxlLndpZHRoOwor CWRhdGEuaGVpZ2h0ID0gcHBpeC0+ZHJhd2FibGUuaGVpZ2h0OworCWRhdGEuc3RyaWRlID0gcHBp eC0+ZGV2S2luZDsKKworCWlmIChwcGl4LT5kcmF3YWJsZS5iaXRzUGVyUGl4ZWwgPT0gcFNjcm4t PmJpdHNQZXJQaXhlbCkKKwkgICAgYm9fdXNlIHw9IEdCTV9CT19VU0VfU0NBTk9VVDsKKworCWJv LT5iby5nYm0gPSBnYm1fYm9faW1wb3J0KGluZm8tPmdibSwgR0JNX0JPX0lNUE9SVF9GRCwgJmRh dGEsIGJvX3VzZSk7CisJaWYgKCFiby0+Ym8uZ2JtKQorCSAgICBnb3RvIGVycm9yOworCisJYm8t PmZsYWdzIHw9IFJBREVPTl9CT19GTEFHU19HQk07CisKKwlpZiAoIXJhZGVvbl9nbGFtb3JfY3Jl YXRlX3RleHR1cmVkX3BpeG1hcChwcGl4LCBibykpIHsKKwkgICAgcmFkZW9uX2J1ZmZlcl91bnJl ZigmYm8pOworCSAgICByZXR1cm4gRkFMU0U7CisJfQorCisJcmV0ID0gcmFkZW9uX3NldF9waXht YXBfYm8ocHBpeCwgYm8pOworCS8qIHJhZGVvbl9zZXRfcGl4bWFwX2JvIGluY3JlbWVudHMgcmVm X2NvdW50IGlmIGl0IHN1Y2NlZWRzICovCisJcmFkZW9uX2J1ZmZlcl91bnJlZigmYm8pOworCXJl dHVybiByZXQ7CisgICAgfQorI2VuZGlmCisKICAgICBiby0+Ym8ucmFkZW9uID0gcmFkZW9uX2dl bV9ib19vcGVuX3ByaW1lKGluZm8tPmJ1Zm1nciwgaWhhbmRsZSwgc2l6ZSk7CiAgICAgaWYgKCFi bykKICAgICAgICAgZ290byBlcnJvcjsKZGlmZiAtLWdpdCBhL3NyYy9yYWRlb25fYm9faGVscGVy LmggYi9zcmMvcmFkZW9uX2JvX2hlbHBlci5oCmluZGV4IDUzYWY4N2MzNy4uY2MzZDFkM2JkIDEw MDY0NAotLS0gYS9zcmMvcmFkZW9uX2JvX2hlbHBlci5oCisrKyBiL3NyYy9yYWRlb25fYm9faGVs cGVyLmgKQEAgLTIzLDEzICsyMywyMSBAQAogI2lmbmRlZiBSQURFT05fQk9fSEVMUEVSX0gKICNk ZWZpbmUgUkFERU9OX0JPX0hFTFBFUl9IIDEKIAorI2lmZGVmIFVTRV9HTEFNT1IKKyNpbmNsdWRl IDxnYm0uaD4KKyNlbmRpZgorCiAjZGVmaW5lIFJBREVPTl9CT19GTEFHU19HQk0JMHgxCiAKIHN0 cnVjdCByYWRlb25fYnVmZmVyIHsKIAl1bmlvbiB7CisjaWZkZWYgVVNFX0dMQU1PUgorCQlzdHJ1 Y3QgZ2JtX2JvICpnYm07CisjZW5kaWYKIAkJc3RydWN0IHJhZGVvbl9ibyAqcmFkZW9uOwogCX0g Ym87CiAJdWludDMyX3QgcmVmX2NvdW50OworICAgIHVpbnQzMl90IGZsYWdzOwogfTsKIAogZXh0 ZXJuIHN0cnVjdCByYWRlb25fYnVmZmVyICoKQEAgLTg4LDggKzk2LDE2IEBAIHJhZGVvbl9idWZm ZXJfdW5yZWYoc3RydWN0IHJhZGVvbl9idWZmZXIgKipidWZmZXIpCiAJcmV0dXJuOwogICAgIH0K IAotICAgIHJhZGVvbl9ib191bm1hcChidWYtPmJvLnJhZGVvbik7Ci0gICAgcmFkZW9uX2JvX3Vu cmVmKGJ1Zi0+Ym8ucmFkZW9uKTsKKyNpZmRlZiBVU0VfR0xBTU9SCisgICAgaWYgKGJ1Zi0+Zmxh Z3MgJiBSQURFT05fQk9fRkxBR1NfR0JNKSB7CisJZ2JtX2JvX2Rlc3Ryb3koYnVmLT5iby5nYm0p OworICAgIH0gZWxzZQorI2VuZGlmCisgICAgeworCXJhZGVvbl9ib191bm1hcChidWYtPmJvLnJh ZGVvbik7CisJcmFkZW9uX2JvX3VucmVmKGJ1Zi0+Ym8ucmFkZW9uKTsKKyAgICB9CisKICAgICBm cmVlKGJ1Zik7CiAgICAgKmJ1ZmZlciA9IE5VTEw7CiB9CmRpZmYgLS1naXQgYS9zcmMvcmFkZW9u X2RyaTIuYyBiL3NyYy9yYWRlb25fZHJpMi5jCmluZGV4IDU4NGExZDlkMS4uYWIzZGI2YzVlIDEw MDY0NAotLS0gYS9zcmMvcmFkZW9uX2RyaTIuYworKysgYi9zcmMvcmFkZW9uX2RyaTIuYwpAQCAt NzksMTEgKzc5LDEyIEBAIHN0YXRpYyBEZXZQcml2YXRlS2V5UmVjIGRyaTJfd2luZG93X3ByaXZh dGVfa2V5X3JlYzsKIHN0YXRpYyBCb29sCiByYWRlb25fZ2V0X2ZsaW5rX25hbWUoUkFERU9ORW50 UHRyIHBSQURFT05FbnQsIFBpeG1hcFB0ciBwaXhtYXAsIHVpbnQzMl90ICpuYW1lKQogewotICAg IHN0cnVjdCByYWRlb25fYm8gKmJvID0gcmFkZW9uX2dldF9waXhtYXBfYm8ocGl4bWFwKS0+Ym8u cmFkZW9uOworICAgIHN0cnVjdCByYWRlb25fYnVmZmVyICpibyA9IHJhZGVvbl9nZXRfcGl4bWFw X2JvKHBpeG1hcCk7CiAgICAgc3RydWN0IGRybV9nZW1fZmxpbmsgZmxpbms7CiAKLSAgICBpZiAo Ym8pCi0JcmV0dXJuIHJhZGVvbl9nZW1fZ2V0X2tlcm5lbF9uYW1lKGJvLCBuYW1lKSA9PSAwOwor ICAgIGlmIChibyAmJiAhKGJvLT5mbGFncyAmIFJBREVPTl9CT19GTEFHU19HQk0pICYmCisJcmFk ZW9uX2dlbV9nZXRfa2VybmVsX25hbWUoYm8tPmJvLnJhZGVvbiwgbmFtZSkgPT0gMCkKKwlyZXR1 cm4gVFJVRTsKIAogICAgIGlmIChyYWRlb25fZ2V0X3BpeG1hcF9oYW5kbGUocGl4bWFwLCAmZmxp bmsuaGFuZGxlKSkgewogCWlmIChkcm1Jb2N0bChwUkFERU9ORW50LT5mZCwgRFJNX0lPQ1RMX0dF TV9GTElOSywgJmZsaW5rKSAhPSAwKQpkaWZmIC0tZ2l0IGEvc3JjL3JhZGVvbl9kcmkzLmMgYi9z cmMvcmFkZW9uX2RyaTMuYwppbmRleCBiMTk5Yzc5MzcuLjY4OGU1OTRlMSAxMDA2NDQKLS0tIGEv c3JjL3JhZGVvbl9kcmkzLmMKKysrIGIvc3JjL3JhZGVvbl9kcmkzLmMKQEAgLTIxMywxNyArMjEz LDE2IEBAIHN0YXRpYyBpbnQgcmFkZW9uX2RyaTNfZmRfZnJvbV9waXhtYXAoU2NyZWVuUHRyIHNj cmVlbiwKIHsKIAlzdHJ1Y3QgcmFkZW9uX2JvICpibzsKIAlpbnQgZmQ7Ci0KLQlibyA9IHJhZGVv bl9nZXRfcGl4bWFwX2JvKHBpeG1hcCktPmJvLnJhZGVvbjsKLQlpZiAoIWJvKSB7CiAjaWZkZWYg VVNFX0dMQU1PUgotCQlTY3JuSW5mb1B0ciBzY3JuID0geGY4NlNjcmVlblRvU2NybihzY3JlZW4p OwotCQlSQURFT05JbmZvUHRyIGluZm8gPSBSQURFT05QVFIoc2Nybik7CisJU2NybkluZm9QdHIg c2NybiA9IHhmODZTY3JlZW5Ub1Njcm4oc2NyZWVuKTsKKwlSQURFT05JbmZvUHRyIGluZm8gPSBS QURFT05QVFIoc2Nybik7CiAKLQkJaWYgKGluZm8tPnVzZV9nbGFtb3IpCi0JCQlyZXR1cm4gZ2xh bW9yX2ZkX2Zyb21fcGl4bWFwKHNjcmVlbiwgcGl4bWFwLCBzdHJpZGUsIHNpemUpOworCWlmIChp bmZvLT51c2VfZ2xhbW9yKQorCQlyZXR1cm4gZ2xhbW9yX2ZkX2Zyb21fcGl4bWFwKHNjcmVlbiwg cGl4bWFwLCBzdHJpZGUsIHNpemUpOwogI2VuZGlmCiAKKwlibyA9IHJhZGVvbl9nZXRfcGl4bWFw X2JvKHBpeG1hcCktPmJvLnJhZGVvbjsKKwlpZiAoIWJvKSB7CiAJCWV4YU1vdmVJblBpeG1hcChw aXhtYXApOwogCQlibyA9IHJhZGVvbl9nZXRfcGl4bWFwX2JvKHBpeG1hcCktPmJvLnJhZGVvbjsK IAkJaWYgKCFibykKZGlmZiAtLWdpdCBhL3NyYy9yYWRlb25fZ2xhbW9yLmMgYi9zcmMvcmFkZW9u X2dsYW1vci5jCmluZGV4IGMxZDk2MTYwNC4uZmE2MzQ5NDcyIDEwMDY0NAotLS0gYS9zcmMvcmFk ZW9uX2dsYW1vci5jCisrKyBiL3NyYy9yYWRlb25fZ2xhbW9yLmMKQEAgLTUyLDYgKzUyLDcgQEAg cmFkZW9uX2dsYW1vcl9jcmVhdGVfc2NyZWVuX3Jlc291cmNlcyhTY3JlZW5QdHIgc2NyZWVuKQog ewogCVNjcm5JbmZvUHRyIHNjcm4gPSB4Zjg2U2NyZWVuVG9TY3JuKHNjcmVlbik7CiAJUkFERU9O SW5mb1B0ciBpbmZvID0gUkFERU9OUFRSKHNjcm4pOworCXVpbnQzMl90IGhhbmRsZTsKIAogCWlm ICghaW5mby0+dXNlX2dsYW1vcikKIAkJcmV0dXJuIFRSVUU7CkBAIC02MSw4ICs2MiwxMiBAQCBy YWRlb25fZ2xhbW9yX2NyZWF0ZV9zY3JlZW5fcmVzb3VyY2VzKFNjcmVlblB0ciBzY3JlZW4pCiAJ CXJldHVybiBGQUxTRTsKICNlbmRpZgogCi0JaWYgKCFnbGFtb3JfZWdsX2NyZWF0ZV90ZXh0dXJl ZF9zY3JlZW4oc2NyZWVuLAotCQkJCQkgICAgICAgaW5mby0+ZnJvbnRfYnVmZmVyLT5iby5yYWRl b24tPmhhbmRsZSwKKwlpZiAoaW5mby0+ZnJvbnRfYnVmZmVyLT5mbGFncyAmIFJBREVPTl9CT19G TEFHU19HQk0pCisJCWhhbmRsZSA9IGdibV9ib19nZXRfaGFuZGxlKGluZm8tPmZyb250X2J1ZmZl ci0+Ym8uZ2JtKS51MzI7CisJZWxzZQorCQloYW5kbGUgPSBpbmZvLT5mcm9udF9idWZmZXItPmJv LnJhZGVvbi0+aGFuZGxlOworCisJaWYgKCFnbGFtb3JfZWdsX2NyZWF0ZV90ZXh0dXJlZF9zY3Jl ZW4oc2NyZWVuLCBoYW5kbGUsCiAJCQkJCSAgICAgICBzY3JuLT5kaXNwbGF5V2lkdGggKgogCQkJ CQkgICAgICAgaW5mby0+cGl4ZWxfYnl0ZXMpKQogCQlyZXR1cm4gRkFMU0U7CkBAIC0xMzYsNiAr MTQxLDEzIEBAIHJhZGVvbl9nbGFtb3JfcHJlX2luaXQoU2NybkluZm9QdHIgc2NybikKIAl9CiAj ZW5kaWYKIAorCWluZm8tPmdibSA9IGdibV9jcmVhdGVfZGV2aWNlKHBSQURFT05FbnQtPmZkKTsK KwlpZiAoIWluZm8tPmdibSkgeworCQl4Zjg2RHJ2TXNnKHNjcm4tPnNjcm5JbmRleCwgWF9FUlJP UiwKKwkJCSAgICJnYm1fY3JlYXRlX2RldmljZSByZXR1cm5lZCBOVUxMXG4iKTsKKwkJcmV0dXJu IEZBTFNFOworCX0KKwogCS8qIExvYWQgZ2xhbW9yIG1vZHVsZSAqLwogCWlmICgoZ2xhbW9yX21v ZHVsZSA9IHhmODZMb2FkU3ViTW9kdWxlKHNjcm4sIEdMQU1PUl9FR0xfTU9EVUxFX05BTUUpKSkg ewogCQl2ZXJzaW9uID0geGY4NkdldE1vZHVsZVZlcnNpb24oZ2xhbW9yX21vZHVsZSk7CkBAIC0x NjQsMTAgKzE3NiwyMSBAQCByYWRlb25fZ2xhbW9yX3ByZV9pbml0KFNjcm5JbmZvUHRyIHNjcm4p CiB9CiAKIEJvb2wKLXJhZGVvbl9nbGFtb3JfY3JlYXRlX3RleHR1cmVkX3BpeG1hcChQaXhtYXBQ dHIgcGl4bWFwLCBzdHJ1Y3QgcmFkZW9uX3BpeG1hcCAqcHJpdikKK3JhZGVvbl9nbGFtb3JfY3Jl YXRlX3RleHR1cmVkX3BpeG1hcChQaXhtYXBQdHIgcGl4bWFwLCBzdHJ1Y3QgcmFkZW9uX2J1ZmZl ciAqYm8pCiB7Ci0JcmV0dXJuIGdsYW1vcl9lZ2xfY3JlYXRlX3RleHR1cmVkX3BpeG1hcChwaXht YXAsIHByaXYtPmJvLT5iby5yYWRlb24tPmhhbmRsZSwKLQkJCQkJCSBwaXhtYXAtPmRldktpbmQp OworCVNjcm5JbmZvUHRyIHNjcm4gPSB4Zjg2U2NyZWVuVG9TY3JuKHBpeG1hcC0+ZHJhd2FibGUu cFNjcmVlbik7CisJUkFERU9OSW5mb1B0ciBpbmZvID0gUkFERU9OUFRSKHNjcm4pOworCXVpbnQz Ml90IGhhbmRsZTsKKworCWlmICghaW5mby0+dXNlX2dsYW1vcikKKwkJcmV0dXJuIFRSVUU7CisK KwlpZiAoYm8tPmZsYWdzICYgUkFERU9OX0JPX0ZMQUdTX0dCTSkKKwkJaGFuZGxlID0gZ2JtX2Jv X2dldF9oYW5kbGUoYm8tPmJvLmdibSkudTMyOworCWVsc2UKKwkJaGFuZGxlID0gYm8tPmJvLnJh ZGVvbi0+aGFuZGxlOworCisJcmV0dXJuIGdsYW1vcl9lZ2xfY3JlYXRlX3RleHR1cmVkX3BpeG1h cChwaXhtYXAsIGhhbmRsZSwgcGl4bWFwLT5kZXZLaW5kKTsKIH0KIAogc3RhdGljIEJvb2wgcmFk ZW9uX2dsYW1vcl9kZXN0cm95X3BpeG1hcChQaXhtYXBQdHIgcGl4bWFwKQpAQCAtMTc5LDEzICsy MDIsNiBAQCBzdGF0aWMgQm9vbCByYWRlb25fZ2xhbW9yX2Rlc3Ryb3lfcGl4bWFwKFBpeG1hcFB0 ciBwaXhtYXApCiAjZW5kaWYKIAogCWlmIChwaXhtYXAtPnJlZmNudCA9PSAxKSB7Ci0JCWlmIChw aXhtYXAtPmRldlByaXZhdGUucHRyKSB7Ci0JCQlzdHJ1Y3QgcmFkZW9uX2J1ZmZlciAqYm8gPSBy YWRlb25fZ2V0X3BpeG1hcF9ibyhwaXhtYXApOwotCi0JCQlpZiAoYm8pCi0JCQkJcmFkZW9uX2Jv X3VubWFwKGJvLT5iby5yYWRlb24pOwotCQl9Ci0KICNpZmRlZiBIQVZFX0dMQU1PUl9FR0xfREVT VFJPWV9URVhUVVJFRF9QSVhNQVAKIAkJZ2xhbW9yX2VnbF9kZXN0cm95X3RleHR1cmVkX3BpeG1h cChwaXhtYXApOwogI2VuZGlmCkBAIC0yNTksNyArMjc1LDcgQEAgcmFkZW9uX2dsYW1vcl9jcmVh dGVfcGl4bWFwKFNjcmVlblB0ciBzY3JlZW4sIGludCB3LCBpbnQgaCwgaW50IGRlcHRoLAogCiAJ CXNjcmVlbi0+TW9kaWZ5UGl4bWFwSGVhZGVyKHBpeG1hcCwgdywgaCwgMCwgMCwgc3RyaWRlLCBO VUxMKTsKIAotCQlpZiAoIXJhZGVvbl9nbGFtb3JfY3JlYXRlX3RleHR1cmVkX3BpeG1hcChwaXht YXAsIHByaXYpKQorCQlpZiAoIXJhZGVvbl9nbGFtb3JfY3JlYXRlX3RleHR1cmVkX3BpeG1hcChw aXhtYXAsIHByaXYtPmJvKSkKIAkJCWdvdG8gZmFsbGJhY2tfZ2xhbW9yOwogCiAJCXBpeG1hcC0+ ZGV2UHJpdmF0ZS5wdHIgPSBOVUxMOwpAQCAtMzkwLDEzICs0MDYsMTIgQEAgcmFkZW9uX2dsYW1v cl9zZXRfc2hhcmVkX3BpeG1hcF9iYWNraW5nKFBpeG1hcFB0ciBwaXhtYXAsIHZvaWQgKmhhbmRs ZSkKIHsKIAlTY3JlZW5QdHIgc2NyZWVuID0gcGl4bWFwLT5kcmF3YWJsZS5wU2NyZWVuOwogCVNj cm5JbmZvUHRyIHNjcm4gPSB4Zjg2U2NyZWVuVG9TY3JuKHNjcmVlbik7Ci0Jc3RydWN0IHJhZGVv bl9waXhtYXAgKnByaXY7CiAKIAlpZiAoIXJhZGVvbl9zZXRfc2hhcmVkX3BpeG1hcF9iYWNraW5n KHBpeG1hcCwgaGFuZGxlLCBOVUxMKSkKIAkJcmV0dXJuIEZBTFNFOwogCi0JcHJpdiA9IHJhZGVv bl9nZXRfcGl4bWFwX3ByaXZhdGUocGl4bWFwKTsKLQlpZiAoIXJhZGVvbl9nbGFtb3JfY3JlYXRl X3RleHR1cmVkX3BpeG1hcChwaXhtYXAsIHByaXYpKSB7CisJaWYgKCFyYWRlb25fZ2xhbW9yX2Ny ZWF0ZV90ZXh0dXJlZF9waXhtYXAocGl4bWFwLAorCQkJCQkJICByYWRlb25fZ2V0X3BpeG1hcF9i byhwaXhtYXApKSkgewogCQl4Zjg2RHJ2TXNnKHNjcm4tPnNjcm5JbmRleCwgWF9FUlJPUiwKIAkJ CSAgICJGYWlsZWQgdG8gZ2V0IFBSSU1FIGRyYXdhYmxlIGZvciBnbGFtb3IgcGl4bWFwLlxuIik7 CiAJCXJldHVybiBGQUxTRTsKZGlmZiAtLWdpdCBhL3NyYy9yYWRlb25fZ2xhbW9yLmggYi9zcmMv cmFkZW9uX2dsYW1vci5oCmluZGV4IGVjNDJkZjFmMS4uMjc0MGFiMzM1IDEwMDY0NAotLS0gYS9z cmMvcmFkZW9uX2dsYW1vci5oCisrKyBiL3NyYy9yYWRlb25fZ2xhbW9yLmgKQEAgLTMzLDYgKzMz LDEyIEBAIHN0cnVjdCByYWRlb25fcGl4bWFwOwogCiAjaWZkZWYgVVNFX0dMQU1PUgogCisjaWZu ZGVmIEhBVkVfR0xBTU9SX0ZJTklTSAorI2luY2x1ZGUgPEdML2dsLmg+CisjZW5kaWYKKworI2lu Y2x1ZGUgPGdibS5oPgorCiAjZGVmaW5lIEdMQU1PUl9GT1JfWE9SRyAgMQogI2luY2x1ZGUgPGds YW1vci5oPgogCkBAIC02NSwxMiArNzEsMjcgQEAgdm9pZCByYWRlb25fZ2xhbW9yX3NjcmVlbl9p bml0KFNjcmVlblB0ciBzY3JlZW4pOwogQm9vbCByYWRlb25fZ2xhbW9yX2NyZWF0ZV9zY3JlZW5f cmVzb3VyY2VzKFNjcmVlblB0ciBzY3JlZW4pOwogdm9pZCByYWRlb25fZ2xhbW9yX2ZyZWVfc2Ny ZWVuKGludCBzY3JuSW5kZXgsIGludCBmbGFncyk7CiAKLUJvb2wgcmFkZW9uX2dsYW1vcl9jcmVh dGVfdGV4dHVyZWRfcGl4bWFwKFBpeG1hcFB0ciBwaXhtYXAsIHN0cnVjdCByYWRlb25fcGl4bWFw ICpwcml2KTsKK0Jvb2wgcmFkZW9uX2dsYW1vcl9jcmVhdGVfdGV4dHVyZWRfcGl4bWFwKFBpeG1h cFB0ciBwaXhtYXAsIHN0cnVjdCByYWRlb25fYnVmZmVyICpibyk7CiB2b2lkIHJhZGVvbl9nbGFt b3JfZXhjaGFuZ2VfYnVmZmVycyhQaXhtYXBQdHIgc3JjLCBQaXhtYXBQdHIgZHN0KTsKIFBpeG1h cFB0ciByYWRlb25fZ2xhbW9yX3NldF9waXhtYXBfYm8oRHJhd2FibGVQdHIgZHJhd2FibGUsIFBp eG1hcFB0ciBwaXhtYXApOwogCiBYRjg2VmlkZW9BZGFwdG9yUHRyIHJhZGVvbl9nbGFtb3JfeHZf aW5pdChTY3JlZW5QdHIgcFNjcmVlbiwgaW50IG51bV9hZGFwdCk7CiAKK3N0YXRpYyBpbmxpbmUg dm9pZAorcmFkZW9uX2dsYW1vcl9maW5pc2goU2NybkluZm9QdHIgc2NybikKK3sKKwlSQURFT05J bmZvUHRyIGluZm8gPSBSQURFT05QVFIoc2Nybik7CisKKyNpZiBIQVZFX0dMQU1PUl9GSU5JU0gK KwlnbGFtb3JfZmluaXNoKHNjcm4tPnBTY3JlZW4pOworI2Vsc2UKKwlnbGFtb3JfYmxvY2tfaGFu ZGxlcihzY3JuKTsKKwlnbEZpbmlzaCgpOworI2VuZGlmCisKKwlpbmZvLT5ncHVfZmx1c2hlZCsr OworfQorCiAjZWxzZQogCiBzdGF0aWMgaW5saW5lIEJvb2wgcmFkZW9uX2dsYW1vcl9wcmVfaW5p dChTY3JuSW5mb1B0ciBzY3JuKSB7IHJldHVybiBGQUxTRTsgfQpAQCAtNzksNyArMTAwLDcgQEAg c3RhdGljIGlubGluZSB2b2lkIHJhZGVvbl9nbGFtb3JfZmluaShTY3JlZW5QdHIgc2NyZWVuKSB7 IH0KIHN0YXRpYyBpbmxpbmUgQm9vbCByYWRlb25fZ2xhbW9yX2NyZWF0ZV9zY3JlZW5fcmVzb3Vy Y2VzKFNjcmVlblB0ciBzY3JlZW4pIHsgcmV0dXJuIEZBTFNFOyB9CiBzdGF0aWMgaW5saW5lIHZv aWQgcmFkZW9uX2dsYW1vcl9mcmVlX3NjcmVlbihpbnQgc2NybkluZGV4LCBpbnQgZmxhZ3MpIHsg fQogCi1zdGF0aWMgaW5saW5lIEJvb2wgcmFkZW9uX2dsYW1vcl9jcmVhdGVfdGV4dHVyZWRfcGl4 bWFwKFBpeG1hcFB0ciBwaXhtYXAsIHN0cnVjdCByYWRlb25fcGl4bWFwICpwcml2KSB7IHJldHVy biBUUlVFOyB9CitzdGF0aWMgaW5saW5lIEJvb2wgcmFkZW9uX2dsYW1vcl9jcmVhdGVfdGV4dHVy ZWRfcGl4bWFwKFBpeG1hcFB0ciBwaXhtYXAsIHN0cnVjdCByYWRlb25fYnVmZmVyICpibykgeyBy ZXR1cm4gVFJVRTsgfQogCiBzdGF0aWMgaW5saW5lIHZvaWQgcmFkZW9uX2dsYW1vcl9leGNoYW5n ZV9idWZmZXJzKFBpeG1hcFB0ciBzcmMsIFBpeG1hcFB0ciBkc3QpIHt9CiBzdGF0aWMgaW5saW5l IFBpeG1hcFB0ciByYWRlb25fZ2xhbW9yX3NldF9waXhtYXBfYm8oRHJhd2FibGVQdHIgZHJhd2Fi bGUsIFBpeG1hcFB0ciBwaXhtYXApIHsgcmV0dXJuIHBpeG1hcDsgfQpAQCAtODcsNiArMTA4LDkg QEAgc3RhdGljIGlubGluZSBQaXhtYXBQdHIgcmFkZW9uX2dsYW1vcl9zZXRfcGl4bWFwX2JvKERy YXdhYmxlUHRyIGRyYXdhYmxlLCBQaXhtYXAKIHN0YXRpYyBpbmxpbmUgc3RydWN0IHJhZGVvbl9w aXhtYXAgKnJhZGVvbl9nZXRfcGl4bWFwX3ByaXZhdGUoUGl4bWFwUHRyIHBpeG1hcCkgeyByZXR1 cm4gTlVMTDsgfQogCiBzdGF0aWMgaW5saW5lIFhGODZWaWRlb0FkYXB0b3JQdHIgcmFkZW9uX2ds YW1vcl94dl9pbml0KFNjcmVlblB0ciBwU2NyZWVuLCBpbnQgbnVtX2FkYXB0KSB7IHJldHVybiBO VUxMOyB9CisKK3N0YXRpYyBpbmxpbmUgdm9pZCByYWRlb25fZ2xhbW9yX2ZpbmlzaChTY3JuSW5m b1B0ciBwU2NybikgeyB9CisKICNlbmRpZgogCiAjZW5kaWYgLyogUkFERU9OX0dMQU1PUl9IICov CmRpZmYgLS1naXQgYS9zcmMvcmFkZW9uX2ttcy5jIGIvc3JjL3JhZGVvbl9rbXMuYwppbmRleCBk M2VlZWJlYTguLjcyZTYwODMxZSAxMDA2NDQKLS0tIGEvc3JjL3JhZGVvbl9rbXMuYworKysgYi9z cmMvcmFkZW9uX2ttcy5jCkBAIC0yMTIsNiArMjEyLDExIEBAIHN0YXRpYyB2b2lkIFJBREVPTkZy ZWVSZWMoU2NybkluZm9QdHIgcFNjcm4pCiAJICAgIGluZm8tPmFjY2VsX3N0YXRlID0gTlVMTDsK IAl9CiAKKyNpZmRlZiBVU0VfR0xBTU9SCisJaWYgKGluZm8tPmdibSkKKwkgICAgZ2JtX2Rldmlj ZV9kZXN0cm95KGluZm8tPmdibSk7CisjZW5kaWYKKwogCXBFbnQgPSBpbmZvLT5wRW50OwogCWZy ZWUocFNjcm4tPmRyaXZlclByaXZhdGUpOwogCXBTY3JuLT5kcml2ZXJQcml2YXRlID0gTlVMTDsK QEAgLTIyNjksNyArMjI3NCwxMSBAQCBCb29sIFJBREVPTlNjcmVlbkluaXRfS01TKFNjcmVlblB0 ciBwU2NyZWVuLCBpbnQgYXJnYywgY2hhciAqKmFyZ3YpCiAJeGY4NkRydk1zZyhwU2Nybi0+c2Ny bkluZGV4LCBYX0VSUk9SLCAicmFkZW9uX3NldHVwX2tlcm5lbF9tZW0gZmFpbGVkXG4iKTsKIAly ZXR1cm4gRkFMU0U7CiAgICAgfQotICAgIGZyb250X3B0ciA9IGluZm8tPmZyb250X2J1ZmZlci0+ Ym8ucmFkZW9uLT5wdHI7CisKKyAgICBpZiAoIShpbmZvLT5mcm9udF9idWZmZXItPmZsYWdzICYg UkFERU9OX0JPX0ZMQUdTX0dCTSkpCisJZnJvbnRfcHRyID0gaW5mby0+ZnJvbnRfYnVmZmVyLT5i by5yYWRlb24tPnB0cjsKKyAgICBlbHNlCisJZnJvbnRfcHRyID0gTlVMTDsKIAogICAgIGlmIChp bmZvLT5yNjAwX3NoYWRvd19mYikgewogCWluZm8tPmZiX3NoYWRvdyA9IGNhbGxvYygxLApAQCAt MjczOSwyMSArMjc0OCwyNCBAQCBzdGF0aWMgQm9vbCByYWRlb25fc2V0dXBfa2VybmVsX21lbShT Y3JlZW5QdHIgcFNjcmVlbikKICAgICAgICAgICAgICAgICBFcnJvckYoIkZhaWxlZCB0byBtYXAg Y3Vyc29yIGJ1ZmZlciBtZW1vcnlcbiIpOwogICAgICAgICAgICAgfQogICAgICAgICB9CisKKwlp ZiAoIWluZm8tPnVzZV9nbGFtb3IpIHsKICNpZiBYX0JZVEVfT1JERVIgPT0gWF9CSUdfRU5ESUFO Ci0Jc3dpdGNoIChjcHApIHsKLQljYXNlIDQ6Ci0JICAgIHRpbGluZ19mbGFncyB8PSBSQURFT05f VElMSU5HX1NXQVBfMzJCSVQ7Ci0JICAgIGJyZWFrOwotCWNhc2UgMjoKLQkgICAgdGlsaW5nX2Zs YWdzIHw9IFJBREVPTl9USUxJTkdfU1dBUF8xNkJJVDsKLQkgICAgYnJlYWs7Ci0JfQotCWlmIChp bmZvLT5DaGlwRmFtaWx5IDwgQ0hJUF9GQU1JTFlfUjYwMCAmJgotCSAgICBpbmZvLT5yNjAwX3No YWRvd19mYiAmJiB0aWxpbmdfZmxhZ3MpCi0JICAgIHRpbGluZ19mbGFncyB8PSBSQURFT05fVElM SU5HX1NVUkZBQ0U7CisJICAgIHN3aXRjaCAoY3BwKSB7CisJICAgIGNhc2UgNDoKKwkJdGlsaW5n X2ZsYWdzIHw9IFJBREVPTl9USUxJTkdfU1dBUF8zMkJJVDsKKwkJYnJlYWs7CisJICAgIGNhc2Ug MjoKKwkJdGlsaW5nX2ZsYWdzIHw9IFJBREVPTl9USUxJTkdfU1dBUF8xNkJJVDsKKwkJYnJlYWs7 CisJICAgIH0KKwkgICAgaWYgKGluZm8tPkNoaXBGYW1pbHkgPCBDSElQX0ZBTUlMWV9SNjAwICYm CisJCWluZm8tPnI2MDBfc2hhZG93X2ZiICYmIHRpbGluZ19mbGFncykKKwkJdGlsaW5nX2ZsYWdz IHw9IFJBREVPTl9USUxJTkdfU1VSRkFDRTsKICNlbmRpZgotCWlmICh0aWxpbmdfZmxhZ3MpCi0g ICAgICAgICAgICByYWRlb25fYm9fc2V0X3RpbGluZyhpbmZvLT5mcm9udF9idWZmZXItPmJvLnJh ZGVvbiwgdGlsaW5nX2ZsYWdzLCBwaXRjaCk7CisJICAgIGlmICh0aWxpbmdfZmxhZ3MpCisJCXJh ZGVvbl9ib19zZXRfdGlsaW5nKGluZm8tPmZyb250X2J1ZmZlci0+Ym8ucmFkZW9uLCB0aWxpbmdf ZmxhZ3MsIHBpdGNoKTsKKwl9CiAgICAgfQogCiAgICAgcFNjcm4tPmRpc3BsYXlXaWR0aCA9IHBp dGNoIC8gY3BwOwotLSAKMi4xOC4wCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fXwphbWQtZ2Z4IG1haWxpbmcgbGlzdAphbWQtZ2Z4QGxpc3RzLmZyZWVkZXNr dG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2Ft ZC1nZngK