drm: Branch 'master' - 7 commits
[email protected] (GitLab Mirror) Thu, 25 Apr 2019 10:15:29 +0000 (UTC)
| Newsgroups | gmane.comp.video.dri.patches |
|---|---|
| Message-ID | <[email protected]> |
IEFuZHJvaWQubWsgICAgICAgICAgICAgICAgICAgIHwgICAgNSArKysrKwogYW1kZ3B1L2FtZGdw dV9jcy5jICAgICAgICAgICAgfCAgICA5ICsrKysrKy0tLQogbGliZHJtX21hY3Jvcy5oICAgICAg ICAgICAgICAgfCAgICA0ICstLS0KIG9tYXAvb21hcF9kcm0uYyAgICAgICAgICAgICAgIHwgICAg MiArLQogdGVzdHMva21zL2xpYmttcy10ZXN0LXBsYW5lLmMgfCAgICA0ICsrKy0KIHhmODZkcm0u YyAgICAgICAgICAgICAgICAgICAgIHwgICAgNCArKy0tCiB4Zjg2ZHJtTW9kZS5jICAgICAgICAg ICAgICAgICB8ICAgIDcgKysrKy0tLQogNyBmaWxlcyBjaGFuZ2VkLCAyMiBpbnNlcnRpb25zKCsp LCAxMyBkZWxldGlvbnMoLSkKCk5ldyBjb21taXRzOgpjb21taXQgNmE3ZDEzMjlkYmNjODk4ZjUx MTczODg1ZGIwOGQzNmM4MGJiNWYyMApBdXRob3I6IFNldW5nLVdvbyBLaW0gPHN3MDMxMi5raW1A c2Ftc3VuZy5jb20+CkRhdGU6ICAgVGh1IEFwciAyNSAxODo1MDowMCAyMDE5ICswOTAwCgogICAg dGVzdHMvbGlia21zLXRlc3QtcGxhbmU6IGZpeCBwb3NzYmlsZSBtZW1vcnkgbGVhawogICAgCiAg ICBUaGUgcG9pbnRlciBwIGFxdWlyZWQgd2l0aCBkcm1Nb2RlR2V0UGxhbmUoKSBpcyBub3QgZnJl ZSBpbiBlcnJvcgogICAgcGF0aC4gRml4IHBvc3NpYmxlIG1lbW9yeSBsZWFrIGJ5IGNhbGxpbmcg ZHJtTW9kZUZyZWVQbGFuZSgpIGluCiAgICB0aGUgZXJyb3IgcGF0aC4KICAgIAogICAgUmV2aWV3 ZWQtYnk6IEVtaWwgVmVsaWtvdiA8ZW1pbC52ZWxpa292QGNvbGxhYm9yYS5jb20+CiAgICBTaWdu ZWQtb2ZmLWJ5OiBTZXVuZy1Xb28gS2ltIDxzdzAzMTIua2ltQHNhbXN1bmcuY29tPgoKZGlmZiAt LWdpdCBhL3Rlc3RzL2ttcy9saWJrbXMtdGVzdC1wbGFuZS5jIGIvdGVzdHMva21zL2xpYmttcy10 ZXN0LXBsYW5lLmMKaW5kZXggNmM0MGEzYzkuLjRjYjI3Mzc4IDEwMDY0NAotLS0gYS90ZXN0cy9r bXMvbGlia21zLXRlc3QtcGxhbmUuYworKysgYi90ZXN0cy9rbXMvbGlia21zLXRlc3QtcGxhbmUu YwpAQCAtNTUsOCArNTUsMTAgQEAgc3RhdGljIGludCBrbXNfcGxhbmVfcHJvYmUoc3RydWN0IGtt c19wbGFuZSAqcGxhbmUpCiAJfQogCiAJcGxhbmUtPmZvcm1hdHMgPSBjYWxsb2MocC0+Y291bnRf Zm9ybWF0cywgc2l6ZW9mKHVpbnQzMl90KSk7Ci0JaWYgKCFwbGFuZS0+Zm9ybWF0cykKKwlpZiAo IXBsYW5lLT5mb3JtYXRzKSB7CisJCWRybU1vZGVGcmVlUGxhbmUocCk7CiAJCXJldHVybiAtRU5P TUVNOworCX0KIAogCWZvciAoaSA9IDA7IGkgPCBwLT5jb3VudF9mb3JtYXRzOyBpKyspCiAJCXBs YW5lLT5mb3JtYXRzW2ldID0gcC0+Zm9ybWF0c1tpXTsKY29tbWl0IDM1N2VmNTk4ODI3ZWU5M2Ey MWE4NDEwMDgwZjI1MjhiNmZiMTRhMjYKQXV0aG9yOiBIZW1hbnQgSGFyaXlhbmkgPGhlbWFudGhh cml5YW5pQHRpLmNvbT4KRGF0ZTogICBXZWQgQXByIDI0IDEwOjA4OjQxIDIwMTkgLTA3MDAKCiAg ICBsaWJkcm06IG9tYXA6IEFkZCBEUk1fUkRXUiBmbGFnIHRvIGRtYWJ1ZiBleHBvcnQKICAgIAog ICAgQWxsb3dzIG1tYXAgb24gZG1hYnVmIGZkIHdpdGggTUFQX1NIQVJFRCBhbmQgUFJPVF9XUklU RS4KICAgIAogICAgVGhpcyBmaXhlcyBib290IGZhaWx1cmVzIHdpdGggQW5kcm9pZCAobGlrZWx5 IHcvIGNsb3NlZCBzb3VyY2UKICAgIHVzZXItc3BhY2UgZHJpdmVycykgdGhhdCB3ZXJlIGNhdXNl ZCBkdWUgdG8gbW1hcCgpIHJldHVybmluZwogICAgZXJyb3IuCiAgICAKICAgIENjOiBTZWFuIFBh dWwgPHNlYW5wYXVsQGNocm9taXVtLm9yZz4KICAgIENjOiBBbGlzdGFpciBTdHJhY2hhbiA8YXN0 cmFjaGFuQGdvb2dsZS5jb20+CiAgICBDYzogTWFyaXNzYSBXYWxsIDxtYXJpc3Nhd0Bnb29nbGUu Y29tPgogICAgQWNrZWQtYnk6IEVtaWwgVmVsaWtvdiA8ZW1pbC52ZWxpa292QGNvbGxhYm9yYS5j b20+CiAgICBTaWduZWQtb2ZmLWJ5OiBIZW1hbnQgSGFyaXlhbmkgPGhlbWFudGhhcml5YW5pQHRp LmNvbT4KICAgIFtwaWNrZWQgYW5kIHVwZGF0ZWQgY29tbWl0bXNnIGZyb20gaHR0cDovL2dpdC50 aS5jb20vY2dpdC9jZ2l0LmNnaS9hbmRyb2lkL2V4dGVybmFsLWxpYmRybS5naXQvXQogICAgU2ln bmVkLW9mZi1ieTogUHJhbmVldGggQmFqanVyaSA8cHJhbmVldGhAdGkuY29tPgogICAgU2lnbmVk LW9mZi1ieTogQWxpc3RhaXIgU3RyYWNoYW4gPGFzdHJhY2hhbkBnb29nbGUuY29tPgogICAgW2pz dHVsdHo6IFR3ZWFrZWQgY29tbWl0IG1lc3NhZ2VdCiAgICBTaWduZWQtb2ZmLWJ5OiBKb2huIFN0 dWx0eiA8am9obi5zdHVsdHpAbGluYXJvLm9yZz4KCmRpZmYgLS1naXQgYS9vbWFwL29tYXBfZHJt LmMgYi9vbWFwL29tYXBfZHJtLmMKaW5kZXggM2FlZDRlMGEuLmZmYWNlYTY5IDEwMDY0NAotLS0g YS9vbWFwL29tYXBfZHJtLmMKKysrIGIvb21hcC9vbWFwX2RybS5jCkBAIC00MTQsNyArNDE0LDcg QEAgZHJtX3B1YmxpYyBpbnQgb21hcF9ib19kbWFidWYoc3RydWN0IG9tYXBfYm8gKmJvKQogCWlm IChiby0+ZmQgPCAwKSB7CiAJCXN0cnVjdCBkcm1fcHJpbWVfaGFuZGxlIHJlcSA9IHsKIAkJCQku aGFuZGxlID0gYm8tPmhhbmRsZSwKLQkJCQkuZmxhZ3MgPSBEUk1fQ0xPRVhFQywKKwkJCQkuZmxh Z3MgPSBEUk1fQ0xPRVhFQyB8IERSTV9SRFdSLAogCQl9OwogCQlpbnQgcmV0OwogCmNvbW1pdCA3 NjNmNjQ2ZDdmZWU3YzI0NTc0NjlkNjgxYjk3MDI5ZDRmZDVlOWQ0CkF1dGhvcjogQWRyaWFuIFNh bGlkbyA8c2FsaWRvYUBnb29nbGUuY29tPgpEYXRlOiAgIFdlZCBBcHIgMjQgMTA6MDg6NDAgMjAx OSAtMDcwMAoKICAgIGxpYmRybTogcmVkdWNlIG51bWJlciBvZiByZWFsbG9jYXRpb25zIGluIGRy bU1vZGVBdG9taWNBZGRQcm9wZXJ0eQogICAgCiAgICBXaGVuIGNhbGxpbmcgZHJtTW9kZUF0b21p Y0FkZFByb3BlcnR5IGFsbG9jYXRpb24gb2YgbWVtb3J5CiAgICBoYXBwZW5zIGFzIG5lZWRlZCBp biBpbmNyZW1lbnRzIG9mIDE2IGVsZW1lbnRzLiBUaGlzIGNhbiBiZSB2ZXJ5CiAgICBzbG93IGlm IHRoZXJlIGFyZSBtdWx0aXBsZSBwcm9wZXJ0aWVzIHRvIGJlIHVwZGF0ZWQgaW4gYW4gQXRvbWlj CiAgICBDb21taXQgY2FsbC4KICAgIAogICAgSW5jcmVhc2UgdGhpcyB0byBhcyBtYW55IGFzIGNh biBmaXQgaW4gYSBtZW1vcnkgUEFHRSB0byBhdm9pZAogICAgaGF2aW5nIHRvIHJlYWxsb2NhdGUg bWVtb3J5IHRvbyBvZnRlbi4KICAgIAogICAgQWxzbyB0aGlzIHBhdGNoIGhhcyBhIHNtYWxsIG9u ZSBsaW5lIHBlcmYgdHdlYWsgaW4KICAgIGRybU1vZGVBdG9taWNEdXBsaWNhdGUoKSB0byBvbmx5 IG1lbWNweSBpdGVtcyB0byB0aGUgY3Vyc29yCiAgICBwb3NpdGlvbiBpbiBvcmRlciBhdm9pZCBj b3B5aW5nIHRoZSBlbnRpcmUgaXRlbSBhcnJheSBpZiBpdHMKICAgIG1vc3RseSBlbXB0eS4KICAg IAogICAgQ2M6IFNlYW4gUGF1bCA8c2VhbnBhdWxAY2hyb21pdW0ub3JnPgogICAgQ2M6IEFsaXN0 YWlyIFN0cmFjaGFuIDxhc3RyYWNoYW5AZ29vZ2xlLmNvbT4KICAgIENjOiBNYXJpc3NhIFdhbGwg PG1hcmlzc2F3QGdvb2dsZS5jb20+CiAgICBSZXZpZXdlZC1ieTogQWxleCBEZXVjaGVyIDxhbGV4 YW5kZXIuZGV1Y2hlckBhbWQuY29tPgogICAgUmV2aWV3ZWQtYnk6IEVtaWwgVmVsaWtvdiA8ZW1p bC52ZWxpa292QGNvbGxhYm9yYS5jb20+CiAgICBbanN0dWx0ejogRXhwYW5kZWQgY29tbWl0IG1l c3NhZ2VdCiAgICBTaWduZWQtb2ZmLWJ5OiBKb2huIFN0dWx0eiA8am9obi5zdHVsdHpAbGluYXJv Lm9yZz4KCmRpZmYgLS1naXQgYS94Zjg2ZHJtTW9kZS5jIGIveGY4NmRybU1vZGUuYwppbmRleCA4 Zjg2MzNlZC4uYzg3OGQ5ZWEgMTAwNjQ0Ci0tLSBhL3hmODZkcm1Nb2RlLmMKKysrIGIveGY4NmRy bU1vZGUuYwpAQCAtMTI1OSw3ICsxMjU5LDcgQEAgZHJtX3B1YmxpYyBkcm1Nb2RlQXRvbWljUmVx UHRyIGRybU1vZGVBdG9taWNEdXBsaWNhdGUoZHJtTW9kZUF0b21pY1JlcVB0ciBvbGQpCiAJCQly ZXR1cm4gTlVMTDsKIAkJfQogCQltZW1jcHkobmV3LT5pdGVtcywgb2xkLT5pdGVtcywKLQkJICAg ICAgIG9sZC0+c2l6ZV9pdGVtcyAqIHNpemVvZigqbmV3LT5pdGVtcykpOworCQkgICAgICAgb2xk LT5jdXJzb3IgKiBzaXplb2YoKm5ldy0+aXRlbXMpKTsKIAl9IGVsc2UgewogCQluZXctPml0ZW1z ID0gTlVMTDsKIAl9CkBAIC0xMzIyLDEyICsxMzIyLDEzIEBAIGRybV9wdWJsaWMgaW50IGRybU1v ZGVBdG9taWNBZGRQcm9wZXJ0eShkcm1Nb2RlQXRvbWljUmVxUHRyIHJlcSwKIAkJcmV0dXJuIC1F SU5WQUw7CiAKIAlpZiAocmVxLT5jdXJzb3IgPj0gcmVxLT5zaXplX2l0ZW1zKSB7CisJCWNvbnN0 IHVpbnQzMl90IGl0ZW1fc2l6ZV9pbmMgPSBnZXRwYWdlc2l6ZSgpIC8gc2l6ZW9mKCpyZXEtPml0 ZW1zKTsKIAkJZHJtTW9kZUF0b21pY1JlcUl0ZW1QdHIgbmV3OwogCi0JCXJlcS0+c2l6ZV9pdGVt cyArPSAxNjsKKwkJcmVxLT5zaXplX2l0ZW1zICs9IGl0ZW1fc2l6ZV9pbmM7CiAJCW5ldyA9IHJl YWxsb2MocmVxLT5pdGVtcywgcmVxLT5zaXplX2l0ZW1zICogc2l6ZW9mKCpyZXEtPml0ZW1zKSk7 CiAJCWlmICghbmV3KSB7Ci0JCQlyZXEtPnNpemVfaXRlbXMgLT0gMTY7CisJCQlyZXEtPnNpemVf aXRlbXMgLT0gaXRlbV9zaXplX2luYzsKIAkJCXJldHVybiAtRU5PTUVNOwogCQl9CiAJCXJlcS0+ aXRlbXMgPSBuZXc7CmNvbW1pdCAyMjVkNzNmZDNiZGQ2OGVjOGU0MTA4MWYzNDEwOWUyODE0Yzdh YWJhCkF1dGhvcjogUHJhYmhhbmphbiBLYW5kdWxhIDxwa2FuZHVsYUBjb2RlYXVyb3JhLm9yZz4K RGF0ZTogICBXZWQgQXByIDI0IDEwOjA4OjM5IDIwMTkgLTA3MDAKCiAgICBsaWJkcm06IEF2b2lk IGFkZGl0aW9uYWwgZHJtIG9wZW4gY2xvc2UKICAgIAogICAgQXZvaWQgYWRkaXRpb25hbCBkcm0g ZGV2aWNlIG9wZW4gYW5kIGNsb3NlLgogICAgCiAgICBDYzogU2VhbiBQYXVsIDxzZWFucGF1bEBj aHJvbWl1bS5vcmc+CiAgICBDYzogQWxpc3RhaXIgU3RyYWNoYW4gPGFzdHJhY2hhbkBnb29nbGUu Y29tPgogICAgQ2M6IE1hcmlzc2EgV2FsbCA8bWFyaXNzYXdAZ29vZ2xlLmNvbT4KICAgIFJldmll d2VkLWJ5OiBBbGV4IERldWNoZXIgPGFsZXhhbmRlci5kZXVjaGVyQGFtZC5jb20+CiAgICBSZXZp ZXdlZC1ieTogRW1pbCBWZWxpa292IDxlbWlsLnZlbGlrb3ZAY29sbGFib3JhLmNvbT4KICAgIFNp Z25lZC1vZmYtYnk6IEpvaG4gU3R1bHR6IDxqb2huLnN0dWx0ekBsaW5hcm8ub3JnPgoKZGlmZiAt LWdpdCBhL3hmODZkcm0uYyBiL3hmODZkcm0uYwppbmRleCBmZTgyMmNhZC4uMmMxOTM3NmIgMTAw NjQ0Ci0tLSBhL3hmODZkcm0uYworKysgYi94Zjg2ZHJtLmMKQEAgLTc1MCw4ICs3NTAsOCBAQCBk cm1fcHVibGljIGludCBkcm1PcGVuKGNvbnN0IGNoYXIgKm5hbWUsIGNvbnN0IGNoYXIgKmJ1c2lk KQogICovCiBkcm1fcHVibGljIGludCBkcm1PcGVuV2l0aFR5cGUoY29uc3QgY2hhciAqbmFtZSwg Y29uc3QgY2hhciAqYnVzaWQsIGludCB0eXBlKQogewotICAgIGlmICghZHJtQXZhaWxhYmxlKCkg JiYgbmFtZSAhPSBOVUxMICYmIGRybV9zZXJ2ZXJfaW5mbyAmJgotICAgICAgICBkcm1fc2VydmVy X2luZm8tPmxvYWRfbW9kdWxlKSB7CisgICAgaWYgKG5hbWUgIT0gTlVMTCAmJiBkcm1fc2VydmVy X2luZm8gJiYKKyAgICAgICAgZHJtX3NlcnZlcl9pbmZvLT5sb2FkX21vZHVsZSAmJiAhZHJtQXZh aWxhYmxlKCkpIHsKICAgICAgICAgLyogdHJ5IHRvIGxvYWQgdGhlIGtlcm5lbCBtb2R1bGUgKi8K ICAgICAgICAgaWYgKCFkcm1fc2VydmVyX2luZm8tPmxvYWRfbW9kdWxlKG5hbWUpKSB7CiAgICAg ICAgICAgICBkcm1Nc2coIltkcm1dIGZhaWxlZCB0byBsb2FkIGtlcm5lbCBtb2R1bGUgXCIlc1wi XG4iLCBuYW1lKTsKY29tbWl0IDUxNTUzZGQwZTA2M2NiMmQyN2FkMWM2ODc0NmMyNDdjYjZkYmQ1 MTgKQXV0aG9yOiBKb2huIFN0dWx0eiA8am9obi5zdHVsdHpAbGluYXJvLm9yZz4KRGF0ZTogICBX ZWQgQXByIDI0IDEwOjA4OjM4IDIwMTkgLTA3MDAKCiAgICBsaWJkcm06IGFtZGdwdTogSW5pdGlh bGl6ZSB1bmlvbnMgd2l0aCBtZW1zZXQgcmF0aGVyIHRoYW4gIj0gezB9IgogICAgCiAgICBDbGFu ZyBjb21wbGFpbnMgd2hlbiBpbml0aWFsaXppbmcgdW5pb25zIHVzaW5nICI9IHswfSIKICAgIHNv IGluc3RlYWQgdXNlIG1lbXNldC4KICAgIAogICAgQ2M6IFNlYW4gUGF1bCA8c2VhbnBhdWxAY2hy b21pdW0ub3JnPgogICAgQ2M6IEFsaXN0YWlyIFN0cmFjaGFuIDxhc3RyYWNoYW5AZ29vZ2xlLmNv bT4KICAgIENjOiBNYXJpc3NhIFdhbGwgPG1hcmlzc2F3QGdvb2dsZS5jb20+CiAgICBSZXZpZXdl ZC1ieTogQWxleCBEZXVjaGVyIDxhbGV4YW5kZXIuZGV1Y2hlckBhbWQuY29tPgogICAgUmV2aWV3 ZWQtYnk6IEVtaWwgVmVsaWtvdiA8ZW1pbC52ZWxpa292QGNvbGxhYm9yYS5jb20+CiAgICBSZXZp ZXdlZC1ieTogQ2hyaXN0aWFuIEvDtm5pZyA8Y2hyaXN0aWFuLmtvZW5pZ0BhbWQuY29tPgogICAg U2lnbmVkLW9mZi1ieTogSm9obiBTdHVsdHogPGpvaG4uc3R1bHR6QGxpbmFyby5vcmc+CgpkaWZm IC0tZ2l0IGEvYW1kZ3B1L2FtZGdwdV9jcy5jIGIvYW1kZ3B1L2FtZGdwdV9jcy5jCmluZGV4IDdl ZTg0NGZiLi43YzViOWQxMyAxMDA2NDQKLS0tIGEvYW1kZ3B1L2FtZGdwdV9jcy5jCisrKyBiL2Ft ZGdwdS9hbWRncHVfY3MuYwpAQCAtNzMzLDEyICs3MzMsMTMgQEAgZHJtX3B1YmxpYyBpbnQgYW1k Z3B1X2NzX3N1Ym1pdF9yYXcoYW1kZ3B1X2RldmljZV9oYW5kbGUgZGV2LAogCQkJCSAgICBzdHJ1 Y3QgZHJtX2FtZGdwdV9jc19jaHVuayAqY2h1bmtzLAogCQkJCSAgICB1aW50NjRfdCAqc2VxX25v KQogewotCXVuaW9uIGRybV9hbWRncHVfY3MgY3MgPSB7MH07CisJdW5pb24gZHJtX2FtZGdwdV9j cyBjczsKIAl1aW50NjRfdCAqY2h1bmtfYXJyYXk7CiAJaW50IGksIHI7CiAJaWYgKG51bV9jaHVu a3MgPT0gMCkKIAkJcmV0dXJuIC1FSU5WQUw7CiAKKwltZW1zZXQoJmNzLCAwLCBzaXplb2YoY3Mp KTsKIAljaHVua19hcnJheSA9IGFsbG9jYShzaXplb2YodWludDY0X3QpICogbnVtX2NodW5rcyk7 CiAJZm9yIChpID0gMDsgaSA8IG51bV9jaHVua3M7IGkrKykKIAkJY2h1bmtfYXJyYXlbaV0gPSAo dWludDY0X3QpKHVpbnRwdHJfdCkmY2h1bmtzW2ldOwpAQCAtNzYzLDEwICs3NjQsMTEgQEAgZHJt X3B1YmxpYyBpbnQgYW1kZ3B1X2NzX3N1Ym1pdF9yYXcyKGFtZGdwdV9kZXZpY2VfaGFuZGxlIGRl diwKIAkJCQkgICAgIHN0cnVjdCBkcm1fYW1kZ3B1X2NzX2NodW5rICpjaHVua3MsCiAJCQkJICAg ICB1aW50NjRfdCAqc2VxX25vKQogewotCXVuaW9uIGRybV9hbWRncHVfY3MgY3MgPSB7MH07CisJ dW5pb24gZHJtX2FtZGdwdV9jcyBjczsKIAl1aW50NjRfdCAqY2h1bmtfYXJyYXk7CiAJaW50IGks IHI7CiAKKwltZW1zZXQoJmNzLCAwLCBzaXplb2YoY3MpKTsKIAljaHVua19hcnJheSA9IGFsbG9j YShzaXplb2YodWludDY0X3QpICogbnVtX2NodW5rcyk7CiAJZm9yIChpID0gMDsgaSA8IG51bV9j aHVua3M7IGkrKykKIAkJY2h1bmtfYXJyYXlbaV0gPSAodWludDY0X3QpKHVpbnRwdHJfdCkmY2h1 bmtzW2ldOwpAQCAtODAzLDkgKzgwNSwxMCBAQCBkcm1fcHVibGljIGludCBhbWRncHVfY3NfZmVu Y2VfdG9faGFuZGxlKGFtZGdwdV9kZXZpY2VfaGFuZGxlIGRldiwKIAkJCQkJIHVpbnQzMl90IHdo YXQsCiAJCQkJCSB1aW50MzJfdCAqb3V0X2hhbmRsZSkKIHsKLQl1bmlvbiBkcm1fYW1kZ3B1X2Zl bmNlX3RvX2hhbmRsZSBmdGggPSB7MH07CisJdW5pb24gZHJtX2FtZGdwdV9mZW5jZV90b19oYW5k bGUgZnRoOwogCWludCByOwogCisJbWVtc2V0KCZmdGgsIDAsIHNpemVvZihmdGgpKTsKIAlmdGgu aW4uZmVuY2UuY3R4X2lkID0gZmVuY2UtPmNvbnRleHQtPmlkOwogCWZ0aC5pbi5mZW5jZS5pcF90 eXBlID0gZmVuY2UtPmlwX3R5cGU7CiAJZnRoLmluLmZlbmNlLmlwX2luc3RhbmNlID0gZmVuY2Ut PmlwX2luc3RhbmNlOwpjb21taXQgZWJiYjhmOWNiZmMzYjUxZDUyZTZmZTNiMTQ2ZWE4MjQwMzBl YjQ4YQpBdXRob3I6IFNlYW4gUGF1bCA8c2VhbnBhdWxAY2hyb21pdW0ub3JnPgpEYXRlOiAgIFdl ZCBBcHIgMjQgMTA6MDg6MzYgMjAxOSAtMDcwMAoKICAgIGxpYmRybTogVXNlIG1tYXA2NCBpbnN0 ZWFkIG9mIF9fbW1hcDIKICAgIAogICAgX19tbWFwMiBpc24ndCBzdXBwb3J0ZWQgb24gYWxsIHBs YXRmb3JtcywgbW1hcDY0IGlzIHRoZSByaWdodCB3YXkKICAgIHRvIGRvIHRoaXMgaW4gYW5kcm9p ZC4KICAgIAogICAgQWxzbyBmb2xkcyBpbiBhIGZpeCBmcm9tIFN0w6lwaGFuZSBNYXJjaGVzaW4g PG1hcmNoZXVAY2hyb21pdW0ub3JnPgogICAgCiAgICBDYzogU2VhbiBQYXVsIDxzZWFucGF1bEBj aHJvbWl1bS5vcmc+CiAgICBDYzogQWxpc3RhaXIgU3RyYWNoYW4gPGFzdHJhY2hhbkBnb29nbGUu Y29tPgogICAgQ2M6IE1hcmlzc2EgV2FsbCA8bWFyaXNzYXdAZ29vZ2xlLmNvbT4KICAgIEFja2Vk LWJ5OiBBbGV4IERldWNoZXIgPGFsZXhhbmRlci5kZXVjaGVyQGFtZC5jb20+CiAgICBSZXZpZXdl ZC1ieTogRW1pbCBWZWxpa292IDxlbWlsLnZlbGlrb3ZAY29sbGFib3JhLmNvbT4KICAgIFNpZ25l ZC1vZmYtYnk6IFNlYW4gUGF1bCA8c2VhbnBhdWxAY2hyb21pdW0ub3JnPgogICAgW2pzdHVsdHo6 IEZvbGRlZCBpbiBTdMOpcGhhbmUncyBmaXhdCiAgICBTaWduZWQtb2ZmLWJ5OiBKb2huIFN0dWx0 eiA8am9obi5zdHVsdHpAbGluYXJvLm9yZz4KCmRpZmYgLS1naXQgYS9saWJkcm1fbWFjcm9zLmgg Yi9saWJkcm1fbWFjcm9zLmgKaW5kZXggOTVmMGVmNTUuLjBkY2E4MjczIDEwMDY0NAotLS0gYS9s aWJkcm1fbWFjcm9zLmgKKysrIGIvbGliZHJtX21hY3Jvcy5oCkBAIC00OCw4ICs0OCw2IEBACiAj aWYgZGVmaW5lZChBTkRST0lEKSAmJiAhZGVmaW5lZChfX0xQNjRfXykKICNpbmNsdWRlIDxlcnJu by5oPiAvKiBmb3IgRUlOVkFMICovCiAKLWV4dGVybiB2b2lkICpfX21tYXAyKHZvaWQgKiwgc2l6 ZV90LCBpbnQsIGludCwgaW50LCBzaXplX3QpOwotCiBzdGF0aWMgaW5saW5lIHZvaWQgKmRybV9t bWFwKHZvaWQgKmFkZHIsIHNpemVfdCBsZW5ndGgsIGludCBwcm90LCBpbnQgZmxhZ3MsCiAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIGludCBmZCwgbG9mZl90IG9mZnNldCkKIHsKQEAgLTU5 LDcgKzU3LDcgQEAgc3RhdGljIGlubGluZSB2b2lkICpkcm1fbW1hcCh2b2lkICphZGRyLCBzaXpl X3QgbGVuZ3RoLCBpbnQgcHJvdCwgaW50IGZsYWdzLAogICAgICAgcmV0dXJuIE1BUF9GQUlMRUQ7 CiAgICB9CiAKLSAgIHJldHVybiBfX21tYXAyKGFkZHIsIGxlbmd0aCwgcHJvdCwgZmxhZ3MsIGZk LCAoc2l6ZV90KSAob2Zmc2V0ID4+IDEyKSk7CisgICByZXR1cm4gbW1hcDY0KGFkZHIsIGxlbmd0 aCwgcHJvdCwgZmxhZ3MsIGZkLCBvZmZzZXQpOwogfQogCiAjICBkZWZpbmUgZHJtX211bm1hcChh ZGRyLCBsZW5ndGgpIFwKY29tbWl0IDgxODAzM2RlZmYyYmExYTNlZDRlMzliM2Y0YTBjMmYxZGE5 YjIzZWIKQXV0aG9yOiBKb2huIFN0dWx0eiA8am9obi5zdHVsdHpAbGluYXJvLm9yZz4KRGF0ZTog ICBXZWQgQXByIDI0IDEwOjA4OjM3IDIwMTkgLTA3MDAKCiAgICBsaWJkcm06IEFuZHJvaWQubWs6 IEFkZCBtaW5pbWFsIEFuZHJvaWQgcGxhdGZvcm0gY2hlY2sKICAgIAogICAgQWRkIGEgY2hlY2sg dG8gZXJyb3Igb3V0IG9uIEFuZHJvaWQgdmVyc2lvbiBLKDQuNCkgb3IKICAgIGxvd2VyLgogICAg CiAgICBUaGlzIGlzIGR1ZSB0byBkZXBlbmRlbmN5IGFkZGVkIGluIGEgcHJldmlvdXMgY29tbWl0 IG9uIG1tYXA2NCwKICAgIHdoaWNoIHdhcyBpbnRyb2R1Y2VkIHdpdGggQW5kcm9pZCBMLgogICAg CiAgICBDYzogU2VhbiBQYXVsIDxzZWFucGF1bEBjaHJvbWl1bS5vcmc+CiAgICBDYzogQWxpc3Rh aXIgU3RyYWNoYW4gPGFzdHJhY2hhbkBnb29nbGUuY29tPgogICAgQ2M6IE1hcmlzc2EgV2FsbCA8 bWFyaXNzYXdAZ29vZ2xlLmNvbT4KICAgIFN1Z2dlc3RlZC1ieTogRW1pbCBWZWxpa292IDxlbWls LnZlbGlrb3ZAY29sbGFib3JhLmNvbT4KICAgIFJldmlld2VkLWJ5OiBFbWlsIFZlbGlrb3YgPGVt aWwudmVsaWtvdkBjb2xsYWJvcmEuY29tPgogICAgU2lnbmVkLW9mZi1ieTogSm9obiBTdHVsdHog PGpvaG4uc3R1bHR6QGxpbmFyby5vcmc+CgpkaWZmIC0tZ2l0IGEvQW5kcm9pZC5tayBiL0FuZHJv aWQubWsKaW5kZXggMWI3N2M1MzguLjBhYjZmMGY5IDEwMDY0NAotLS0gYS9BbmRyb2lkLm1rCisr KyBiL0FuZHJvaWQubWsKQEAgLTIxLDYgKzIxLDExIEBACiAjIElOIFRIRSBTT0ZUV0FSRS4KICMK IAorTElCRFJNX0FORFJPSURfTUFKT1JfVkVSU0lPTiA6PSAkKHdvcmQgMSwgJChzdWJzdCAuLCAs ICQoUExBVEZPUk1fVkVSU0lPTikpKQoraWZuZXEgKCQoZmlsdGVyIDIgNCwgJChMSUJEUk1fQU5E Uk9JRF9NQUpPUl9WRVJTSU9OKSksKQorJChlcnJvciAiQW5kcm9pZCA0LjQgYW5kIGVhcmxpZXIg bm90IHN1cHBvcnRlZCIpCitlbmRpZgorCiBMSUJEUk1fQ09NTU9OX01LIDo9ICQoY2FsbCBteS1k aXIpL0FuZHJvaWQuY29tbW9uLm1rCiAKIExPQ0FMX1BBVEggOj0gJChjYWxsIG15LWRpcikKCgot LQpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpEcmktcGF0 Y2hlcyBtYWlsaW5nIGxpc3QKRHJpLXBhdGNoZXNAbGlzdHMuc291cmNlZm9yZ2UubmV0Cmh0dHBz Oi8vbGlzdHMuc291cmNlZm9yZ2UubmV0L2xpc3RzL2xpc3RpbmZvL2RyaS1wYXRjaGVzCg==