From: Keith Packard Subject: [PATCH 06/12] Remove glamor support from UXA acceleration Date: Thu, 24 Jul 2014 16:18:22 -0700 Message-ID: <1406243908-1123-7-git-send-email-keithp@keithp.com> References: <1406243908-1123-1-git-send-email-keithp@keithp.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1406243908-1123-1-git-send-email-keithp@keithp.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: xorg-devel@lists.freedesktop.org, intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org TWFrZXMgVVhBIG5vIGxvbmdlciBpbmNsdWRlIGNhbGxzIHRvIGdsYW1vciBhY2NlbGVyYXRpb24g ZnVuY3Rpb25zLgoKU2lnbmVkLW9mZi1ieTogS2VpdGggUGFja2FyZCA8a2VpdGhwQGtlaXRocC5j b20+Ci0tLQogc3JjL3V4YS9NYWtlZmlsZS5hbSAgICB8ICAgOSAtLQogc3JjL3V4YS9pbnRlbF9k cmkuYyAgICB8ICA2MCArLS0tLS0tLS0tLS0tCiBzcmMvdXhhL2ludGVsX2RyaXZlci5jIHwgICAx IC0KIHNyYy91eGEvaW50ZWxfdXhhLmMgICAgfCAgNDkgLS0tLS0tLS0tLS0KIHNyYy91eGEvaW50 ZWxfdXhhLmggICAgfCAgIDEgLQogc3JjL3V4YS91eGEtYWNjZWwuYyAgICB8IDIzMCAtLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiBzcmMvdXhhL3V4YS1n bGFtb3IuaCAgIHwgIDY1IC0tLS0tLS0tLS0tLS0tCiBzcmMvdXhhL3V4YS1nbHlwaHMuYyAgIHwg IDI4IC0tLS0tLQogc3JjL3V4YS91eGEtcmVuZGVyLmMgICB8ICA3OSAtLS0tLS0tLS0tLS0tLS0t LQogc3JjL3V4YS91eGEuYyAgICAgICAgICB8ICAgNyAtLQogc3JjL3V4YS91eGEuaCAgICAgICAg ICB8ICAxNiAtLS0tCiAxMSBmaWxlcyBjaGFuZ2VkLCAyIGluc2VydGlvbnMoKyksIDU0MyBkZWxl dGlvbnMoLSkKIGRlbGV0ZSBtb2RlIDEwMDY0NCBzcmMvdXhhL3V4YS1nbGFtb3IuaAoKZGlmZiAt LWdpdCBhL3NyYy91eGEvTWFrZWZpbGUuYW0gYi9zcmMvdXhhL01ha2VmaWxlLmFtCmluZGV4IDIz YjA3NGQuLmI5NjE4YzkgMTAwNjQ0Ci0tLSBhL3NyYy91eGEvTWFrZWZpbGUuYW0KKysrIGIvc3Jj L3V4YS9NYWtlZmlsZS5hbQpAQCAtMzQsNyArMzQsNiBAQCBsaWJ1eGFfbGFfU09VUkNFUyA9IFwK IAlpbnRlbF9iYXRjaGJ1ZmZlci5oIFwKIAlpbnRlbF9kaXNwbGF5LmMgXAogCWludGVsX2RyaXZl ci5jIFwKLQlpbnRlbF9nbGFtb3IuaCBcCiAJaW50ZWxfbWVtb3J5LmMgXAogCWludGVsX3V4YS5j IFwKIAlpbnRlbF92aWRlby5jIFwKQEAgLTY1LDE0ICs2NCw2IEBAIGxpYnV4YV9sYV9TT1VSQ0VT ID0gXAogCXV4YS11bmFjY2VsLmMKIAkkKE5VTEwpCiAKLWlmIEdMQU1PUgotQU1fQ0ZMQUdTICs9 ICQoTElCR0xBTU9SX0NGTEFHUykKLWxpYnV4YV9sYV9MSUJBREQgKz0gJChMSUJHTEFNT1JfTElC UykKLWxpYnV4YV9sYV9TT1VSQ0VTICs9IFwKLQkgaW50ZWxfZ2xhbW9yLmMgXAotCSAkKE5VTEwp Ci1lbmRpZgotCiBpZiBEUkkyCiBBTV9DRkxBR1MgKz0gJChEUkkyX0NGTEFHUykKIGxpYnV4YV9s YV9TT1VSQ0VTICs9IFwKZGlmZiAtLWdpdCBhL3NyYy91eGEvaW50ZWxfZHJpLmMgYi9zcmMvdXhh L2ludGVsX2RyaS5jCmluZGV4IDY1NjEyZjcuLjc5OTc4YWIgMTAwNjQ0Ci0tLSBhL3NyYy91eGEv aW50ZWxfZHJpLmMKKysrIGIvc3JjL3V4YS9pbnRlbF9kcmkuYwpAQCAtNzkzLDM4ICs3OTMsNiBA QCBJODMwRFJJMkV4Y2hhbmdlQnVmZmVycyhzdHJ1Y3QgaW50ZWxfc2NyZWVuX3ByaXZhdGUgKmlu dGVsLCBEUkkyQnVmZmVyUHRyIGZyb250LAogCWRyaV9ib19yZWZlcmVuY2UgKGludGVsLT5mcm9u dF9idWZmZXIpOwogfQogCi1zdGF0aWMgUGl4bWFwUHRyCi1pbnRlbF9nbGFtb3JfY3JlYXRlX2Jh Y2tfcGl4bWFwKFNjcmVlblB0ciBzY3JlZW4sCi0JCQkJUGl4bWFwUHRyIGZyb250X3BpeG1hcCwK LQkJCQlkcm1faW50ZWxfYm8gKmJhY2tfYm8pCi17Ci0JUGl4bWFwUHRyIGJhY2tfcGl4bWFwOwot Ci0JYmFja19waXhtYXAgPSBzY3JlZW4tPkNyZWF0ZVBpeG1hcChzY3JlZW4sCi0JCQkJCSAgIDAs Ci0JCQkJCSAgIDAsCi0JCQkJICAgICAgICAgICBmcm9udF9waXhtYXAtPmRyYXdhYmxlLmRlcHRo LAotCQkJCSAgICAgICAgICAgMCk7Ci0JaWYgKGJhY2tfcGl4bWFwID09IE5VTEwpCi0JCXJldHVy biBOVUxMOwotCi0Jc2NyZWVuLT5Nb2RpZnlQaXhtYXBIZWFkZXIoYmFja19waXhtYXAsCi0JCQkJ ICAgZnJvbnRfcGl4bWFwLT5kcmF3YWJsZS53aWR0aCwKLQkJCQkgICBmcm9udF9waXhtYXAtPmRy YXdhYmxlLmhlaWdodCwKLQkJCQkgICAwLCAwLAotCQkJCSAgIGZyb250X3BpeG1hcC0+ZGV2S2lu ZCwKLQkJCQkgICAwKTsKLQlpbnRlbF9zZXRfcGl4bWFwX2JvKGJhY2tfcGl4bWFwLCBiYWNrX2Jv KTsKLQlpZiAoIWludGVsX2dsYW1vcl9jcmVhdGVfdGV4dHVyZWRfcGl4bWFwKGJhY2tfcGl4bWFw KSkgewotCQlTY3JuSW5mb1B0ciBzY3JuID0geGY4NlNjcmVlblRvU2NybihzY3JlZW4pOwotCQl4 Zjg2RHJ2TXNnKHNjcm4tPnNjcm5JbmRleCwgWF9XQVJOSU5HLAotCQkJICAgIkZhaWxlZCB0byBj cmVhdGUgdGV4dHVyZWQgYmFjayBwaXhtYXAuXG4iKTsKLQkJc2NyZWVuLT5EZXN0cm95UGl4bWFw KGJhY2tfcGl4bWFwKTsKLQkJcmV0dXJuIE5VTEw7Ci0JfQotCXJldHVybiBiYWNrX3BpeG1hcDsK LX0KLQogc3RhdGljIGRybV9pbnRlbF9ibyAqZ2V0X3BpeG1hcF9ibyhJODMwRFJJMkJ1ZmZlclBy aXZhdGVQdHIgcHJpdikKIHsKIAlkcm1faW50ZWxfYm8gKmJvID0gaW50ZWxfZ2V0X3BpeG1hcF9i byhwcml2LT5waXhtYXApOwpAQCAtODgzLDEwICs4NTEsNiBAQCBJODMwRFJJMlNjaGVkdWxlRmxp cChzdHJ1Y3QgaW50ZWxfc2NyZWVuX3ByaXZhdGUgKmludGVsLAogCX0KIAogCWlmIChpbnRlbC0+ YmFja19idWZmZXIgPT0gTlVMTCkgewotCQlJODMwRFJJMkJ1ZmZlclByaXZhdGVQdHIgZHJ2cHJp djsKLQkJUGl4bWFwUHRyIGZyb250X3BpeG1hcCwgYmFja19waXhtYXA7Ci0JCVNjcmVlblB0ciBz Y3JlZW47Ci0KIAkJbmV3X2JhY2sgPSBkcm1faW50ZWxfYm9fYWxsb2MoaW50ZWwtPmJ1Zm1nciwg ImZyb250IGJ1ZmZlciIsCiAJCQkJCSAgICAgIGludGVsLT5mcm9udF9idWZmZXItPnNpemUsIDAp OwogCQlpZiAobmV3X2JhY2sgPT0gTlVMTCkKQEAgLTkwMywyMSArODY3LDYgQEAgSTgzMERSSTJT Y2hlZHVsZUZsaXAoc3RydWN0IGludGVsX3NjcmVlbl9wcml2YXRlICppbnRlbCwKIAogCQlkcm1f aW50ZWxfYm9fZGlzYWJsZV9yZXVzZShuZXdfYmFjayk7CiAJCWRyaV9ib19mbGluayhuZXdfYmFj aywgJmludGVsLT5iYWNrX25hbWUpOwotCi0JCWlmICgoaW50ZWwtPnV4YV9mbGFncyAmIFVYQV9V U0VfR0xBTU9SKSkgewotCQkJc2NyZWVuID0gZHJhdy0+cFNjcmVlbjsKLQkJCWRydnByaXYgPSBp bmZvLT5mcm9udC0+ZHJpdmVyUHJpdmF0ZTsKLQkJCWZyb250X3BpeG1hcCA9IGRydnByaXYtPnBp eG1hcDsKLQotCQkJYmFja19waXhtYXAgPSBpbnRlbF9nbGFtb3JfY3JlYXRlX2JhY2tfcGl4bWFw KHNjcmVlbiwKLQkJCQkJCQkJICAgICAgZnJvbnRfcGl4bWFwLAotCQkJCQkJCQkgICAgICBuZXdf YmFjayk7Ci0JCQlpZiAoYmFja19waXhtYXAgPT0gTlVMTCkgewotCQkJCWRybV9pbnRlbF9ib191 bnJlZmVyZW5jZShuZXdfYmFjayk7Ci0JCQkJcmV0dXJuIEZBTFNFOwotCQkJfQotCQkJaW50ZWwt PmJhY2tfcGl4bWFwID0gYmFja19waXhtYXA7Ci0JCX0KIAl9IGVsc2UgewogCQluZXdfYmFjayA9 IGludGVsLT5iYWNrX2J1ZmZlcjsKIAkJaW50ZWwtPmJhY2tfYnVmZmVyID0gTlVMTDsKQEAgLTkz NywxMyArODg2LDggQEAgSTgzMERSSTJTY2hlZHVsZUZsaXAoc3RydWN0IGludGVsX3NjcmVlbl9w cml2YXRlICppbnRlbCwKIAogCWludGVsLT5iYWNrX2J1ZmZlciA9IGludGVsLT5mcm9udF9idWZm ZXI7CiAJZHJtX2ludGVsX2JvX3JlZmVyZW5jZShpbnRlbC0+YmFja19idWZmZXIpOwotCWlmICgh KGludGVsLT51eGFfZmxhZ3MgJiBVWEFfVVNFX0dMQU1PUikpIHsKLQkJaW50ZWxfc2V0X3BpeG1h cF9ibyhwcml2LT5waXhtYXAsIG5ld19iYWNrKTsKLQkJZHJtX2ludGVsX2JvX3VucmVmZXJlbmNl KG5ld19iYWNrKTsKLQl9Ci0JZWxzZQotCQlpbnRlbF9leGNoYW5nZV9waXhtYXBfYnVmZmVycyhp bnRlbCwgcHJpdi0+cGl4bWFwLAotCQkJCQkgICAgICBpbnRlbC0+YmFja19waXhtYXApOworICAg ICAgICBpbnRlbF9zZXRfcGl4bWFwX2JvKHByaXYtPnBpeG1hcCwgbmV3X2JhY2spOworICAgICAg ICBkcm1faW50ZWxfYm9fdW5yZWZlcmVuY2UobmV3X2JhY2spOwogCiAJdG1wX25hbWUgPSBpbmZv LT5mcm9udC0+bmFtZTsKIAlpbmZvLT5mcm9udC0+bmFtZSA9IGludGVsLT5iYWNrX25hbWU7CmRp ZmYgLS1naXQgYS9zcmMvdXhhL2ludGVsX2RyaXZlci5jIGIvc3JjL3V4YS9pbnRlbF9kcml2ZXIu YwppbmRleCA4YWIyMjUyLi5kOWY5MThiIDEwMDY0NAotLS0gYS9zcmMvdXhhL2ludGVsX2RyaXZl ci5jCisrKyBiL3NyYy91eGEvaW50ZWxfZHJpdmVyLmMKQEAgLTk2Myw3ICs5NjMsNiBAQCBJODMw U2NyZWVuSW5pdChTQ1JFRU5fSU5JVF9BUkdTX0RFQ0wpCiAJaW50ZWwtPkNyZWF0ZVNjcmVlblJl c291cmNlcyA9IHNjcmVlbi0+Q3JlYXRlU2NyZWVuUmVzb3VyY2VzOwogCXNjcmVlbi0+Q3JlYXRl U2NyZWVuUmVzb3VyY2VzID0gaTgzMENyZWF0ZVNjcmVlblJlc291cmNlczsKIAotCWludGVsX2ds YW1vcl9pbml0KHNjcmVlbik7CiAJaWYgKCF4Zjg2Q3J0Y1NjcmVlbkluaXQoc2NyZWVuKSkKIAkJ cmV0dXJuIEZBTFNFOwogCmRpZmYgLS1naXQgYS9zcmMvdXhhL2ludGVsX3V4YS5jIGIvc3JjL3V4 YS9pbnRlbF91eGEuYwppbmRleCA3ZWE5MzI1Li5kYTRlYjk3IDEwMDY0NAotLS0gYS9zcmMvdXhh L2ludGVsX3V4YS5jCisrKyBiL3NyYy91eGEvaW50ZWxfdXhhLmMKQEAgLTQwLDcgKzQwLDYgQEAg U09GVFdBUkUgT1IgVEhFIFVTRSBPUiBPVEhFUiBERUFMSU5HUyBJTiBUSEUgU09GVFdBUkUuCiAj aW5jbHVkZSA8dW5pc3RkLmg+CiAKICNpbmNsdWRlICJpbnRlbC5oIgotI2luY2x1ZGUgImludGVs X2dsYW1vci5oIgogI2luY2x1ZGUgInV4YS5oIgogCiAjaW5jbHVkZSAiaTgzMF9yZWcuaCIKQEAg LTY2MCwxNiArNjU5LDYgQEAgc3RhdGljIEJvb2wgaW50ZWxfdXhhX3ByZXBhcmVfYWNjZXNzKFBp eG1hcFB0ciBwaXhtYXAsIHV4YV9hY2Nlc3NfdCBhY2Nlc3MpCiAJZHJpX2JvICpibyA9IHByaXYt PmJvOwogCWludCByZXQ7CiAKLQkvKiBUcmFuc2l0aW9uaW5nIHRvIGdsYW1vciBhY2NlbGVyYXRp b24sIHdlIG5lZWQgdG8gZmx1c2ggYWxsIHBlbmRpbmcKLQkgKiB1c2FnZSBieSBVWEEuICovCi0J aWYgKGFjY2VzcyA9PSBVWEFfR0xBTU9SX0FDQ0VTU19SVyB8fCBhY2Nlc3MgPT0gVVhBX0dMQU1P Ul9BQ0NFU1NfUk8pIHsKLQkJaWYgKCFsaXN0X2lzX2VtcHR5KCZwcml2LT5iYXRjaCkpCi0JCQlp bnRlbF9iYXRjaF9zdWJtaXQoc2Nybik7Ci0JCXJldHVybiBUUlVFOwotCX0KLQotCS8qIFdoZW4g ZmFsbGluZyBiYWNrIHRvIHN3cmFzdCwgZmx1c2ggYWxsIHBlbmRpbmcgb3BlcmF0aW9ucyAqLwot CWludGVsX2dsYW1vcl9mbHVzaChpbnRlbCk7CiAJaWYgKGFjY2VzcyA9PSBVWEFfQUNDRVNTX1JX IHx8IHByaXYtPmRpcnR5KQogCQlpbnRlbF9iYXRjaF9zdWJtaXQoc2Nybik7CiAKQEAgLTY5NSw5 ICs2ODQsNiBAQCBzdGF0aWMgdm9pZCBpbnRlbF91eGFfZmluaXNoX2FjY2VzcyhQaXhtYXBQdHIg cGl4bWFwLCB1eGFfYWNjZXNzX3QgYWNjZXNzKQogewogCXN0cnVjdCBpbnRlbF91eGFfcGl4bWFw ICpwcml2OwogCi0JaWYgKGFjY2VzcyA9PSBVWEFfR0xBTU9SX0FDQ0VTU19SVyB8fCBhY2Nlc3Mg PT0gVVhBX0dMQU1PUl9BQ0NFU1NfUk8pCi0JCXJldHVybjsKLQogCXByaXYgPSBpbnRlbF91eGFf Z2V0X3BpeG1hcF9wcml2YXRlKHBpeG1hcCk7CiAJaWYgKHByaXYgPT0gTlVMTCkKIAkJcmV0dXJu OwpAQCAtOTY3LDcgKzk1Myw2IEBAIHZvaWQgaW50ZWxfdXhhX2Jsb2NrX2hhbmRsZXIoaW50ZWxf c2NyZWVuX3ByaXZhdGUgKmludGVsKQogCSAqIGFuZCBiZXlvbmQgcmVuZGVyaW5nIHJlc3VsdHMg bWF5IG5vdCBoaXQgdGhlCiAJICogZnJhbWVidWZmZXIgdW50aWwgc2lnbmlmaWNhbnRseSBsYXRl ci4KIAkgKi8KLQlpbnRlbF9nbGFtb3JfZmx1c2goaW50ZWwpOwogCWludGVsX2ZsdXNoX3JlbmRl cmluZyhpbnRlbCk7CiAJaW50ZWxfdGhyb3R0bGUoaW50ZWwpOwogfQpAQCAtOTgxLDEyICs5NjYs NiBAQCBpbnRlbF91eGFfY3JlYXRlX3BpeG1hcChTY3JlZW5QdHIgc2NyZWVuLCBpbnQgdywgaW50 IGgsIGludCBkZXB0aCwKIAlzdHJ1Y3QgaW50ZWxfdXhhX3BpeG1hcCAqcHJpdjsKIAlQaXhtYXBQ dHIgcGl4bWFwLCBuZXdfcGl4bWFwID0gTlVMTDsKIAotCWlmICghKHVzYWdlICYgSU5URUxfQ1JF QVRFX1BJWE1BUF9EUkkyKSkgewotCQlwaXhtYXAgPSBpbnRlbF9nbGFtb3JfY3JlYXRlX3BpeG1h cChzY3JlZW4sIHcsIGgsIGRlcHRoLCB1c2FnZSk7Ci0JCWlmIChwaXhtYXApCi0JCQlyZXR1cm4g cGl4bWFwOwotCX0KLQogCWlmICh3ID4gMzI3NjcgfHwgaCA+IDMyNzY3KQogCQlyZXR1cm4gTnVs bFBpeG1hcDsKIApAQCAtMTA2NywzNCArMTA0NiwxMCBAQCBpbnRlbF91eGFfY3JlYXRlX3BpeG1h cChTY3JlZW5QdHIgc2NyZWVuLCBpbnQgdywgaW50IGgsIGludCBkZXB0aCwKIAogCQlzY3JlZW4t Pk1vZGlmeVBpeG1hcEhlYWRlcihwaXhtYXAsIHcsIGgsIDAsIDAsIHN0cmlkZSwgTlVMTCk7CiAK LQkJaWYgKCFpbnRlbF9nbGFtb3JfY3JlYXRlX3RleHR1cmVkX3BpeG1hcChwaXhtYXApKQotCQkJ Z290byBmYWxsYmFja19nbGFtb3I7CiAJfQogCiAJcmV0dXJuIHBpeG1hcDsKIAotZmFsbGJhY2tf Z2xhbW9yOgotCWlmICh1c2FnZSAmIElOVEVMX0NSRUFURV9QSVhNQVBfRFJJMikgewotCS8qIFhY WCBuZWVkIGZ1cnRoZXIgd29yayB0byBoYW5kbGUgdGhlIERSSTIgZmFpbHVyZSBjYXNlLgotCSAq IEdsYW1vciBkb24ndCBrbm93IGhvdyB0byBoYW5kbGUgYSBCTyBvbmx5IHBpeG1hcC4gUHV0Ci0J ICogYSB3YXJuaW5nIGluZGljYXRvciBoZXJlLgotCSAqLwotCQl4Zjg2RHJ2TXNnKHNjcm4tPnNj cm5JbmRleCwgWF9XQVJOSU5HLAotCQkJICAgIkZhaWxlZCB0byBjcmVhdGUgdGV4dHVyZWQgRFJJ MiBwaXhtYXAuIik7Ci0JCXJldHVybiBwaXhtYXA7Ci0JfQotCS8qIENyZWF0ZSB0ZXh0dXJlZCBw aXhtYXAgZmFpbGVkIG1lYW5zIGdsYW1vciBmYWlsZWQgdG8KLQkgKiBjcmVhdGUgYSB0ZXh0dXJl IGZyb20gY3VycmVudCBCTyBmb3Igc29tZSByZWFzb25zLiBXZSB0dXJuCi0JICogdG8gY3JlYXRl IGEgbmV3IGdsYW1vciBwaXhtYXAgYW5kIGNsZWFuIHVwIGN1cnJlbnQgb25lLgotCSAqIE9uZSB0 aGluZyBuZWVkIHRvIGJlIG5vdGVkLCB0aGlzIG5ldyBwaXhtYXAgZG9lc24ndAotCSAqIGhhcyBh IHByaXYgYW5kIGJvIGF0dGFjaGVkIHRvIGl0LiBJdCdzIGdsYW1vcidzIHJlc3BvbnNiaWxpdHkK LQkgKiB0byB0YWtlIGNhcmUgb2YgaXQuIEdsYW1vciB3aWxsIG1hcmsgdGhpcyBuZXcgcGl4bWFw IGFzIGEKLQkgKiB0ZXh0dXJlIG9ubHkgcGl4bWFwIGFuZCB3aWxsIG5ldmVyIGZhbGxiYWNrIHRv IEREWCBsYXllcgotCSAqIGFmdGVyd2FyZHMuCi0JICovCi0JbmV3X3BpeG1hcCA9IGludGVsX2ds YW1vcl9jcmVhdGVfcGl4bWFwKHNjcmVlbiwgdywgaCwKLQkJCQkJCWRlcHRoLCB1c2FnZSk7Ci0J ZHJpX2JvX3VucmVmZXJlbmNlKHByaXYtPmJvKTsKIGZhbGxiYWNrX3ByaXY6CiAJZnJlZShwcml2 KTsKIGZhbGxiYWNrX3BpeG1hcDoKQEAgLTExMDgsNyArMTA2Myw2IEBAIGZhbGxiYWNrX3BpeG1h cDoKIHN0YXRpYyBCb29sIGludGVsX3V4YV9kZXN0cm95X3BpeG1hcChQaXhtYXBQdHIgcGl4bWFw KQogewogCWlmIChwaXhtYXAtPnJlZmNudCA9PSAxKSB7Ci0JCWludGVsX2dsYW1vcl9kZXN0cm95 X3BpeG1hcChwaXhtYXApOwogCQlpbnRlbF91eGFfc2V0X3BpeG1hcF9ibyhwaXhtYXAsIE5VTEwp OwogCX0KIAlmYkRlc3Ryb3lQaXhtYXAocGl4bWFwKTsKQEAgLTExNDYsOSArMTEwMCw2IEBAIEJv b2wgaW50ZWxfdXhhX2NyZWF0ZV9zY3JlZW5fcmVzb3VyY2VzKFNjcmVlblB0ciBzY3JlZW4pCiAJ aWYgKGludGVsX3V4YV9nZXRfcGl4bWFwX3ByaXZhdGUocGl4bWFwKSA9PSBOVUxMKQogCQlnb3Rv IGVycjsKIAotCWlmICghaW50ZWxfZ2xhbW9yX2NyZWF0ZV9zY3JlZW5fcmVzb3VyY2VzKHNjcmVl bikpCi0JCWdvdG8gZXJyOwotCiAJaW50ZWxfdXhhX2dldF9waXhtYXBfcHJpdmF0ZShwaXhtYXAp LT5waW5uZWQgfD0gUElOX1NDQU5PVVQ7CiAJc2Nybi0+ZGlzcGxheVdpZHRoID0gaW50ZWwtPmZy b250X3BpdGNoIC8gaW50ZWwtPmNwcDsKIApkaWZmIC0tZ2l0IGEvc3JjL3V4YS9pbnRlbF91eGEu aCBiL3NyYy91eGEvaW50ZWxfdXhhLmgKaW5kZXggMzQ5MDNhMy4uNjk1MDBhOCAxMDA2NDQKLS0t IGEvc3JjL3V4YS9pbnRlbF91eGEuaAorKysgYi9zcmMvdXhhL2ludGVsX3V4YS5oCkBAIC00MCw3 ICs0MCw2IEBAIHN0cnVjdCBpbnRlbF91eGFfcGl4bWFwIHsKICNkZWZpbmUgUElOX0RSSTIgMHgy CiAjZGVmaW5lIFBJTl9EUkkzIDB4NAogI2RlZmluZSBQSU5fUFJJTUUgMHg4Ci0jZGVmaW5lIFBJ Tl9HTEFNT1IgMHgxMAogfTsKIAogI2lmIEhBU19ERVZQUklWQVRFS0VZUkVDCmRpZmYgLS1naXQg YS9zcmMvdXhhL3V4YS1hY2NlbC5jIGIvc3JjL3V4YS91eGEtYWNjZWwuYwppbmRleCA3NTdiMjc2 Li5iMGQzYzgwIDEwMDY0NAotLS0gYS9zcmMvdXhhL3V4YS1hY2NlbC5jCisrKyBiL3NyYy91eGEv dXhhLWFjY2VsLmMKQEAgLTMyLDcgKzMyLDYgQEAKICNpbmNsdWRlIDxkaXgtY29uZmlnLmg+CiAj ZW5kaWYKICNpbmNsdWRlICJ1eGEtcHJpdi5oIgotI2luY2x1ZGUgInV4YS1nbGFtb3IuaCIKICNp bmNsdWRlIDxYMTEvZm9udHMvZm9udHN0cnVjdC5oPgogI2luY2x1ZGUgImRpeGZvbnRzdHIuaCIK ICNpbmNsdWRlICJ1eGEuaCIKQEAgLTUwLDIxICs0OSw2IEBAIHV4YV9maWxsX3NwYW5zKERyYXdh YmxlUHRyIHBEcmF3YWJsZSwgR0NQdHIgcEdDLCBpbnQgbiwKIAlpbnQgeDEsIHgyLCB5OwogCWlu dCBvZmZfeCwgb2ZmX3k7CiAKLQlpZiAodXhhX3NjcmVlbi0+aW5mby0+ZmxhZ3MgJiBVWEFfVVNF X0dMQU1PUikgewotCQlpbnQgb2sgPSAwOwotCi0JCWlmICh1eGFfcHJlcGFyZV9hY2Nlc3MocERy YXdhYmxlLCBVWEFfR0xBTU9SX0FDQ0VTU19SVykpIHsKLQkJCW9rID0gZ2xhbW9yX2ZpbGxfc3Bh bnNfbmYocERyYXdhYmxlLAotCQkJCQkJICBwR0MsIG4sIHBwdCwgcHdpZHRoLCBmU29ydGVkKTsK LQkJCXV4YV9maW5pc2hfYWNjZXNzKHBEcmF3YWJsZSwgVVhBX0dMQU1PUl9BQ0NFU1NfUlcpOwot CQl9Ci0KLQkJaWYgKCFvaykKLQkJCWdvdG8gZmFsbGJhY2s7Ci0KLQkJcmV0dXJuOwotCX0KLQog CWlmICh1eGFfc2NyZWVuLT5mb3JjZV9mYWxsYmFjaykKIAkJZ290byBmYWxsYmFjazsKIApAQCAt MjEwLDI2ICsxOTQsOSBAQCBzdGF0aWMgdm9pZAogdXhhX3B1dF9pbWFnZShEcmF3YWJsZVB0ciBw RHJhd2FibGUsIEdDUHRyIHBHQywgaW50IGRlcHRoLCBpbnQgeCwgaW50IHksCiAJICAgICAgaW50 IHcsIGludCBoLCBpbnQgbGVmdFBhZCwgaW50IGZvcm1hdCwgY2hhciAqYml0cykKIHsKLQl1eGFf c2NyZWVuX3QgKnV4YV9zY3JlZW4gPSB1eGFfZ2V0X3NjcmVlbihwRHJhd2FibGUtPnBTY3JlZW4p OwotCi0JaWYgKHV4YV9zY3JlZW4tPmluZm8tPmZsYWdzICYgVVhBX1VTRV9HTEFNT1IpIHsKLQkJ aW50IG9rID0gMDsKLQotCQlpZiAodXhhX3ByZXBhcmVfYWNjZXNzKHBEcmF3YWJsZSwgVVhBX0dM QU1PUl9BQ0NFU1NfUlcpKSB7Ci0JCQlvayA9IGdsYW1vcl9wdXRfaW1hZ2VfbmYocERyYXdhYmxl LAotCQkJCQkJIHBHQywgZGVwdGgsIHgsIHksIHcsIGgsCi0JCQkJCQkgbGVmdFBhZCwgZm9ybWF0 LCBiaXRzKTsKLQkJCXV4YV9maW5pc2hfYWNjZXNzKHBEcmF3YWJsZSwgVVhBX0dMQU1PUl9BQ0NF U1NfUlcpOwotCQl9Ci0JCWlmICghb2spCi0JCQlnb3RvIGZhbGxiYWNrOwotCi0JCXJldHVybjsK LQl9CiAKIAlpZiAoIXV4YV9kb19wdXRfaW1hZ2UocERyYXdhYmxlLCBwR0MsIGRlcHRoLCB4LCB5 LCB3LCBoLCBmb3JtYXQsIGJpdHMsCiAJCQkgICAgICBQaXhtYXBCeXRlUGFkKHcsIHBEcmF3YWJs ZS0+ZGVwdGgpKSkgewotZmFsbGJhY2s6CiAJCXV4YV9jaGVja19wdXRfaW1hZ2UocERyYXdhYmxl LCBwR0MsIGRlcHRoLCB4LCB5LCB3LCBoLCBsZWZ0UGFkLAogCQkJCSAgICBmb3JtYXQsIGJpdHMp OwogCX0KQEAgLTM3NCwyNiArMzQxLDYgQEAgdXhhX2NvcHlfbl90b19uKERyYXdhYmxlUHRyIHBT cmNEcmF3YWJsZSwKIAlpbnQgZHN0X29mZl94LCBkc3Rfb2ZmX3k7CiAJUGl4bWFwUHRyIHBTcmNQ aXhtYXAsIHBEc3RQaXhtYXA7CiAKLQlpZiAodXhhX3NjcmVlbi0+aW5mby0+ZmxhZ3MgJiBVWEFf VVNFX0dMQU1PUikgewotCQlpbnQgb2sgPSAwOwotCi0JCWlmICh1eGFfcHJlcGFyZV9hY2Nlc3Mo cFNyY0RyYXdhYmxlLCBVWEFfR0xBTU9SX0FDQ0VTU19STykpIHsKLQkJCWlmICh1eGFfcHJlcGFy ZV9hY2Nlc3MocERzdERyYXdhYmxlLCBVWEFfR0xBTU9SX0FDQ0VTU19SVykpIHsKLQkJCQlvayA9 IGdsYW1vcl9jb3B5X25fdG9fbl9uZihwU3JjRHJhd2FibGUsIHBEc3REcmF3YWJsZSwKLQkJCQkJ CQkgICBwR0MsIHBib3gsIG5ib3gsIGR4LCBkeSwKLQkJCQkJCQkgICByZXZlcnNlLCB1cHNpZGVk b3duLCBiaXRwbGFuZSwKLQkJCQkJCQkgICBjbG9zdXJlKTsKLQkJCQl1eGFfZmluaXNoX2FjY2Vz cyhwRHN0RHJhd2FibGUsIFVYQV9HTEFNT1JfQUNDRVNTX1JXKTsKLQkJCX0KLQkJCXV4YV9maW5p c2hfYWNjZXNzKHBTcmNEcmF3YWJsZSwgVVhBX0dMQU1PUl9BQ0NFU1NfUk8pOwotCQl9Ci0KLQkJ aWYgKCFvaykKLQkJCWdvdG8gZmFsbGJhY2s7Ci0KLQkJcmV0dXJuOwotCX0KLQogCWlmICh1eGFf c2NyZWVuLT5mb3JjZV9mYWxsYmFjaykKIAkJZ290byBmYWxsYmFjazsKIApAQCAtNTYwLDE5ICs1 MDcsNiBAQCB1eGFfcG9seV9wb2ludChEcmF3YWJsZVB0ciBwRHJhd2FibGUsIEdDUHRyIHBHQywg aW50IG1vZGUsIGludCBucHQsCiB7CiAJaW50IGk7CiAJeFJlY3RhbmdsZSAqcHJlY3Q7Ci0JdXhh X3NjcmVlbl90ICp1eGFfc2NyZWVuID0gdXhhX2dldF9zY3JlZW4ocERyYXdhYmxlLT5wU2NyZWVu KTsKLQotCWlmICh1eGFfc2NyZWVuLT5pbmZvLT5mbGFncyAmIFVYQV9VU0VfR0xBTU9SKSB7Ci0J CWludCBvayA9IDA7Ci0KLQkJaWYgKHV4YV9wcmVwYXJlX2FjY2VzcyhwRHJhd2FibGUsIFVYQV9H TEFNT1JfQUNDRVNTX1JXKSkgewotCQkJb2sgPSBnbGFtb3JfcG9seV9wb2ludF9uZihwRHJhd2Fi bGUsIHBHQywgbW9kZSwgbnB0LCBwcHQpOwotCQkJdXhhX2ZpbmlzaF9hY2Nlc3MocERyYXdhYmxl LCBVWEFfR0xBTU9SX0FDQ0VTU19SVyk7Ci0JCX0KLQotCQlpZiAob2spCi0JCQlyZXR1cm47Ci0J fQogCiAJLyogSWYgd2UgY2FuJ3QgcmV1c2UgdGhlIGN1cnJlbnQgR0MgYXMgaXMsIGRvbid0IGJv dGhlciBhY2NlbGVyYXRpbmcgdGhlCiAJICogcG9pbnRzLgpAQCAtNjExLDE5ICs1NDUsNiBAQCB1 eGFfcG9seV9saW5lcyhEcmF3YWJsZVB0ciBwRHJhd2FibGUsIEdDUHRyIHBHQywgaW50IG1vZGUs IGludCBucHQsCiAJeFJlY3RhbmdsZSAqcHJlY3Q7CiAJaW50IHgxLCB4MiwgeTEsIHkyOwogCWlu dCBpOwotCXV4YV9zY3JlZW5fdCAqdXhhX3NjcmVlbiA9IHV4YV9nZXRfc2NyZWVuKHBEcmF3YWJs ZS0+cFNjcmVlbik7Ci0KLQlpZiAodXhhX3NjcmVlbi0+aW5mby0+ZmxhZ3MgJiBVWEFfVVNFX0dM QU1PUikgewotCQlpbnQgb2sgPSAwOwotCi0JCWlmICh1eGFfcHJlcGFyZV9hY2Nlc3MocERyYXdh YmxlLCBVWEFfR0xBTU9SX0FDQ0VTU19SVykpIHsKLQkJCW9rID0gZ2xhbW9yX3BvbHlfbGluZXNf bmYocERyYXdhYmxlLCBwR0MsIG1vZGUsIG5wdCwgcHB0KTsKLQkJCXV4YV9maW5pc2hfYWNjZXNz KHBEcmF3YWJsZSwgVVhBX0dMQU1PUl9BQ0NFU1NfUlcpOwotCQl9Ci0KLQkJaWYgKG9rKQotCQkJ cmV0dXJuOwotCX0KIAogCS8qIERvbid0IHRyeSB0byBkbyB3aWRlIGxpbmVzIG9yIG5vbi1zb2xp ZCBmaWxsIHN0eWxlLiAqLwogCWlmIChwR0MtPmxpbmVXaWR0aCAhPSAwIHx8IHBHQy0+bGluZVN0 eWxlICE9IExpbmVTb2xpZCB8fApAQCAtNjg1LDE5ICs2MDYsNiBAQCB1eGFfcG9seV9zZWdtZW50 KERyYXdhYmxlUHRyIHBEcmF3YWJsZSwgR0NQdHIgcEdDLCBpbnQgbnNlZywgeFNlZ21lbnQgKiBw U2VnKQogewogCXhSZWN0YW5nbGUgKnByZWN0OwogCWludCBpOwotCXV4YV9zY3JlZW5fdCAqdXhh X3NjcmVlbiA9IHV4YV9nZXRfc2NyZWVuKHBEcmF3YWJsZS0+cFNjcmVlbik7Ci0KLQlpZiAodXhh X3NjcmVlbi0+aW5mby0+ZmxhZ3MgJiBVWEFfVVNFX0dMQU1PUikgewotCQlpbnQgb2sgPSAwOwot Ci0JCWlmICh1eGFfcHJlcGFyZV9hY2Nlc3MocERyYXdhYmxlLCBVWEFfR0xBTU9SX0FDQ0VTU19S VykpIHsKLQkJCW9rID0gZ2xhbW9yX3BvbHlfc2VnbWVudF9uZihwRHJhd2FibGUsIHBHQywgbnNl ZywgcFNlZyk7Ci0JCQl1eGFfZmluaXNoX2FjY2VzcyhwRHJhd2FibGUsIFVYQV9HTEFNT1JfQUND RVNTX1JXKTsKLQkJfQotCi0JCWlmIChvaykKLQkJCXJldHVybjsKLQl9CiAKIAkvKiBEb24ndCB0 cnkgdG8gZG8gd2lkZSBsaW5lcyBvciBub24tc29saWQgZmlsbCBzdHlsZS4gKi8KIAlpZiAocEdD LT5saW5lV2lkdGggIT0gMCB8fCBwR0MtPmxpbmVTdHlsZSAhPSBMaW5lU29saWQgfHwKQEAgLTc2 MiwyMCArNjcwLDYgQEAgdXhhX3BvbHlfZmlsbF9yZWN0KERyYXdhYmxlUHRyIHBEcmF3YWJsZSwK IAlpbnQgeG9yZywgeW9yZzsKIAlpbnQgbjsKIAotCWlmICh1eGFfc2NyZWVuLT5pbmZvLT5mbGFn cyAmIFVYQV9VU0VfR0xBTU9SKSB7Ci0JCWludCBvayA9IDA7Ci0KLQkJaWYgKHV4YV9wcmVwYXJl X2FjY2VzcyhwRHJhd2FibGUsIFVYQV9HTEFNT1JfQUNDRVNTX1JXKSkgewotCQkJb2sgPSBnbGFt b3JfcG9seV9maWxsX3JlY3RfbmYocERyYXdhYmxlLCBwR0MsIG5yZWN0LCBwcmVjdCk7Ci0JCQl1 eGFfZmluaXNoX2FjY2VzcyhwRHJhd2FibGUsIFVYQV9HTEFNT1JfQUNDRVNTX1JXKTsKLQkJfQot Ci0JCWlmICghb2spCi0JCQl1eGFfY2hlY2tfcG9seV9maWxsX3JlY3QocERyYXdhYmxlLCBwR0Ms IG5yZWN0LCBwcmVjdCk7Ci0KLQkJcmV0dXJuOwotCX0KLQogCS8qIENvbXB1dGUgaW50ZXJzZWN0 aW9uIG9mIHJlY3RzIGFuZCBjbGlwIHJlZ2lvbiAqLwogCXBSZWcgPSBSRUNUU19UT19SRUdJT04o cFNjcmVlbiwgbnJlY3QsIHByZWN0LCBDVF9VTlNPUlRFRCk7CiAJUkVHSU9OX1RSQU5TTEFURShw U2NyZWVuLCBwUmVnLCBwRHJhd2FibGUtPngsIHBEcmF3YWJsZS0+eSk7CkBAIC04ODUsMjUgKzc3 OSw2IEBAIHV4YV9nZXRfc3BhbnMoRHJhd2FibGVQdHIgcERyYXdhYmxlLAogCSAgICAgIGludCB3 TWF4LAogCSAgICAgIEREWFBvaW50UHRyIHBwdCwgaW50ICpwd2lkdGgsIGludCBuc3BhbnMsIGNo YXIgKnBkc3RTdGFydCkKIHsKLQlTY3JlZW5QdHIgc2NyZWVuID0gcERyYXdhYmxlLT5wU2NyZWVu OwotCXV4YV9zY3JlZW5fdCAqdXhhX3NjcmVlbiA9IHV4YV9nZXRfc2NyZWVuKHNjcmVlbik7Ci0K LQlpZiAodXhhX3NjcmVlbi0+aW5mby0+ZmxhZ3MgJiBVWEFfVVNFX0dMQU1PUikgewotCQlpbnQg b2sgPSAwOwotCi0JCWlmICh1eGFfcHJlcGFyZV9hY2Nlc3MocERyYXdhYmxlLCBVWEFfR0xBTU9S X0FDQ0VTU19SVykpIHsKLQkJCW9rID0gZ2xhbW9yX2dldF9zcGFuc19uZihwRHJhd2FibGUsIHdN YXgsIHBwdCwKLQkJCQkJCSBwd2lkdGgsIG5zcGFucywgcGRzdFN0YXJ0KTsKLQkJCXV4YV9maW5p c2hfYWNjZXNzKHBEcmF3YWJsZSwgVVhBX0dMQU1PUl9BQ0NFU1NfUlcpOwotCQl9Ci0KLQkJaWYg KCFvaykKLQkJCWdvdG8gZmFsbGJhY2s7Ci0KLQkJcmV0dXJuOwotCX0KLQotZmFsbGJhY2s6CiAJ dXhhX2NoZWNrX2dldF9zcGFucyhwRHJhd2FibGUsIHdNYXgsIHBwdCwgcHdpZHRoLCBuc3BhbnMs IHBkc3RTdGFydCk7CiB9CiAKQEAgLTkxMSwyNSArNzg2LDYgQEAgc3RhdGljIHZvaWQKIHV4YV9z ZXRfc3BhbnMoRHJhd2FibGVQdHIgcERyYXdhYmxlLCBHQ1B0ciBnYywgY2hhciAqc3JjLAogICAg ICAgICAgICAgICAgICBERFhQb2ludFB0ciBwb2ludHMsIGludCAqd2lkdGhzLCBpbnQgbiwgaW50 IHNvcnRlZCkKIHsKLQlTY3JlZW5QdHIgc2NyZWVuID0gcERyYXdhYmxlLT5wU2NyZWVuOwotCXV4 YV9zY3JlZW5fdCAqdXhhX3NjcmVlbiA9IHV4YV9nZXRfc2NyZWVuKHNjcmVlbik7Ci0KLQlpZiAo dXhhX3NjcmVlbi0+aW5mby0+ZmxhZ3MgJiBVWEFfVVNFX0dMQU1PUikgewotCQlpbnQgb2sgPSAw OwotCi0JCWlmICh1eGFfcHJlcGFyZV9hY2Nlc3MocERyYXdhYmxlLCBVWEFfR0xBTU9SX0FDQ0VT U19SVykpIHsKLQkJCW9rID0gZ2xhbW9yX3NldF9zcGFuc19uZihwRHJhd2FibGUsIGdjLCBzcmMs Ci0JCQkJCQkgcG9pbnRzLCB3aWR0aHMsIG4sIHNvcnRlZCk7Ci0JCQl1eGFfZmluaXNoX2FjY2Vz cyhwRHJhd2FibGUsIFVYQV9HTEFNT1JfQUNDRVNTX1JXKTsKLQkJfQotCi0JCWlmICghb2spCi0J CQlnb3RvIGZhbGxiYWNrOwotCi0JCXJldHVybjsKLQl9Ci0KLWZhbGxiYWNrOgogCXV4YV9jaGVj a19zZXRfc3BhbnMocERyYXdhYmxlLCBnYywgc3JjLCBwb2ludHMsIHdpZHRocywgbiwgc29ydGVk KTsKIH0KIApAQCAtOTM4LDI3ICs3OTQsNiBAQCB1eGFfY29weV9wbGFuZShEcmF3YWJsZVB0ciBw U3JjLCBEcmF3YWJsZVB0ciBwRHN0LCBHQ1B0ciBwR0MsCiAJICAgICAgIGludCBzcmN4LCBpbnQg c3JjeSwgaW50IHcsIGludCBoLCBpbnQgZHN0eCwgaW50IGRzdHksCiAJICAgICAgIHVuc2lnbmVk IGxvbmcgYml0UGxhbmUpCiB7Ci0JU2NyZWVuUHRyIHNjcmVlbiA9IHBEc3QtPnBTY3JlZW47Ci0J dXhhX3NjcmVlbl90ICp1eGFfc2NyZWVuID0gdXhhX2dldF9zY3JlZW4oc2NyZWVuKTsKLQotCWlm ICh1eGFfc2NyZWVuLT5pbmZvLT5mbGFncyAmIFVYQV9VU0VfR0xBTU9SKSB7Ci0JCVJlZ2lvblB0 ciByZWdpb24gPSBOVUxMOwotCQlpbnQgb2sgPSAwOwotCi0JCWlmICh1eGFfcHJlcGFyZV9hY2Nl c3MocERzdCwgVVhBX0dMQU1PUl9BQ0NFU1NfUlcpKSB7Ci0JCQlpZiAodXhhX3ByZXBhcmVfYWNj ZXNzKHBTcmMsIFVYQV9HTEFNT1JfQUNDRVNTX1JPKSkgewotCQkJCW9rID0gZ2xhbW9yX2NvcHlf cGxhbmVfbmYocFNyYywgcERzdCwgcEdDLCBzcmN4LCBzcmN5LCB3LCBoLAotCQkJCQkJCSAgZHN0 eCwgZHN0eSwgYml0UGxhbmUsICZyZWdpb24pOwotCQkJCXV4YV9maW5pc2hfYWNjZXNzKHBTcmMs IFVYQV9HTEFNT1JfQUNDRVNTX1JPKTsKLQkJCX0KLQkJCXV4YV9maW5pc2hfYWNjZXNzKHBEc3Qs IFVYQV9HTEFNT1JfQUNDRVNTX1JXKTsKLQkJfQotCQlpZiAoIW9rKQotCQkJZ290byBmYWxsYmFj azsKLQkJcmV0dXJuIHJlZ2lvbjsKLQl9Ci0KLWZhbGxiYWNrOgogCXJldHVybiB1eGFfY2hlY2tf Y29weV9wbGFuZShwU3JjLCBwRHN0LCBwR0MsIHNyY3gsIHNyY3ksIHcsIGgsCiAJCQkJICAgIGRz dHgsIGRzdHksIGJpdFBsYW5lKTsKIH0KQEAgLTk2OCwyMiArODAzLDYgQEAgdXhhX2ltYWdlX2ds eXBoX2JsdChEcmF3YWJsZVB0ciBwRHJhd2FibGUsIEdDUHRyIHBHQywKIAkJICAgIGludCB4LCBp bnQgeSwgdW5zaWduZWQgaW50IG5nbHlwaCwKIAkJICAgIENoYXJJbmZvUHRyICogcHBjaSwgcG9p bnRlciBwZ2x5cGhCYXNlKQogewotCVNjcmVlblB0ciBzY3JlZW4gPSBwRHJhd2FibGUtPnBTY3Jl ZW47Ci0JdXhhX3NjcmVlbl90ICp1eGFfc2NyZWVuID0gdXhhX2dldF9zY3JlZW4oc2NyZWVuKTsK LQotCWlmICh1eGFfc2NyZWVuLT5pbmZvLT5mbGFncyAmIFVYQV9VU0VfR0xBTU9SKSB7Ci0JCWlu dCBvayA9IDA7Ci0KLQkJaWYgKHV4YV9wcmVwYXJlX2FjY2VzcyhwRHJhd2FibGUsIFVYQV9HTEFN T1JfQUNDRVNTX1JXKSkgewotCQkJb2sgPSBnbGFtb3JfaW1hZ2VfZ2x5cGhfYmx0X25mKHBEcmF3 YWJsZSwgcEdDLCB4LCB5LCBuZ2x5cGgsIHBwY2ksIHBnbHlwaEJhc2UpOwotCQkJdXhhX2Zpbmlz aF9hY2Nlc3MocERyYXdhYmxlLCBVWEFfR0xBTU9SX0FDQ0VTU19SVyk7Ci0JCX0KLQkJaWYgKCFv aykKLQkJCWdvdG8gZmFsbGJhY2s7Ci0JCXJldHVybjsKLQl9Ci0KLWZhbGxiYWNrOgogCXV4YV9j aGVja19pbWFnZV9nbHlwaF9ibHQocERyYXdhYmxlLCBwR0MsIHgsIHksIG5nbHlwaCwgcHBjaSwg cGdseXBoQmFzZSk7CiB9CiAKQEAgLTk5MiwyMiArODExLDYgQEAgdXhhX3BvbHlfZ2x5cGhfYmx0 KERyYXdhYmxlUHRyIHBEcmF3YWJsZSwgR0NQdHIgcEdDLAogCQkgICBpbnQgeCwgaW50IHksIHVu c2lnbmVkIGludCBuZ2x5cGgsCiAJCSAgIENoYXJJbmZvUHRyICogcHBjaSwgcG9pbnRlciBwZ2x5 cGhCYXNlKQogewotCVNjcmVlblB0ciBzY3JlZW4gPSBwRHJhd2FibGUtPnBTY3JlZW47Ci0JdXhh X3NjcmVlbl90ICp1eGFfc2NyZWVuID0gdXhhX2dldF9zY3JlZW4oc2NyZWVuKTsKLQotCWlmICh1 eGFfc2NyZWVuLT5pbmZvLT5mbGFncyAmIFVYQV9VU0VfR0xBTU9SKSB7Ci0JCWludCBvayA9IDA7 Ci0KLQkJaWYgKHV4YV9wcmVwYXJlX2FjY2VzcyhwRHJhd2FibGUsIFVYQV9HTEFNT1JfQUNDRVNT X1JXKSkgewotCQkJb2sgPSBnbGFtb3JfcG9seV9nbHlwaF9ibHRfbmYocERyYXdhYmxlLCBwR0Ms IHgsIHksIG5nbHlwaCwgcHBjaSwgcGdseXBoQmFzZSk7Ci0JCQl1eGFfZmluaXNoX2FjY2Vzcyhw RHJhd2FibGUsIFVYQV9HTEFNT1JfQUNDRVNTX1JXKTsKLQkJfQotCQlpZiAoIW9rKQotCQkJZ290 byBmYWxsYmFjazsKLQkJcmV0dXJuOwotCX0KLQotZmFsbGJhY2s6CiAJdXhhX2NoZWNrX3BvbHlf Z2x5cGhfYmx0KHBEcmF3YWJsZSwgcEdDLCB4LCB5LCBuZ2x5cGgsIHBwY2ksIHBnbHlwaEJhc2Up OwogfQogCkBAIC0xMDE1LDI1ICs4MTgsNiBAQCBzdGF0aWMgdm9pZAogdXhhX3B1c2hfcGl4ZWxz KEdDUHRyIHBHQywgUGl4bWFwUHRyIHBCaXRtYXAsCiAJCURyYXdhYmxlUHRyIHBEcmF3YWJsZSwg aW50IHcsIGludCBoLCBpbnQgeCwgaW50IHkpCiB7Ci0JU2NyZWVuUHRyIHNjcmVlbiA9IHBEcmF3 YWJsZS0+cFNjcmVlbjsKLQl1eGFfc2NyZWVuX3QgKnV4YV9zY3JlZW4gPSB1eGFfZ2V0X3NjcmVl bihzY3JlZW4pOwotCi0JaWYgKHV4YV9zY3JlZW4tPmluZm8tPmZsYWdzICYgVVhBX1VTRV9HTEFN T1IpIHsKLQkJaW50IG9rID0gMDsKLQotCQlpZiAodXhhX3ByZXBhcmVfYWNjZXNzKHBEcmF3YWJs ZSwgVVhBX0dMQU1PUl9BQ0NFU1NfUlcpKSB7Ci0JCQlpZiAodXhhX3ByZXBhcmVfYWNjZXNzKCZw Qml0bWFwLT5kcmF3YWJsZSwgVVhBX0dMQU1PUl9BQ0NFU1NfUk8pKSB7Ci0JCQkJb2sgPSBnbGFt b3JfcHVzaF9waXhlbHNfbmYocEdDLCBwQml0bWFwLCBwRHJhd2FibGUsIHcsIGgsIHgsIHkpOwot CQkJCXV4YV9maW5pc2hfYWNjZXNzKCZwQml0bWFwLT5kcmF3YWJsZSwgVVhBX0dMQU1PUl9BQ0NF U1NfUk8pOwotCQkJfQotCQkJdXhhX2ZpbmlzaF9hY2Nlc3MocERyYXdhYmxlLCBVWEFfR0xBTU9S X0FDQ0VTU19SVyk7Ci0JCX0KLQkJaWYgKCFvaykKLQkJCWdvdG8gZmFsbGJhY2s7Ci0JCXJldHVy bjsKLQl9Ci0KLWZhbGxiYWNrOgogCXV4YV9jaGVja19wdXNoX3BpeGVscyhwR0MsIHBCaXRtYXAs IHBEcmF3YWJsZSwgdywgaCwgeCwgeSk7CiB9CiAKQEAgLTEyNDQsMjAgKzEwMjgsNiBAQCB1eGFf Z2V0X2ltYWdlKERyYXdhYmxlUHRyIHBEcmF3YWJsZSwgaW50IHgsIGludCB5LCBpbnQgdywgaW50 IGgsCiAJQm94LngyID0gQm94LngxICsgdzsKIAlCb3gueTIgPSBCb3gueTEgKyBoOwogCi0JaWYg KHV4YV9zY3JlZW4tPmluZm8tPmZsYWdzICYgVVhBX1VTRV9HTEFNT1IpIHsKLQkJb2sgPSAwOwot CQlpZiAodXhhX3ByZXBhcmVfYWNjZXNzKHBEcmF3YWJsZSwgVVhBX0dMQU1PUl9BQ0NFU1NfUlcp KSB7Ci0JCQlvayA9IGdsYW1vcl9nZXRfaW1hZ2VfbmYocERyYXdhYmxlLCB4LCB5LCB3LCBoLAot CQkJCQkJIGZvcm1hdCwgcGxhbmVNYXNrLCBkKTsKLQkJCXV4YV9maW5pc2hfYWNjZXNzKHBEcmF3 YWJsZSwgVVhBX0dMQU1PUl9BQ0NFU1NfUlcpOwotCQl9Ci0KLQkJaWYgKCFvaykKLQkJCWdvdG8g ZmFsbGJhY2s7Ci0KLQkJcmV0dXJuOwotCX0KLQogCWlmICh1eGFfc2NyZWVuLT5mb3JjZV9mYWxs YmFjaykKIAkJZ290byBmYWxsYmFjazsKIApkaWZmIC0tZ2l0IGEvc3JjL3V4YS91eGEtZ2xhbW9y LmggYi9zcmMvdXhhL3V4YS1nbGFtb3IuaApkZWxldGVkIGZpbGUgbW9kZSAxMDA2NDQKaW5kZXgg NWZmMTllMC4uMDAwMDAwMAotLS0gYS9zcmMvdXhhL3V4YS1nbGFtb3IuaAorKysgL2Rldi9udWxs CkBAIC0xLDY1ICswLDAgQEAKLS8qCi0gKiBDb3B5cmlnaHQgwqkgMjAxMSBJbnRlbCBDb3Jwb3Jh dGlvbi4KLSAqCi0gKiBQZXJtaXNzaW9uIGlzIGhlcmVieSBncmFudGVkLCBmcmVlIG9mIGNoYXJn ZSwgdG8gYW55IHBlcnNvbgotICogb2J0YWluaW5nIGEgY29weSBvZiB0aGlzIHNvZnR3YXJlIGFu ZCBhc3NvY2lhdGVkIGRvY3VtZW50YXRpb24KLSAqIGZpbGVzICh0aGUgIlNvZnR3YXJlIiksIHRv IGRlYWwgaW4gdGhlIFNvZnR3YXJlIHdpdGhvdXQKLSAqIHJlc3RyaWN0aW9uLCBpbmNsdWRpbmcg d2l0aG91dCBsaW1pdGF0aW9uIHRoZSByaWdodHMgdG8gdXNlLCBjb3B5LAotICogbW9kaWZ5LCBt ZXJnZSwgcHVibGlzaCwgZGlzdHJpYnV0ZSwgc3VibGljZW5zZSwgYW5kL29yIHNlbGwgY29waWVz Ci0gKiBvZiB0aGUgU29mdHdhcmUsIGFuZCB0byBwZXJtaXQgcGVyc29ucyB0byB3aG9tIHRoZSBT b2Z0d2FyZSBpcwotICogZnVybmlzaGVkIHRvIGRvIHNvLCBzdWJqZWN0IHRvIHRoZSBmb2xsb3dp bmcgY29uZGl0aW9uczoKLSAqCi0gKiBUaGUgYWJvdmUgY29weXJpZ2h0IG5vdGljZSBhbmQgdGhp cyBwZXJtaXNzaW9uIG5vdGljZSAoaW5jbHVkaW5nCi0gKiB0aGUgbmV4dCBwYXJhZ3JhcGgpIHNo YWxsIGJlIGluY2x1ZGVkIGluIGFsbCBjb3BpZXMgb3Igc3Vic3RhbnRpYWwKLSAqIHBvcnRpb25z IG9mIHRoZSBTb2Z0d2FyZS4KLSAqCi0gKiBUSEUgU09GVFdBUkUgSVMgUFJPVklERUQgIkFTIElT IiwgV0lUSE9VVCBXQVJSQU5UWSBPRiBBTlkgS0lORCwKLSAqIEVYUFJFU1MgT1IgSU1QTElFRCwg SU5DTFVESU5HIEJVVCBOT1QgTElNSVRFRCBUTyBUSEUgV0FSUkFOVElFUyBPRgotICogTUVSQ0hB TlRBQklMSVRZLCBGSVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIgUFVSUE9TRSBBTkQKLSAqIE5PTklO RlJJTkdFTUVOVC4gIElOIE5PIEVWRU5UIFNIQUxMIFRIRSBBVVRIT1JTIE9SIENPUFlSSUdIVAot ICogSE9MREVSUyBCRSBMSUFCTEUgRk9SIEFOWSBDTEFJTSwgREFNQUdFUyBPUiBPVEhFUiBMSUFC SUxJVFksCi0gKiBXSEVUSEVSIElOIEFOIEFDVElPTiBPRiBDT05UUkFDVCwgVE9SVCBPUiBPVEhF UldJU0UsIEFSSVNJTkcgRlJPTSwKLSAqIE9VVCBPRiBPUiBJTiBDT05ORUNUSU9OIFdJVEggVEhF IFNPRlRXQVJFIE9SIFRIRSBVU0UgT1IgT1RIRVIKLSAqIERFQUxJTkdTIElOIFRIRSBTT0ZUV0FS RS4KLSAqCi0gKiBBdXRob3JzOgotICogICAgWmhpZ2FuZyBHb25nIDx6aGlnYW5nLmdvbmdAbGlu dXguaW50ZWwuY29tPgotICoKLSAqLwotCi0jaWZuZGVmIFVYQV9HTEFNT1JfSAotI2RlZmluZSBV WEFfR0xBTU9SX0gKLQotI2lmZGVmIEhBVkVfQ09ORklHX0gKLSNpbmNsdWRlICJjb25maWcuaCIK LSNlbmRpZgotCi0jaWZkZWYgVVNFX0dMQU1PUgotI2luY2x1ZGUgImdsYW1vci5oIgotI2Vsc2UK LSNkZWZpbmUgZ2xhbW9yX2ZpbGxfc3BhbnNfbmYoLi4uKQlGQUxTRQotI2RlZmluZSBnbGFtb3Jf cG9seV9maWxsX3JlY3RfbmYoLi4uKQlGQUxTRQotI2RlZmluZSBnbGFtb3JfcHV0X2ltYWdlX25m KC4uLikJRkFMU0UKLSNkZWZpbmUgZ2xhbW9yX2NvcHlfbl90b19uX25mKC4uLikJRkFMU0UKLSNk ZWZpbmUgZ2xhbW9yX2dldF9zcGFuc19uZiguLi4pCUZBTFNFCi0jZGVmaW5lIGdsYW1vcl9zZXRf c3BhbnNfbmYoLi4uKQlGQUxTRQotI2RlZmluZSBnbGFtb3JfZ2V0X2ltYWdlX25mKC4uLikJRkFM U0UKLSNkZWZpbmUgZ2xhbW9yX2dseXBoc19uZiguLi4pCQlGQUxTRQotI2RlZmluZSBnbGFtb3Jf Z2x5cGhfdW5yZWFsaXplKC4uLikJZG8geyB9IHdoaWxlKDApCi0jZGVmaW5lIGdsYW1vcl9jb21w b3NpdGVfbmYoLi4uKQlGQUxTRQotI2RlZmluZSBnbGFtb3JfY29tcG9zaXRlX3JlY3RzX25mKC4u LikJRkFMU0UKLSNkZWZpbmUgZ2xhbW9yX3RyYXBlem9pZHNfbmYoLi4uKQlGQUxTRQotI2RlZmlu ZSBnbGFtb3JfdHJpYW5nbGVzX25mKC4uLikJRkFMU0UKLSNkZWZpbmUgZ2xhbW9yX2FkZF90cmFw c19uZiguLi4pCUZBTFNFCi0jZGVmaW5lIGdsYW1vcl9jcmVhdGVfZ2MoLi4uKQkJRkFMU0UKLSNk ZWZpbmUgZ2xhbW9yX3ZhbGlkYXRlX2djKC4uLikJCWRvIHsgfSB3aGlsZSgwKQotI2RlZmluZSBn bGFtb3JfcG9seV9wb2ludF9uZiguLi4pCUZBTFNFCi0jZGVmaW5lIGdsYW1vcl9wb2x5X3NlZ21l bnRfbmYoLi4uKQlGQUxTRQotI2RlZmluZSBnbGFtb3JfcG9seV9saW5lc19uZiguLi4pCUZBTFNF Ci0jZGVmaW5lIGdsYW1vcl9wdXNoX3BpeGVsc19uZiguLi4pCUZBTFNFCi0jZGVmaW5lIGdsYW1v cl9jb3B5X3BsYW5lX25mKC4uLikJRkFMU0UKLSNkZWZpbmUgZ2xhbW9yX2ltYWdlX2dseXBoX2Js dF9uZiguLi4pCUZBTFNFCi0jZGVmaW5lIGdsYW1vcl9wb2x5X2dseXBoX2JsdF9uZiguLi4pCUZB TFNFCi0jZW5kaWYKLQotI2VuZGlmIC8qIFVYQV9HTEFNT1JfSCAqLwpkaWZmIC0tZ2l0IGEvc3Jj L3V4YS91eGEtZ2x5cGhzLmMgYi9zcmMvdXhhL3V4YS1nbHlwaHMuYwppbmRleCA3ZjM1ODYzLi5k MjRiYTUxIDEwMDY0NAotLS0gYS9zcmMvdXhhL3V4YS1nbHlwaHMuYworKysgYi9zcmMvdXhhL3V4 YS1nbHlwaHMuYwpAQCAtNjUsNyArNjUsNiBAQAogI2luY2x1ZGUgPHN0ZGxpYi5oPgogCiAjaW5j bHVkZSAidXhhLXByaXYuaCIKLSNpbmNsdWRlICJ1eGEtZ2xhbW9yLmgiCiAjaW5jbHVkZSAiY29t bW9uLmgiCiAKIC8qIFdpZHRoIG9mIHRoZSBwaXhtYXBzIHdlIHVzZSBmb3IgdGhlIGNhY2hlczsg dGhpcyBzaG91bGQgYmUgbGVzcyB0aGFuCkBAIC0yMTAsMTAgKzIwOSw2IEBAIGJhaWw6CiBCb29s IHV4YV9nbHlwaHNfaW5pdChTY3JlZW5QdHIgcFNjcmVlbikKIHsKIAotCXV4YV9zY3JlZW5fdCAq dXhhX3NjcmVlbiA9IHV4YV9nZXRfc2NyZWVuKHBTY3JlZW4pOwotCi0JaWYgKHV4YV9zY3JlZW4t PmluZm8tPmZsYWdzICYgVVhBX1VTRV9HTEFNT1IpCi0JCXJldHVybiBUUlVFOwogI2lmIEhBU19E SVhSRUdJU1RFUlBSSVZBVEVLRVkKIAlpZiAoIWRpeFJlZ2lzdGVyUHJpdmF0ZUtleSgmdXhhX2ds eXBoX2tleSwgUFJJVkFURV9HTFlQSCwgMCkpCiAJCXJldHVybiBGQUxTRTsKQEAgLTMwOCwxMiAr MzAzLDYgQEAgdXhhX2dseXBoX3VucmVhbGl6ZShTY3JlZW5QdHIgc2NyZWVuLAogCQkgICAgR2x5 cGhQdHIgZ2x5cGgpCiB7CiAJc3RydWN0IHV4YV9nbHlwaCAqcHJpdjsKLQl1eGFfc2NyZWVuX3Qg KnV4YV9zY3JlZW4gPSB1eGFfZ2V0X3NjcmVlbihzY3JlZW4pOwotCi0JaWYgKHV4YV9zY3JlZW4t PmluZm8tPmZsYWdzICYgVVhBX1VTRV9HTEFNT1IpIHsKLQkJZ2xhbW9yX2dseXBoX3VucmVhbGl6 ZShzY3JlZW4sIGdseXBoKTsKLQkJcmV0dXJuOwotCX0KIAogCS8qIFVzZSBMb29rdXAgaW4gY2Fz ZSB3ZSBoYXZlIG5vdCBhdHRhY2hlZCB0byB0aGlzIGdseXBoLiAqLwogCXByaXYgPSBkaXhMb29r dXBQcml2YXRlKCZnbHlwaC0+ZGV2UHJpdmF0ZXMsICZ1eGFfZ2x5cGhfa2V5KTsKQEAgLTk3NSwy MyArOTY0LDYgQEAgdXhhX2dseXBocyhDQVJEOCBvcCwKIAlTY3JlZW5QdHIgc2NyZWVuID0gcERz dC0+cERyYXdhYmxlLT5wU2NyZWVuOwogCXV4YV9zY3JlZW5fdCAqdXhhX3NjcmVlbiA9IHV4YV9n ZXRfc2NyZWVuKHNjcmVlbik7CiAKLQlpZiAodXhhX3NjcmVlbi0+aW5mby0+ZmxhZ3MgJiBVWEFf VVNFX0dMQU1PUikgewotCQlpbnQgb2s7Ci0KLQkJdXhhX3BpY3R1cmVfcHJlcGFyZV9hY2Nlc3Mo cERzdCwgVVhBX0dMQU1PUl9BQ0NFU1NfUlcpOwotCQl1eGFfcGljdHVyZV9wcmVwYXJlX2FjY2Vz cyhwU3JjLCBVWEFfR0xBTU9SX0FDQ0VTU19STyk7Ci0JCW9rID0gZ2xhbW9yX2dseXBoc19uZihv cCwKLQkJCQkgICAgIHBTcmMsIHBEc3QsIG1hc2tGb3JtYXQsCi0JCQkJICAgICB4U3JjLCB5U3Jj LCBubGlzdCwgbGlzdCwgZ2x5cGhzKTsKLQkJdXhhX3BpY3R1cmVfZmluaXNoX2FjY2VzcyhwU3Jj LCBVWEFfR0xBTU9SX0FDQ0VTU19STyk7Ci0JCXV4YV9waWN0dXJlX2ZpbmlzaF9hY2Nlc3MocERz dCwgVVhBX0dMQU1PUl9BQ0NFU1NfUlcpOwotCi0JCWlmICghb2spCi0JCQlnb3RvIGZhbGxiYWNr OwotCi0JCXJldHVybjsKLQl9Ci0KIAlpZiAoIXV4YV9zY3JlZW4tPmluZm8tPnByZXBhcmVfY29t cG9zaXRlIHx8CiAJICAgIHV4YV9zY3JlZW4tPmZvcmNlX2ZhbGxiYWNrIHx8CiAJICAgICF1eGFf ZHJhd2FibGVfaXNfb2Zmc2NyZWVuKHBEc3QtPnBEcmF3YWJsZSkgfHwKZGlmZiAtLWdpdCBhL3Ny Yy91eGEvdXhhLXJlbmRlci5jIGIvc3JjL3V4YS91eGEtcmVuZGVyLmMKaW5kZXggYTEzOGYxNi4u NDM4NjIzYyAxMDA2NDQKLS0tIGEvc3JjL3V4YS91eGEtcmVuZGVyLmMKKysrIGIvc3JjL3V4YS91 eGEtcmVuZGVyLmMKQEAgLTI5LDcgKzI5LDYgQEAKICNpbmNsdWRlIDxzdGRsaWIuaD4KIAogI2lu Y2x1ZGUgInV4YS1wcml2LmgiCi0jaW5jbHVkZSAidXhhLWdsYW1vci5oIgogCiAjaWZkZWYgUkVO REVSCiAjaW5jbHVkZSAibWlwaWN0LmgiCkBAIC0xMzU3LDMwICsxMzU2LDYgQEAgdXhhX2NvbXBv c2l0ZShDQVJEOCBvcCwKIAlSZWdpb25SZWMgcmVnaW9uOwogCWludCB0eCwgdHk7CiAKLQlpZiAo dXhhX3NjcmVlbi0+aW5mby0+ZmxhZ3MgJiBVWEFfVVNFX0dMQU1PUikgewotCQlpbnQgb2s7Ci0K LQkJdXhhX3BpY3R1cmVfcHJlcGFyZV9hY2Nlc3MocERzdCwgVVhBX0dMQU1PUl9BQ0NFU1NfUlcp OwotCQl1eGFfcGljdHVyZV9wcmVwYXJlX2FjY2VzcyhwU3JjLCBVWEFfR0xBTU9SX0FDQ0VTU19S Tyk7Ci0JCWlmIChwTWFzaykKLQkJCXV4YV9waWN0dXJlX3ByZXBhcmVfYWNjZXNzKHBNYXNrLCBV WEFfR0xBTU9SX0FDQ0VTU19STyk7Ci0KLQkJb2sgPSBnbGFtb3JfY29tcG9zaXRlX25mKG9wLAot CQkJCQkgcFNyYywgcE1hc2ssIHBEc3QsIHhTcmMsIHlTcmMsCi0JCQkJCSB4TWFzaywgeU1hc2ss IHhEc3QsIHlEc3QsCi0JCQkJCSB3aWR0aCwgaGVpZ2h0KTsKLQotCQlpZiAocE1hc2spCi0JCQl1 eGFfcGljdHVyZV9maW5pc2hfYWNjZXNzKHBNYXNrLCBVWEFfR0xBTU9SX0FDQ0VTU19STyk7Ci0J CXV4YV9waWN0dXJlX2ZpbmlzaF9hY2Nlc3MocFNyYywgVVhBX0dMQU1PUl9BQ0NFU1NfUk8pOwot CQl1eGFfcGljdHVyZV9maW5pc2hfYWNjZXNzKHBEc3QsIFVYQV9HTEFNT1JfQUNDRVNTX1JXKTsK LQotCQlpZiAoIW9rKQotCQkJZ290byBmYWxsYmFjazsKLQotCQlyZXR1cm47Ci0JfQotCiAJaWYg KHV4YV9zY3JlZW4tPmZvcmNlX2ZhbGxiYWNrKQogCQlnb3RvIGZhbGxiYWNrOwogCkBAIC0xNzIy LDI1ICsxNjk3LDcgQEAgdXhhX3RyYXBlem9pZHMoQ0FSRDggb3AsIFBpY3R1cmVQdHIgc3JjLCBQ aWN0dXJlUHRyIGRzdCwKIAlCb3hSZWMgYm91bmRzOwogCUJvb2wgZGlyZWN0OwogCi0JaWYgKHV4 YV9zY3JlZW4tPmluZm8tPmZsYWdzICYgVVhBX1VTRV9HTEFNT1IpIHsKLQkJaW50IG9rOwotCi0J CXV4YV9waWN0dXJlX3ByZXBhcmVfYWNjZXNzKGRzdCwgVVhBX0dMQU1PUl9BQ0NFU1NfUlcpOwot CQl1eGFfcGljdHVyZV9wcmVwYXJlX2FjY2VzcyhzcmMsIFVYQV9HTEFNT1JfQUNDRVNTX1JPKTsK LQkJb2sgPSBnbGFtb3JfdHJhcGV6b2lkc19uZihvcCwKLQkJCQkJICBzcmMsIGRzdCwgbWFza0Zv cm1hdCwgeFNyYywKLQkJCQkJICB5U3JjLCBudHJhcCwgdHJhcHMpOwotCQl1eGFfcGljdHVyZV9m aW5pc2hfYWNjZXNzKHNyYywgVVhBX0dMQU1PUl9BQ0NFU1NfUk8pOwotCQl1eGFfcGljdHVyZV9m aW5pc2hfYWNjZXNzKGRzdCwgVVhBX0dMQU1PUl9BQ0NFU1NfUlcpOwotCi0JCWlmICghb2spCi0J CQlnb3RvIGZhbGxiYWNrOwotCi0JCXJldHVybjsKLQl9Ci0KIAlpZiAodXhhX3NjcmVlbi0+Zm9y Y2VfZmFsbGJhY2spIHsKLWZhbGxiYWNrOgogCQl1eGFfY2hlY2tfdHJhcGV6b2lkcyhvcCwgc3Jj LCBkc3QsIG1hc2tGb3JtYXQsIHhTcmMsIHlTcmMsIG50cmFwLCB0cmFwcyk7CiAJCXJldHVybjsK IAl9CkBAIC0xOTUxLDI1ICsxOTA4LDcgQEAgdXhhX3RyaWFuZ2xlcyhDQVJEOCBvcCwgUGljdHVy ZVB0ciBwU3JjLCBQaWN0dXJlUHRyIHBEc3QsCiAJQm94UmVjIGJvdW5kczsKIAlCb29sIGRpcmVj dDsKIAotCWlmICh1eGFfc2NyZWVuLT5pbmZvLT5mbGFncyAmIFVYQV9VU0VfR0xBTU9SKSB7Ci0J CWludCBvazsKLQotCQl1eGFfcGljdHVyZV9wcmVwYXJlX2FjY2VzcyhwRHN0LCBVWEFfR0xBTU9S X0FDQ0VTU19SVyk7Ci0JCXV4YV9waWN0dXJlX3ByZXBhcmVfYWNjZXNzKHBTcmMsIFVYQV9HTEFN T1JfQUNDRVNTX1JPKTsKLQkJb2sgPSBnbGFtb3JfdHJpYW5nbGVzX25mKG9wLAotCQkJCSAgICAg ICAgcFNyYywgcERzdCwgbWFza0Zvcm1hdCwgeFNyYywKLQkJCQkJeVNyYywgbnRyaSwgdHJpcyk7 Ci0JCXV4YV9waWN0dXJlX2ZpbmlzaF9hY2Nlc3MocFNyYywgVVhBX0dMQU1PUl9BQ0NFU1NfUk8p OwotCQl1eGFfcGljdHVyZV9maW5pc2hfYWNjZXNzKHBEc3QsIFVYQV9HTEFNT1JfQUNDRVNTX1JX KTsKLQotCQlpZiAoIW9rKQotCQkJZ290byBmYWxsYmFjazsKLQotCQlyZXR1cm47Ci0JfQotCiAJ aWYgKHV4YV9zY3JlZW4tPmZvcmNlX2ZhbGxiYWNrKSB7Ci1mYWxsYmFjazoKIAkJdXhhX2NoZWNr X3RyaWFuZ2xlcyhvcCwgcFNyYywgcERzdCwgbWFza0Zvcm1hdCwKIAkJCQkgICAgeFNyYywgeVNy YywgbnRyaSwgdHJpcyk7CiAJCXJldHVybjsKQEAgLTIwNTEsMjMgKzE5OTAsNSBAQCB2b2lkCiB1 eGFfYWRkX3RyYXBzKFBpY3R1cmVQdHIgcFBpY3R1cmUsCiAJICAgICAgSU5UMTYgeF9vZmYsIElO VDE2IHlfb2ZmLCBpbnQgbnRyYXAsIHhUcmFwICogdHJhcHMpCiB7Ci0JU2NyZWVuUHRyIHBTY3Jl ZW4gPSBwUGljdHVyZS0+cERyYXdhYmxlLT5wU2NyZWVuOwotCXV4YV9zY3JlZW5fdCAqdXhhX3Nj cmVlbiA9IHV4YV9nZXRfc2NyZWVuKHBTY3JlZW4pOwotCi0JaWYgKHV4YV9zY3JlZW4tPmluZm8t PmZsYWdzICYgVVhBX1VTRV9HTEFNT1IpIHsKLQkJaW50IG9rOwotCi0JCXV4YV9waWN0dXJlX3By ZXBhcmVfYWNjZXNzKHBQaWN0dXJlLCBVWEFfR0xBTU9SX0FDQ0VTU19SVyk7Ci0JCW9rID0gZ2xh bW9yX2FkZF90cmFwc19uZihwUGljdHVyZSwKLQkJCQkJIHhfb2ZmLCB5X29mZiwgbnRyYXAsIHRy YXBzKTsKLQkJdXhhX3BpY3R1cmVfZmluaXNoX2FjY2VzcyhwUGljdHVyZSwgVVhBX0dMQU1PUl9B Q0NFU1NfUlcpOwotCi0JCWlmICghb2spCi0JCQlnb3RvIGZhbGxiYWNrOwotCi0JCXJldHVybjsK LQl9Ci0KLWZhbGxiYWNrOgogCXV4YV9jaGVja19hZGRfdHJhcHMocFBpY3R1cmUsIHhfb2ZmLCB5 X29mZiwgbnRyYXAsIHRyYXBzKTsKIH0KZGlmZiAtLWdpdCBhL3NyYy91eGEvdXhhLmMgYi9zcmMv dXhhL3V4YS5jCmluZGV4IGM4ZDc5MDAuLjkwNTY2N2QgMTAwNjQ0Ci0tLSBhL3NyYy91eGEvdXhh LmMKKysrIGIvc3JjL3V4YS91eGEuYwpAQCAtMzgsNyArMzgsNiBAQAogI2luY2x1ZGUgPFgxMS9m b250cy9mb250c3RydWN0Lmg+CiAjaW5jbHVkZSAiZGl4Zm9udHN0ci5oIgogI2luY2x1ZGUgInV4 YS5oIgotI2luY2x1ZGUgInV4YS1nbGFtb3IuaCIKIAogI2lmIEhBU19ERVZQUklWQVRFS0VZUkVD CiBEZXZQcml2YXRlS2V5UmVjIHV4YV9zY3JlZW5faW5kZXg7CkBAIC0xODQsNyArMTgzLDYgQEAg dm9pZCB1eGFfZmluaXNoX2FjY2VzcyhEcmF3YWJsZVB0ciBwRHJhd2FibGUsIHV4YV9hY2Nlc3Nf dCBhY2Nlc3MpCiBzdGF0aWMgdm9pZAogdXhhX3ZhbGlkYXRlX2djKEdDUHRyIHBHQywgdW5zaWdu ZWQgbG9uZyBjaGFuZ2VzLCBEcmF3YWJsZVB0ciBwRHJhd2FibGUpCiB7Ci0JdXhhX3NjcmVlbl90 ICp1eGFfc2NyZWVuID0gdXhhX2dldF9zY3JlZW4ocEdDLT5wU2NyZWVuKTsKIAkvKiBmYlZhbGlk YXRlR0Mgd2lsbCBkbyBkaXJlY3QgYWNjZXNzIHRvIHBpeG1hcHMgaWYgdGhlIHRpbGluZyBoYXMK IAkgKiBjaGFuZ2VkLgogCSAqIFByZWVtcHQgZmJWYWxpZGF0ZUdDIGJ5IGRvaW5nIGl0cyB3b3Jr IGFuZCBtYXNraW5nIHRoZSBjaGFuZ2Ugb3V0LCBzbwpAQCAtMTk1LDEwICsxOTMsNiBAQCB1eGFf dmFsaWRhdGVfZ2MoR0NQdHIgcEdDLCB1bnNpZ25lZCBsb25nIGNoYW5nZXMsIERyYXdhYmxlUHRy IHBEcmF3YWJsZSkKIAkgKiBtYXkgYmUgcHVyZSBHTEFNT1IgcGl4bWFwLCB0aGVuIHdlIHNob3Vs ZCBsZXQgdGhlIGdsYW1vcgogCSAqIHRvIGRvIHRoZSB2YWxpZGF0aW9uLgogCSAqLwotCWlmICh1 eGFfc2NyZWVuLT5pbmZvLT5mbGFncyAmIFVYQV9VU0VfR0xBTU9SKSB7Ci0JCWdsYW1vcl92YWxp ZGF0ZV9nYyhwR0MsIGNoYW5nZXMsIHBEcmF3YWJsZSk7Ci0JCWdvdG8gc2V0X29wczsKLQl9CiAj aWZkZWYgRkJfMjRfMzJCSVQKIAlpZiAoKGNoYW5nZXMgJiBHQ1RpbGUpICYmIGZiR2V0Um90YXRl ZFBpeG1hcChwR0MpKSB7CiAJCSgqcEdDLT5wU2NyZWVuLT5EZXN0cm95UGl4bWFwKSAoZmJHZXRS b3RhdGVkUGl4bWFwKHBHQykpOwpAQCAtMjY3LDcgKzI2MSw2IEBAIHV4YV92YWxpZGF0ZV9nYyhH Q1B0ciBwR0MsIHVuc2lnbmVkIGxvbmcgY2hhbmdlcywgRHJhd2FibGVQdHIgcERyYXdhYmxlKQog CQlmYlZhbGlkYXRlR0MocEdDLCBjaGFuZ2VzLCBwRHJhd2FibGUpOwogCX0KIAotc2V0X29wczoK IAlwR0MtPm9wcyA9IChHQ09wcyAqKSAmIHV4YV9vcHM7CiB9CiAKZGlmZiAtLWdpdCBhL3NyYy91 eGEvdXhhLmggYi9zcmMvdXhhL3V4YS5oCmluZGV4IGI4NTY5ZjAuLmQwOGM2MDEgMTAwNjQ0Ci0t LSBhL3NyYy91eGEvdXhhLmgKKysrIGIvc3JjL3V4YS91eGEuaApAQCAtNDYsOCArNDYsNiBAQAog dHlwZWRlZiBlbnVtIHsKIAlVWEFfQUNDRVNTX1JPLAogCVVYQV9BQ0NFU1NfUlcsCi0JVVhBX0dM QU1PUl9BQ0NFU1NfUk8sCi0JVVhBX0dMQU1PUl9BQ0NFU1NfUlcKIH0gdXhhX2FjY2Vzc190Owog CiAvKioKQEAgLTU0NSwyMCArNTQzLDYgQEAgdHlwZWRlZiBzdHJ1Y3QgX1V4YURyaXZlciB7CiAg Ki8KICNkZWZpbmUgVVhBX1RXT19CSVRCTFRfRElSRUNUSU9OUwkoMSA8PCAyKQogCi0vKioKLSAq IFVYQV9VU0VfR0xBTU9SIGluZGljYXRlcyB0byB1c2UgZ2xhbW9yIGFjY2VsZXJhdGlvbiB0byBw ZXJmb3JtIHJlbmRlcmluZy4KLSAqIEFuZCBpZiBnbGFtb3IgZmFpbCB0byBhY2NlbGVyYXRlIHRo ZSByZW5kZXJpbmcsIHRoZW4gZ290byBmYWxsYmFjayB0bwotICogdXNlIENQVSB0byBkbyB0aGUg cmVuZGVyaW5nLiBUaGlzIGZsYWcgd2lsbCBiZSBzZXQgb25seSB3aGVuIGdsYW1vciBnZXQKLSAq IGluaXRpYWxpemVkIHN1Y2Nlc3NmdWxseS4KLSAqIE5vdGUsIGluIGRkeCBjbG9zZSBzY3JlZW4s IHRoaXMgYml0IG5lZWQgdG8gYmUgY2xlYXJlZC4KLSAqLwotI2RlZmluZSBVWEFfVVNFX0dMQU1P UgkJCSgxIDw8IDMpCi0KLS8qIFVYQV9HTEFNT1JfRUdMX0lOSVRJQUxJWkVEIGluZGljYXRlcyBn bGFtb3IgZWdsIGxheWVyIGdldCBpbml0aWFsaXplZAotICogc3VjY2Vzc2Z1bGx5LiBVWEEgbGF5 ZXIgZG9lcyBub3QgdXNlIHRoaXMgZmxhZywgYmVmb3JlIGNhbGwgdG8KLSAqIGdsYW1vcl9pbml0 LCBkZHggbmVlZCB0byBjaGVjayB0aGlzIGZsYWcuICovCi0jZGVmaW5lIFVYQV9HTEFNT1JfRUdM X0lOSVRJQUxJWkVECSgxIDw8IDQpCi0KIC8qKiBAfSAqLwogLyoqIEBuYW1lIFVYQSBDcmVhdGVQ aXhtYXAgaGludCBmbGFncwogICogQHsKLS0gCjIuMC4xCgpfX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdm eEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWls bWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=