From: =?UTF-8?q?Michel=20D=C3=A4nzer?= Subject: [PATCH xf86-video-ati 04/10] glamor: Don't store radeon_surfaces in pixmaps Date: Thu, 5 Jul 2018 14:13:01 +0200 Message-ID: <20180705121307.7835-5-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+CgpPbmx5IEVYQSBu ZWVkcyB0aGVtLgoKU2lnbmVkLW9mZi1ieTogTWljaGVsIETDpG56ZXIgPG1pY2hlbC5kYWVuemVy QGFtZC5jb20+Ci0tLQogc3JjL2RybW1vZGVfZGlzcGxheS5jICB8IDc3ICsrKysrKysrKysrKysr KysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0tLQogc3JjL3JhZGVvbi5oICAgICAgICAgICB8IDE5 ICsrLS0tLS0tLS0tCiBzcmMvcmFkZW9uX2JvX2hlbHBlci5jIHwgMjIgKysrKystLS0tLS0tCiBz cmMvcmFkZW9uX2dsYW1vci5jICAgIHwgIDggKystLS0KIHNyYy9yYWRlb25fa21zLmMgICAgICAg fCAxMSArKystLS0KIDUgZmlsZXMgY2hhbmdlZCwgNTUgaW5zZXJ0aW9ucygrKSwgODIgZGVsZXRp b25zKC0pCgpkaWZmIC0tZ2l0IGEvc3JjL2RybW1vZGVfZGlzcGxheS5jIGIvc3JjL2RybW1vZGVf ZGlzcGxheS5jCmluZGV4IGY5OTY2N2ZiMS4uOGRjNzc2ZmE1IDEwMDY0NAotLS0gYS9zcmMvZHJt bW9kZV9kaXNwbGF5LmMKKysrIGIvc3JjL2RybW1vZGVfZGlzcGxheS5jCkBAIC0xMTYsNyArMTE2 LDYgQEAgc3RhdGljIFBpeG1hcFB0ciBkcm1tb2RlX2NyZWF0ZV9ib19waXhtYXAoU2NybkluZm9Q dHIgcFNjcm4sCiAJUkFERU9OSW5mb1B0ciBpbmZvID0gUkFERU9OUFRSKHBTY3JuKTsKIAlTY3Jl ZW5QdHIgcFNjcmVlbiA9IHBTY3JuLT5wU2NyZWVuOwogCVBpeG1hcFB0ciBwaXhtYXA7Ci0Jc3Ry dWN0IHJhZGVvbl9zdXJmYWNlICpzdXJmYWNlOwogCXVpbnQzMl90IHRpbGluZzsKIAogCXBpeG1h cCA9ICgqcFNjcmVlbi0+Q3JlYXRlUGl4bWFwKShwU2NyZWVuLCAwLCAwLCBkZXB0aCwKQEAgLTEz NSw0MSArMTM0LDQxIEBAIHN0YXRpYyBQaXhtYXBQdHIgZHJtbW9kZV9jcmVhdGVfYm9fcGl4bWFw KFNjcm5JbmZvUHRyIHBTY3JuLAogCWlmICghcmFkZW9uX3NldF9waXhtYXBfYm8ocGl4bWFwLCBi bykpCiAJCWdvdG8gZmFpbDsKIAotCWlmIChpbmZvLT5zdXJmX21hbikgewotCQlzdXJmYWNlID0g cmFkZW9uX2dldF9waXhtYXBfc3VyZmFjZShwaXhtYXApOwotCQlpZiAoc3VyZmFjZSkgewotCQkJ bWVtc2V0KHN1cmZhY2UsIDAsIHNpemVvZihzdHJ1Y3QgcmFkZW9uX3N1cmZhY2UpKTsKLQkJCXN1 cmZhY2UtPm5waXhfeCA9IHdpZHRoOwotCQkJc3VyZmFjZS0+bnBpeF95ID0gaGVpZ2h0OwotCQkJ c3VyZmFjZS0+bnBpeF96ID0gMTsKLQkJCXN1cmZhY2UtPmJsa193ID0gMTsKLQkJCXN1cmZhY2Ut PmJsa19oID0gMTsKLQkJCXN1cmZhY2UtPmJsa19kID0gMTsKLQkJCXN1cmZhY2UtPmFycmF5X3Np emUgPSAxOwotCQkJc3VyZmFjZS0+bGFzdF9sZXZlbCA9IDA7Ci0JCQlzdXJmYWNlLT5icGUgPSBi cHAgLyA4OwotCQkJc3VyZmFjZS0+bnNhbXBsZXMgPSAxOwotCQkJc3VyZmFjZS0+ZmxhZ3MgPSBS QURFT05fU1VSRl9TQ0FOT1VUOwotCQkJLyogd2UgYXJlIHJlcXVpcmluZyBhIHJlY2VudCBlbm91 Z2ggbGliZHJtIHZlcnNpb24gKi8KLQkJCXN1cmZhY2UtPmZsYWdzIHw9IFJBREVPTl9TVVJGX0hB U19USUxFX01PREVfSU5ERVg7Ci0JCQlzdXJmYWNlLT5mbGFncyB8PSBSQURFT05fU1VSRl9TRVQo UkFERU9OX1NVUkZfVFlQRV8yRCwgVFlQRSk7Ci0JCQlzdXJmYWNlLT5mbGFncyB8PSBSQURFT05f U1VSRl9TRVQoUkFERU9OX1NVUkZfTU9ERV9MSU5FQVJfQUxJR05FRCwgTU9ERSk7Ci0JCQl0aWxp bmcgPSByYWRlb25fZ2V0X3BpeG1hcF90aWxpbmdfZmxhZ3MocGl4bWFwKTsKLQkJCWlmICh0aWxp bmcgJiBSQURFT05fVElMSU5HX01JQ1JPKSB7Ci0JCQkJc3VyZmFjZS0+ZmxhZ3MgPSBSQURFT05f U1VSRl9DTFIoc3VyZmFjZS0+ZmxhZ3MsIE1PREUpOwotCQkJCXN1cmZhY2UtPmZsYWdzIHw9IFJB REVPTl9TVVJGX1NFVChSQURFT05fU1VSRl9NT0RFXzFELCBNT0RFKTsKLQkJCX0KLQkJCWlmICh0 aWxpbmcgJiBSQURFT05fVElMSU5HX01BQ1JPKSB7Ci0JCQkJc3VyZmFjZS0+ZmxhZ3MgPSBSQURF T05fU1VSRl9DTFIoc3VyZmFjZS0+ZmxhZ3MsIE1PREUpOwotCQkJCXN1cmZhY2UtPmZsYWdzIHw9 IFJBREVPTl9TVVJGX1NFVChSQURFT05fU1VSRl9NT0RFXzJELCBNT0RFKTsKLQkJCX0KLQkJCWlm IChyYWRlb25fc3VyZmFjZV9iZXN0KGluZm8tPnN1cmZfbWFuLCBzdXJmYWNlKSkgewotCQkJCWdv dG8gZmFpbDsKLQkJCX0KLQkJCWlmIChyYWRlb25fc3VyZmFjZV9pbml0KGluZm8tPnN1cmZfbWFu LCBzdXJmYWNlKSkgewotCQkJCWdvdG8gZmFpbDsKLQkJCX0KKwlpZiAoaW5mby0+c3VyZl9tYW4g JiYgIWluZm8tPnVzZV9nbGFtb3IpIHsKKwkJc3RydWN0IHJhZGVvbl9zdXJmYWNlICpzdXJmYWNl ID0gcmFkZW9uX2dldF9waXhtYXBfc3VyZmFjZShwaXhtYXApOworCisJCW1lbXNldChzdXJmYWNl LCAwLCBzaXplb2Yoc3RydWN0IHJhZGVvbl9zdXJmYWNlKSk7CisJCXN1cmZhY2UtPm5waXhfeCA9 IHdpZHRoOworCQlzdXJmYWNlLT5ucGl4X3kgPSBoZWlnaHQ7CisJCXN1cmZhY2UtPm5waXhfeiA9 IDE7CisJCXN1cmZhY2UtPmJsa193ID0gMTsKKwkJc3VyZmFjZS0+YmxrX2ggPSAxOworCQlzdXJm YWNlLT5ibGtfZCA9IDE7CisJCXN1cmZhY2UtPmFycmF5X3NpemUgPSAxOworCQlzdXJmYWNlLT5s YXN0X2xldmVsID0gMDsKKwkJc3VyZmFjZS0+YnBlID0gYnBwIC8gODsKKwkJc3VyZmFjZS0+bnNh bXBsZXMgPSAxOworCQlzdXJmYWNlLT5mbGFncyA9IFJBREVPTl9TVVJGX1NDQU5PVVQ7CisJCS8q IHdlIGFyZSByZXF1aXJpbmcgYSByZWNlbnQgZW5vdWdoIGxpYmRybSB2ZXJzaW9uICovCisJCXN1 cmZhY2UtPmZsYWdzIHw9IFJBREVPTl9TVVJGX0hBU19USUxFX01PREVfSU5ERVg7CisJCXN1cmZh Y2UtPmZsYWdzIHw9IFJBREVPTl9TVVJGX1NFVChSQURFT05fU1VSRl9UWVBFXzJELCBUWVBFKTsK KwkJc3VyZmFjZS0+ZmxhZ3MgfD0gUkFERU9OX1NVUkZfU0VUKFJBREVPTl9TVVJGX01PREVfTElO RUFSX0FMSUdORUQsIE1PREUpOworCQl0aWxpbmcgPSByYWRlb25fZ2V0X3BpeG1hcF90aWxpbmdf ZmxhZ3MocGl4bWFwKTsKKworCQlpZiAodGlsaW5nICYgUkFERU9OX1RJTElOR19NSUNSTykgewor CQkJc3VyZmFjZS0+ZmxhZ3MgPSBSQURFT05fU1VSRl9DTFIoc3VyZmFjZS0+ZmxhZ3MsIE1PREUp OworCQkJc3VyZmFjZS0+ZmxhZ3MgfD0gUkFERU9OX1NVUkZfU0VUKFJBREVPTl9TVVJGX01PREVf MUQsIE1PREUpOwogCQl9CisJCWlmICh0aWxpbmcgJiBSQURFT05fVElMSU5HX01BQ1JPKSB7CisJ CQlzdXJmYWNlLT5mbGFncyA9IFJBREVPTl9TVVJGX0NMUihzdXJmYWNlLT5mbGFncywgTU9ERSk7 CisJCQlzdXJmYWNlLT5mbGFncyB8PSBSQURFT05fU1VSRl9TRVQoUkFERU9OX1NVUkZfTU9ERV8y RCwgTU9ERSk7CisJCX0KKworCQlpZiAocmFkZW9uX3N1cmZhY2VfYmVzdChpbmZvLT5zdXJmX21h biwgc3VyZmFjZSkpCisJCQlnb3RvIGZhaWw7CisKKwkJaWYgKHJhZGVvbl9zdXJmYWNlX2luaXQo aW5mby0+c3VyZl9tYW4sIHN1cmZhY2UpKQorCQkJZ290byBmYWlsOwogCX0KIAogCWlmICghaW5m by0+dXNlX2dsYW1vciB8fApAQCAtMjI3Miw3ICsyMjcxLDYgQEAgZHJtbW9kZV94Zjg2Y3J0Y19y ZXNpemUgKFNjcm5JbmZvUHRyIHNjcm4sIGludCB3aWR0aCwgaW50IGhlaWdodCkKIAlpbnQgY3Bw ID0gaW5mby0+cGl4ZWxfYnl0ZXM7CiAJc3RydWN0IHJhZGVvbl9ibyAqZnJvbnRfYm87CiAJc3Ry dWN0IHJhZGVvbl9zdXJmYWNlIHN1cmZhY2U7Ci0Jc3RydWN0IHJhZGVvbl9zdXJmYWNlICpwc3Vy ZmFjZTsKIAl1aW50MzJfdCB0aWxpbmdfZmxhZ3MgPSAwLCBiYXNlX2FsaWduOwogCVBpeG1hcFB0 ciBwcGl4ID0gc2NyZWVuLT5HZXRTY3JlZW5QaXhtYXAoc2NyZWVuKTsKIAl2b2lkICpmYl9zaGFk b3c7CkBAIC0yMzUzLDcgKzIzNTEsOCBAQCBkcm1tb2RlX3hmODZjcnRjX3Jlc2l6ZSAoU2Nybklu Zm9QdHIgc2NybiwgaW50IHdpZHRoLCBpbnQgaGVpZ2h0KQogCQlkZWZhdWx0OgogCQkJYnJlYWs7 CiAJCX0KLQkJaW5mby0+ZnJvbnRfc3VyZmFjZSA9IHN1cmZhY2U7CisJCWlmICghaW5mby0+dXNl X2dsYW1vcikKKwkJCWluZm8tPmZyb250X3N1cmZhY2UgPSBzdXJmYWNlOwogCX0KIAogCXhmODZE cnZNc2coc2Nybi0+c2NybkluZGV4LCBYX0lORk8sCkBAIC0yMzk0LDggKzIzOTMsOCBAQCBkcm1t b2RlX3hmODZjcnRjX3Jlc2l6ZSAoU2NybkluZm9QdHIgc2NybiwgaW50IHdpZHRoLCBpbnQgaGVp Z2h0KQogCSAgICByYWRlb25fYm9fc2V0X3RpbGluZyhpbmZvLT5mcm9udF9ibywgdGlsaW5nX2Zs YWdzLCBwaXRjaCk7CiAKIAlpZiAoIWluZm8tPnI2MDBfc2hhZG93X2ZiKSB7Ci0JCXBzdXJmYWNl ID0gcmFkZW9uX2dldF9waXhtYXBfc3VyZmFjZShwcGl4KTsKLQkJKnBzdXJmYWNlID0gaW5mby0+ ZnJvbnRfc3VyZmFjZTsKKwkJaWYgKGluZm8tPnN1cmZfbWFuICYmICFpbmZvLT51c2VfZ2xhbW9y KQorCQkJKnJhZGVvbl9nZXRfcGl4bWFwX3N1cmZhY2UocHBpeCkgPSBpbmZvLT5mcm9udF9zdXJm YWNlOwogCQlzY3JlZW4tPk1vZGlmeVBpeG1hcEhlYWRlcihwcGl4LAogCQkJCQkgICB3aWR0aCwg aGVpZ2h0LCAtMSwgLTEsIHBpdGNoLCBOVUxMKTsKIAl9IGVsc2UgewpkaWZmIC0tZ2l0IGEvc3Jj L3JhZGVvbi5oIGIvc3JjL3JhZGVvbi5oCmluZGV4IDU5OGE4M2MxNy4uNjNiNmNmMWZmIDEwMDY0 NAotLS0gYS9zcmMvcmFkZW9uLmgKKysrIGIvc3JjL3JhZGVvbi5oCkBAIC0zMDQsOCArMzA0LDYg QEAgcmFkZW9uX2RpcnR5X3NyY19lcXVhbHMoUGl4bWFwRGlydHlVcGRhdGVQdHIgZGlydHksIFBp eG1hcFB0ciBwaXhtYXApCiAjaWZkZWYgVVNFX0dMQU1PUgogCiBzdHJ1Y3QgcmFkZW9uX3BpeG1h cCB7Ci0Jc3RydWN0IHJhZGVvbl9zdXJmYWNlIHN1cmZhY2U7Ci0KIAl1aW50X2Zhc3QzMl90IGdw dV9yZWFkOwogCXVpbnRfZmFzdDMyX3QgZ3B1X3dyaXRlOwogCkBAIC03MDMsMjIgKzcwMSw5IEBA IGV4dGVybiBSQURFT05FbnRQdHIgUkFERU9ORW50UHJpdihTY3JuSW5mb1B0ciBwU2Nybik7CiAK IHN0YXRpYyBpbmxpbmUgc3RydWN0IHJhZGVvbl9zdXJmYWNlICpyYWRlb25fZ2V0X3BpeG1hcF9z dXJmYWNlKFBpeG1hcFB0ciBwUGl4KQogewotI2lmZGVmIFVTRV9HTEFNT1IKLSAgICBSQURFT05J bmZvUHRyIGluZm8gPSBSQURFT05QVFIoeGY4NlNjcmVlblRvU2NybihwUGl4LT5kcmF3YWJsZS5w U2NyZWVuKSk7Ci0KLSAgICBpZiAoaW5mby0+dXNlX2dsYW1vcikgewotCXN0cnVjdCByYWRlb25f cGl4bWFwICpwcml2OwotCXByaXYgPSByYWRlb25fZ2V0X3BpeG1hcF9wcml2YXRlKHBQaXgpOwot CXJldHVybiBwcml2ID8gJnByaXYtPnN1cmZhY2UgOiBOVUxMOwotICAgIH0gZWxzZQotI2VuZGlm Ci0gICAgewotCXN0cnVjdCByYWRlb25fZXhhX3BpeG1hcF9wcml2ICpkcml2ZXJfcHJpdjsKLQlk cml2ZXJfcHJpdiA9IGV4YUdldFBpeG1hcERyaXZlclByaXZhdGUocFBpeCk7Ci0JcmV0dXJuICZk cml2ZXJfcHJpdi0+c3VyZmFjZTsKLSAgICB9CisgICAgc3RydWN0IHJhZGVvbl9leGFfcGl4bWFw X3ByaXYgKmRyaXZlcl9wcml2ID0gZXhhR2V0UGl4bWFwRHJpdmVyUHJpdmF0ZShwUGl4KTsKIAot ICAgIHJldHVybiBOVUxMOworICAgIHJldHVybiAmZHJpdmVyX3ByaXYtPnN1cmZhY2U7CiB9CiAK IHVpbnQzMl90IHJhZGVvbl9nZXRfcGl4bWFwX3RpbGluZyhQaXhtYXBQdHIgcFBpeCk7CmRpZmYg LS1naXQgYS9zcmMvcmFkZW9uX2JvX2hlbHBlci5jIGIvc3JjL3JhZGVvbl9ib19oZWxwZXIuYwpp bmRleCA4MjQ1ZDYyNDcuLmJlODc5YWFkZCAxMDA2NDQKLS0tIGEvc3JjL3JhZGVvbl9ib19oZWxw ZXIuYworKysgYi9zcmMvcmFkZW9uX2JvX2hlbHBlci5jCkBAIC0xNzQsNiArMTc0LDkgQEAgcmFk ZW9uX2FsbG9jX3BpeG1hcF9ibyhTY3JuSW5mb1B0ciBwU2NybiwgaW50IHdpZHRoLCBpbnQgaGVp Z2h0LCBpbnQgZGVwdGgsCiAJCQkJYnJlYWs7CiAJCQl9CiAJCX0KKworCQlpZiAobmV3X3N1cmZh Y2UpCisJCSAgICAqbmV3X3N1cmZhY2UgPSBzdXJmYWNlOwogCX0KIAogICAgIGlmICh0aWxpbmcp CkBAIC0xODUsNyArMTg4LDYgQEAgcmFkZW9uX2FsbG9jX3BpeG1hcF9ibyhTY3JuSW5mb1B0ciBw U2NybiwgaW50IHdpZHRoLCBpbnQgaGVpZ2h0LCBpbnQgZGVwdGgsCiAgICAgaWYgKGJvICYmIHRp bGluZyAmJiByYWRlb25fYm9fc2V0X3RpbGluZyhibywgdGlsaW5nLCBwaXRjaCkgPT0gMCkKIAkq bmV3X3RpbGluZyA9IHRpbGluZzsKIAotICAgICpuZXdfc3VyZmFjZSA9IHN1cmZhY2U7CiAgICAg Km5ld19waXRjaCA9IHBpdGNoOwogICAgIHJldHVybiBibzsKIH0KQEAgLTMzNSwyNiArMzM3LDE4 IEBAIEJvb2wgcmFkZW9uX3NldF9zaGFyZWRfcGl4bWFwX2JhY2tpbmcoUGl4bWFwUHRyIHBwaXgs IHZvaWQgKmZkX2hhbmRsZSwKICAgICBpZiAoIWJvKQogICAgICAgICBnb3RvIGVycm9yOwogCi0g ICAgbWVtc2V0KHN1cmZhY2UsIDAsIHNpemVvZihzdHJ1Y3QgcmFkZW9uX3N1cmZhY2UpKTsKLQog ICAgIHJldCA9IHJhZGVvbl9zZXRfcGl4bWFwX2JvKHBwaXgsIGJvKTsKICAgICBpZiAoIXJldCkK IAlnb3RvIGVycm9yOwogCi0gICAgaWYgKGluZm8tPnN1cmZfbWFuKSB7CisgICAgaWYgKHN1cmZh Y2UpIHsKKwlzdHJ1Y3QgcmFkZW9uX2V4YV9waXhtYXBfcHJpdiAqZHJpdmVyX3ByaXY7CiAJdWlu dDMyX3QgdGlsaW5nX2ZsYWdzOwogCi0jaWZkZWYgVVNFX0dMQU1PUgotCWlmIChpbmZvLT51c2Vf Z2xhbW9yKSB7Ci0JICAgIHRpbGluZ19mbGFncyA9IHJhZGVvbl9nZXRfcGl4bWFwX3ByaXZhdGUo cHBpeCktPnRpbGluZ19mbGFnczsKLQl9IGVsc2UKLSNlbmRpZgotCXsKLQkgICAgc3RydWN0IHJh ZGVvbl9leGFfcGl4bWFwX3ByaXYgKmRyaXZlcl9wcml2OworCWRyaXZlcl9wcml2ID0gZXhhR2V0 UGl4bWFwRHJpdmVyUHJpdmF0ZShwcGl4KTsKKwl0aWxpbmdfZmxhZ3MgPSBkcml2ZXJfcHJpdi0+ dGlsaW5nX2ZsYWdzOwogCi0JICAgIGRyaXZlcl9wcml2ID0gZXhhR2V0UGl4bWFwRHJpdmVyUHJp dmF0ZShwcGl4KTsKLQkgICAgdGlsaW5nX2ZsYWdzID0gZHJpdmVyX3ByaXYtPnRpbGluZ19mbGFn czsKLQl9CisJbWVtc2V0KHN1cmZhY2UsIDAsIHNpemVvZihzdHJ1Y3QgcmFkZW9uX3N1cmZhY2Up KTsKIAogCXN1cmZhY2UtPm5waXhfeCA9IHBwaXgtPmRyYXdhYmxlLndpZHRoOwogCXN1cmZhY2Ut Pm5waXhfeSA9IHBwaXgtPmRyYXdhYmxlLmhlaWdodDsKZGlmZiAtLWdpdCBhL3NyYy9yYWRlb25f Z2xhbW9yLmMgYi9zcmMvcmFkZW9uX2dsYW1vci5jCmluZGV4IDEwZDUxM2VhOS4uNmNmZjcyZTFm IDEwMDY0NAotLS0gYS9zcmMvcmFkZW9uX2dsYW1vci5jCisrKyBiL3NyYy9yYWRlb25fZ2xhbW9y LmMKQEAgLTI1MCw4ICsyNTAsNyBAQCByYWRlb25fZ2xhbW9yX2NyZWF0ZV9waXhtYXAoU2NyZWVu UHRyIHNjcmVlbiwgaW50IHcsIGludCBoLCBpbnQgZGVwdGgsCiAKIAkJcHJpdi0+Ym8gPSByYWRl b25fYWxsb2NfcGl4bWFwX2JvKHNjcm4sIHcsIGgsIGRlcHRoLCB1c2FnZSwKIAkJCQkJCSAgcGl4 bWFwLT5kcmF3YWJsZS5iaXRzUGVyUGl4ZWwsCi0JCQkJCQkgICZzdHJpZGUsCi0JCQkJCQkgICZw cml2LT5zdXJmYWNlLAorCQkJCQkJICAmc3RyaWRlLCBOVUxMLAogCQkJCQkJICAmcHJpdi0+dGls aW5nX2ZsYWdzKTsKIAkJaWYgKCFwcml2LT5ibykKIAkJCWdvdG8gZmFsbGJhY2tfcHJpdjsKQEAg LTM5MSwxNSArMzkwLDEyIEBAIHJhZGVvbl9nbGFtb3Jfc2V0X3NoYXJlZF9waXhtYXBfYmFja2lu ZyhQaXhtYXBQdHIgcGl4bWFwLCB2b2lkICpoYW5kbGUpCiB7CiAJU2NyZWVuUHRyIHNjcmVlbiA9 IHBpeG1hcC0+ZHJhd2FibGUucFNjcmVlbjsKIAlTY3JuSW5mb1B0ciBzY3JuID0geGY4NlNjcmVl blRvU2NybihzY3JlZW4pOwotCXN0cnVjdCByYWRlb25fc3VyZmFjZSBzdXJmYWNlOwogCXN0cnVj dCByYWRlb25fcGl4bWFwICpwcml2OwogCi0JaWYgKCFyYWRlb25fc2V0X3NoYXJlZF9waXhtYXBf YmFja2luZyhwaXhtYXAsIGhhbmRsZSwgJnN1cmZhY2UpKQorCWlmICghcmFkZW9uX3NldF9zaGFy ZWRfcGl4bWFwX2JhY2tpbmcocGl4bWFwLCBoYW5kbGUsIE5VTEwpKQogCQlyZXR1cm4gRkFMU0U7 CiAKIAlwcml2ID0gcmFkZW9uX2dldF9waXhtYXBfcHJpdmF0ZShwaXhtYXApOwotCXByaXYtPnN1 cmZhY2UgPSBzdXJmYWNlOwotCiAJaWYgKCFyYWRlb25fZ2xhbW9yX2NyZWF0ZV90ZXh0dXJlZF9w aXhtYXAocGl4bWFwLCBwcml2KSkgewogCQl4Zjg2RHJ2TXNnKHNjcm4tPnNjcm5JbmRleCwgWF9F UlJPUiwKIAkJCSAgICJGYWlsZWQgdG8gZ2V0IFBSSU1FIGRyYXdhYmxlIGZvciBnbGFtb3IgcGl4 bWFwLlxuIik7CmRpZmYgLS1naXQgYS9zcmMvcmFkZW9uX2ttcy5jIGIvc3JjL3JhZGVvbl9rbXMu YwppbmRleCA4NjFmYmY5N2MuLjAwNjZjNGU5NiAxMDA2NDQKLS0tIGEvc3JjL3JhZGVvbl9rbXMu YworKysgYi9zcmMvcmFkZW9uX2ttcy5jCkBAIC0zMjYsNyArMzI2LDYgQEAgc3RhdGljIEJvb2wg UkFERU9OQ3JlYXRlU2NyZWVuUmVzb3VyY2VzX0tNUyhTY3JlZW5QdHIgcFNjcmVlbikKICAgICBT Y3JuSW5mb1B0ciBwU2NybiA9IHhmODZTY3JlZW5Ub1Njcm4ocFNjcmVlbik7CiAgICAgUkFERU9O SW5mb1B0ciAgaW5mbyAgID0gUkFERU9OUFRSKHBTY3JuKTsKICAgICBQaXhtYXBQdHIgcGl4bWFw OwotICAgIHN0cnVjdCByYWRlb25fc3VyZmFjZSAqc3VyZmFjZTsKIAogICAgIHBTY3JlZW4tPkNy ZWF0ZVNjcmVlblJlc291cmNlcyA9IGluZm8tPkNyZWF0ZVNjcmVlblJlc291cmNlczsKICAgICBp ZiAoISgqcFNjcmVlbi0+Q3JlYXRlU2NyZWVuUmVzb3VyY2VzKShwU2NyZWVuKSkKQEAgLTM2NCwx MCArMzYzLDkgQEAgc3RhdGljIEJvb2wgUkFERU9OQ3JlYXRlU2NyZWVuUmVzb3VyY2VzX0tNUyhT Y3JlZW5QdHIgcFNjcmVlbikKIAkgICAgUGl4bWFwUHRyIHBQaXggPSBwU2NyZWVuLT5HZXRTY3Jl ZW5QaXhtYXAocFNjcmVlbik7CiAJICAgIGlmICghcmFkZW9uX3NldF9waXhtYXBfYm8ocFBpeCwg aW5mby0+ZnJvbnRfYm8pKQogCQlyZXR1cm4gRkFMU0U7Ci0JICAgIHN1cmZhY2UgPSByYWRlb25f Z2V0X3BpeG1hcF9zdXJmYWNlKHBQaXgpOwotCSAgICBpZiAoc3VyZmFjZSkgewotCQkqc3VyZmFj ZSA9IGluZm8tPmZyb250X3N1cmZhY2U7Ci0JICAgIH0KKworCSAgICBpZiAoaW5mby0+c3VyZl9t YW4gJiYgIWluZm8tPnVzZV9nbGFtb3IpCisJCSpyYWRlb25fZ2V0X3BpeG1hcF9zdXJmYWNlKHBQ aXgpID0gaW5mby0+ZnJvbnRfc3VyZmFjZTsKIAl9CiAgICAgfQogCkBAIC0yNzU4LDcgKzI3NTYs OCBAQCBzdGF0aWMgQm9vbCByYWRlb25fc2V0dXBfa2VybmVsX21lbShTY3JlZW5QdHIgcFNjcmVl bikKIAkJZGVmYXVsdDoKIAkJCWJyZWFrOwogCQl9Ci0JCWluZm8tPmZyb250X3N1cmZhY2UgPSBz dXJmYWNlOworCQlpZiAoIWluZm8tPnVzZV9nbGFtb3IpCisJCSAgICBpbmZvLT5mcm9udF9zdXJm YWNlID0gc3VyZmFjZTsKIAl9CiAgICAgewogCWludCBjdXJzb3Jfc2l6ZTsKLS0gCjIuMTguMAoK X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KYW1kLWdmeCBt YWlsaW5nIGxpc3QKYW1kLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5m cmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9hbWQtZ2Z4Cg==