From: =?UTF-8?q?Michel=20D=C3=A4nzer?= Subject: [PATCH xf86-video-amdgpu] Use DRM_MODE_PAGE_FLIP_TARGET_ABSOLUTE/RELATIVE flags when available Date: Fri, 25 Nov 2016 18:41:17 +0900 Message-ID: <20161125094117.26511-1-michel@daenzer.net> References: <20161122075819.27641-1-michel@daenzer.net> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20161122075819.27641-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+CgooUG9ydGVkIGZy b20gcmFkZW9uIGNvbW1pdHMgMTEwNmIyZjc3M2FkMDYxMWM3MjliMjdmNGMxOTJhMjZiNDNlZjFl NwphbmQgNWZlYTVlZjJmMDdlZWU0YTBmOTRiYWFiNDI3MDEwYjkzNmYxZDRiNCkKCnYyOgoqIFNx dWFzaCBpbiByYWRlb24gZml4IGZvciBUZWFyRnJlZSByZWdyZXNzaW9uCiogUmVtb3ZlIHByZXBy b2Nlc3NvciBndWFyZHMgZm9yIGNvbXBhdGliaWxpdHkgd2l0aCBsaWJkcm0gPCAyLjQuNzIKICAo RW1pbCBWZWxpa292KQoKU2lnbmVkLW9mZi1ieTogTWljaGVsIETDpG56ZXIgPG1pY2hlbC5kYWVu emVyQGFtZC5jb20+Ci0tLQogc3JjL2FtZGdwdV9kcmkyLmMgICAgIHwgIDMgKy0KIHNyYy9hbWRn cHVfa21zLmMgICAgICB8IDE4ICsrKysrLS0tLS0tCiBzcmMvYW1kZ3B1X3ByZXNlbnQuYyAgfCAg NSArLS0KIHNyYy9hbWRncHVfcHJvYmUuaCAgICB8ICAxICsKIHNyYy9kcm1tb2RlX2Rpc3BsYXku YyB8IDg5ICsrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrLS0tLS0t LQogc3JjL2RybW1vZGVfZGlzcGxheS5oIHwgMTMgKysrKysrKy0KIDYgZmlsZXMgY2hhbmdlZCwg MTA0IGluc2VydGlvbnMoKyksIDI1IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL3NyYy9hbWRn cHVfZHJpMi5jIGIvc3JjL2FtZGdwdV9kcmkyLmMKaW5kZXggMzFhYzNmMy4uYzNhMTEyZCAxMDA2 NDQKLS0tIGEvc3JjL2FtZGdwdV9kcmkyLmMKKysrIGIvc3JjL2FtZGdwdV9kcmkyLmMKQEAgLTU2 Myw3ICs1NjMsOCBAQCBhbWRncHVfZHJpMl9zY2hlZHVsZV9mbGlwKHhmODZDcnRjUHRyIGNydGMs IENsaWVudFB0ciBjbGllbnQsCiAJCQkgICAgICAgQU1ER1BVX0RSTV9RVUVVRV9JRF9ERUZBVUxU LCBmbGlwX2luZm8sCiAJCQkgICAgICAgcmVmX2NydGNfaHdfaWQsCiAJCQkgICAgICAgYW1kZ3B1 X2RyaTJfZmxpcF9ldmVudF9oYW5kbGVyLAotCQkJICAgICAgIGFtZGdwdV9kcmkyX2ZsaXBfZXZl bnRfYWJvcnQsIEZMSVBfVlNZTkMpKSB7CisJCQkgICAgICAgYW1kZ3B1X2RyaTJfZmxpcF9ldmVu dF9hYm9ydCwgRkxJUF9WU1lOQywKKwkJCSAgICAgICB0YXJnZXRfbXNjIC0gYW1kZ3B1X2dldF9t c2NfZGVsdGEoZHJhdywgY3J0YykpKSB7CiAJCWluZm8tPmRybW1vZGUuZHJpMl9mbGlwcGluZyA9 IFRSVUU7CiAJCXJldHVybiBUUlVFOwogCX0KZGlmZiAtLWdpdCBhL3NyYy9hbWRncHVfa21zLmMg Yi9zcmMvYW1kZ3B1X2ttcy5jCmluZGV4IDMxOWI1NzIuLmNhZGQ5MjggMTAwNjQ0Ci0tLSBhL3Ny Yy9hbWRncHVfa21zLmMKKysrIGIvc3JjL2FtZGdwdV9rbXMuYwpAQCAtNzAxLDkgKzcwMSw5IEBA IGFtZGdwdV9wcmltZV9zY2Fub3V0X2ZsaXAoUGl4bWFwRGlydHlVcGRhdGVQdHIgZW50KQogCQly ZXR1cm47CiAJfQogCi0JaWYgKGRybU1vZGVQYWdlRmxpcChwQU1ER1BVRW50LT5mZCwgZHJtbW9k ZV9jcnRjLT5tb2RlX2NydGMtPmNydGNfaWQsCi0JCQkgICAgZHJtbW9kZV9jcnRjLT5zY2Fub3V0 W3NjYW5vdXRfaWRdLmZiX2lkLAotCQkJICAgIERSTV9NT0RFX1BBR0VfRkxJUF9FVkVOVCwgKHZv aWQqKWRybV9xdWV1ZV9zZXEpKSB7CisJaWYgKGRybW1vZGVfcGFnZV9mbGlwX3RhcmdldF9yZWxh dGl2ZShwQU1ER1BVRW50LCBkcm1tb2RlX2NydGMsCisJCQkJCSAgICAgIGRybW1vZGVfY3J0Yy0+ c2Nhbm91dFtzY2Fub3V0X2lkXS5mYl9pZCwKKwkJCQkJICAgICAgMCwgZHJtX3F1ZXVlX3NlcSwg MCkgIT0gMCkgewogCQl4Zjg2RHJ2TXNnKHNjcm4tPnNjcm5JbmRleCwgWF9XQVJOSU5HLCAiZmxp cCBxdWV1ZSBmYWlsZWQgaW4gJXM6ICVzXG4iLAogCQkJICAgX19mdW5jX18sIHN0cmVycm9yKGVy cm5vKSk7CiAJCXJldHVybjsKQEAgLTk0OSw4ICs5NDksOCBAQCBhbWRncHVfc2Nhbm91dF9mbGlw KFNjcmVlblB0ciBwU2NyZWVuLCBBTURHUFVJbmZvUHRyIGluZm8sCiAJCQkJCXhmODZDcnRjUHRy IHhmODZfY3J0YykKIHsKIAlkcm1tb2RlX2NydGNfcHJpdmF0ZV9wdHIgZHJtbW9kZV9jcnRjID0g eGY4Nl9jcnRjLT5kcml2ZXJfcHJpdmF0ZTsKLQlTY3JuSW5mb1B0ciBzY3JuOwotCUFNREdQVUVu dFB0ciBwQU1ER1BVRW50OworCVNjcm5JbmZvUHRyIHNjcm4gPSB4Zjg2X2NydGMtPnNjcm47CisJ QU1ER1BVRW50UHRyIHBBTURHUFVFbnQgPSBBTURHUFVFbnRQcml2KHNjcm4pOwogCXVpbnRwdHJf dCBkcm1fcXVldWVfc2VxOwogCXVuc2lnbmVkIHNjYW5vdXRfaWQ7CiAKQEAgLTk2MSw3ICs5NjEs NiBAQCBhbWRncHVfc2Nhbm91dF9mbGlwKFNjcmVlblB0ciBwU2NyZWVuLCBBTURHUFVJbmZvUHRy IGluZm8sCiAJaWYgKCFhbWRncHVfc2Nhbm91dF9kb191cGRhdGUoeGY4Nl9jcnRjLCBzY2Fub3V0 X2lkKSkKIAkJcmV0dXJuOwogCi0Jc2NybiA9IHhmODZfY3J0Yy0+c2NybjsKIAlkcm1fcXVldWVf c2VxID0gYW1kZ3B1X2RybV9xdWV1ZV9hbGxvYyh4Zjg2X2NydGMsCiAJCQkJCSAgICAgICBBTURH UFVfRFJNX1FVRVVFX0NMSUVOVF9ERUZBVUxULAogCQkJCQkgICAgICAgQU1ER1BVX0RSTV9RVUVV RV9JRF9ERUZBVUxULApAQCAtOTczLDEwICs5NzIsOSBAQCBhbWRncHVfc2Nhbm91dF9mbGlwKFNj cmVlblB0ciBwU2NyZWVuLCBBTURHUFVJbmZvUHRyIGluZm8sCiAJCXJldHVybjsKIAl9CiAKLQlw QU1ER1BVRW50ID0gQU1ER1BVRW50UHJpdihzY3JuKTsKLQlpZiAoZHJtTW9kZVBhZ2VGbGlwKHBB TURHUFVFbnQtPmZkLCBkcm1tb2RlX2NydGMtPm1vZGVfY3J0Yy0+Y3J0Y19pZCwKLQkJCSAgICBk cm1tb2RlX2NydGMtPnNjYW5vdXRbc2Nhbm91dF9pZF0uZmJfaWQsCi0JCQkgICAgRFJNX01PREVf UEFHRV9GTElQX0VWRU5ULCAodm9pZCopZHJtX3F1ZXVlX3NlcSkpIHsKKwlpZiAoZHJtbW9kZV9w YWdlX2ZsaXBfdGFyZ2V0X3JlbGF0aXZlKHBBTURHUFVFbnQsIGRybW1vZGVfY3J0YywKKwkJCQkJ ICAgICAgZHJtbW9kZV9jcnRjLT5zY2Fub3V0W3NjYW5vdXRfaWRdLmZiX2lkLAorCQkJCQkgICAg ICAwLCBkcm1fcXVldWVfc2VxLCAwKSAhPSAwKSB7CiAJCXhmODZEcnZNc2coc2Nybi0+c2Nybklu ZGV4LCBYX1dBUk5JTkcsICJmbGlwIHF1ZXVlIGZhaWxlZCBpbiAlczogJXNcbiIsCiAJCQkgICBf X2Z1bmNfXywgc3RyZXJyb3IoZXJybm8pKTsKIAkJcmV0dXJuOwpkaWZmIC0tZ2l0IGEvc3JjL2Ft ZGdwdV9wcmVzZW50LmMgYi9zcmMvYW1kZ3B1X3ByZXNlbnQuYwppbmRleCBkY2IxOGRhLi4zNjQ2 MTkwIDEwMDY0NAotLS0gYS9zcmMvYW1kZ3B1X3ByZXNlbnQuYworKysgYi9zcmMvYW1kZ3B1X3By ZXNlbnQuYwpAQCAtMzI5LDcgKzMyOSw4IEBAIGFtZGdwdV9wcmVzZW50X2ZsaXAoUlJDcnRjUHRy IGNydGMsIHVpbnQ2NF90IGV2ZW50X2lkLCB1aW50NjRfdCB0YXJnZXRfbXNjLAogCQkJCSBwaXht YXAsIGV2ZW50X2lkLCBldmVudCwgY3J0Y19pZCwKIAkJCQkgYW1kZ3B1X3ByZXNlbnRfZmxpcF9l dmVudCwKIAkJCQkgYW1kZ3B1X3ByZXNlbnRfZmxpcF9hYm9ydCwKLQkJCQkgc3luY19mbGlwID8g RkxJUF9WU1lOQyA6IEZMSVBfQVNZTkMpOworCQkJCSBzeW5jX2ZsaXAgPyBGTElQX1ZTWU5DIDog RkxJUF9BU1lOQywKKwkJCQkgdGFyZ2V0X21zYyk7CiAJaWYgKCFyZXQpCiAJCXhmODZEcnZNc2co c2Nybi0+c2NybkluZGV4LCBYX0VSUk9SLCAicHJlc2VudCBmbGlwIGZhaWxlZFxuIik7CiAJZWxz ZQpAQCAtMzY2LDcgKzM2Nyw3IEBAIGFtZGdwdV9wcmVzZW50X3VuZmxpcChTY3JlZW5QdHIgc2Ny ZWVuLCB1aW50NjRfdCBldmVudF9pZCkKIAogCWlmIChhbWRncHVfZG9fcGFnZWZsaXAoc2Nybiwg QU1ER1BVX0RSTV9RVUVVRV9DTElFTlRfREVGQVVMVCwgcGl4bWFwLAogCQkJICAgICAgIGV2ZW50 X2lkLCBldmVudCwgLTEsIGFtZGdwdV9wcmVzZW50X2ZsaXBfZXZlbnQsCi0JCQkgICAgICAgYW1k Z3B1X3ByZXNlbnRfZmxpcF9hYm9ydCwgRkxJUF9WU1lOQykpCisJCQkgICAgICAgYW1kZ3B1X3By ZXNlbnRfZmxpcF9hYm9ydCwgRkxJUF9WU1lOQywgMCkpCiAJCXJldHVybjsKIAogbW9kZXNldDoK ZGlmZiAtLWdpdCBhL3NyYy9hbWRncHVfcHJvYmUuaCBiL3NyYy9hbWRncHVfcHJvYmUuaAppbmRl eCAxZWMxMjk5Li4wMzAyZDAyIDEwMDY0NAotLS0gYS9zcmMvYW1kZ3B1X3Byb2JlLmgKKysrIGIv c3JjL2FtZGdwdV9wcm9iZS5oCkBAIC01Niw2ICs1Niw3IEBAIGV4dGVybiBEcml2ZXJSZWMgQU1E R1BVOwogCiB0eXBlZGVmIHN0cnVjdCB7CiAJQm9vbCBIYXNDUlRDMjsJCS8qIEFsbCBjYXJkcyBl eGNlcHQgb3JpZ2luYWwgUmFkZW9uICAqLworCUJvb2wgaGFzX3BhZ2VfZmxpcF90YXJnZXQ7CiAK IAlhbWRncHVfZGV2aWNlX2hhbmRsZSBwRGV2OwogCmRpZmYgLS1naXQgYS9zcmMvZHJtbW9kZV9k aXNwbGF5LmMgYi9zcmMvZHJtbW9kZV9kaXNwbGF5LmMKaW5kZXggYTc1Y2M1Yy4uOGNlZGM1ZiAx MDA2NDQKLS0tIGEvc3JjL2RybW1vZGVfZGlzcGxheS5jCisrKyBiL3NyYy9kcm1tb2RlX2Rpc3Bs YXkuYwpAQCAtMjEzMiw2ICsyMTMyLDU5IEBAIHN0YXRpYyB2b2lkIGRybV93YWtldXBfaGFuZGxl cihwb2ludGVyIGRhdGEsIGludCBlcnIsIHBvaW50ZXIgcCkKIH0KICNlbmRpZgogCitzdGF0aWMg Qm9vbCBkcm1tb2RlX3Byb2JlX3BhZ2VfZmxpcF90YXJnZXQoQU1ER1BVRW50UHRyIHBBTURHUFVF bnQpCit7CisJdWludDY0X3QgY2FwX3ZhbHVlOworCisJcmV0dXJuIGRybUdldENhcChwQU1ER1BV RW50LT5mZCwgRFJNX0NBUF9QQUdFX0ZMSVBfVEFSR0VULAorCQkJICZjYXBfdmFsdWUpID09IDAg JiYgY2FwX3ZhbHVlICE9IDA7Cit9CisKK3N0YXRpYyBpbnQKK2RybW1vZGVfcGFnZV9mbGlwKEFN REdQVUVudFB0ciBwQU1ER1BVRW50LCBkcm1tb2RlX2NydGNfcHJpdmF0ZV9wdHIgZHJtbW9kZV9j cnRjLAorCQkgIGludCBmYl9pZCwgdWludDMyX3QgZmxhZ3MsIHVpbnRwdHJfdCBkcm1fcXVldWVf c2VxKQoreworCWZsYWdzIHw9IERSTV9NT0RFX1BBR0VfRkxJUF9FVkVOVDsKKwlyZXR1cm4gZHJt TW9kZVBhZ2VGbGlwKHBBTURHUFVFbnQtPmZkLCBkcm1tb2RlX2NydGMtPm1vZGVfY3J0Yy0+Y3J0 Y19pZCwKKwkJCSAgICAgICBmYl9pZCwgZmxhZ3MsICh2b2lkKilkcm1fcXVldWVfc2VxKTsKK30K KworaW50Citkcm1tb2RlX3BhZ2VfZmxpcF90YXJnZXRfYWJzb2x1dGUoQU1ER1BVRW50UHRyIHBB TURHUFVFbnQsCisJCQkJICBkcm1tb2RlX2NydGNfcHJpdmF0ZV9wdHIgZHJtbW9kZV9jcnRjLAor CQkJCSAgaW50IGZiX2lkLCB1aW50MzJfdCBmbGFncywKKwkJCQkgIHVpbnRwdHJfdCBkcm1fcXVl dWVfc2VxLCB1aW50MzJfdCB0YXJnZXRfbXNjKQoreworCWlmIChwQU1ER1BVRW50LT5oYXNfcGFn ZV9mbGlwX3RhcmdldCkgeworCQlmbGFncyB8PSBEUk1fTU9ERV9QQUdFX0ZMSVBfRVZFTlQgfCBE Uk1fTU9ERV9QQUdFX0ZMSVBfVEFSR0VUX0FCU09MVVRFOworCQlyZXR1cm4gZHJtTW9kZVBhZ2VG bGlwVGFyZ2V0KHBBTURHUFVFbnQtPmZkLAorCQkJCQkgICAgIGRybW1vZGVfY3J0Yy0+bW9kZV9j cnRjLT5jcnRjX2lkLAorCQkJCQkgICAgIGZiX2lkLCBmbGFncywgKHZvaWQqKWRybV9xdWV1ZV9z ZXEsCisJCQkJCSAgICAgdGFyZ2V0X21zYyk7CisJfQorCisJcmV0dXJuIGRybW1vZGVfcGFnZV9m bGlwKHBBTURHUFVFbnQsIGRybW1vZGVfY3J0YywgZmJfaWQsIGZsYWdzLAorCQkJCSBkcm1fcXVl dWVfc2VxKTsKK30KKworaW50Citkcm1tb2RlX3BhZ2VfZmxpcF90YXJnZXRfcmVsYXRpdmUoQU1E R1BVRW50UHRyIHBBTURHUFVFbnQsCisJCQkJICBkcm1tb2RlX2NydGNfcHJpdmF0ZV9wdHIgZHJt bW9kZV9jcnRjLAorCQkJCSAgaW50IGZiX2lkLCB1aW50MzJfdCBmbGFncywKKwkJCQkgIHVpbnRw dHJfdCBkcm1fcXVldWVfc2VxLCB1aW50MzJfdCB0YXJnZXRfbXNjKQoreworCWlmIChwQU1ER1BV RW50LT5oYXNfcGFnZV9mbGlwX3RhcmdldCkgeworCQlmbGFncyB8PSBEUk1fTU9ERV9QQUdFX0ZM SVBfRVZFTlQgfCBEUk1fTU9ERV9QQUdFX0ZMSVBfVEFSR0VUX1JFTEFUSVZFOworCQlyZXR1cm4g ZHJtTW9kZVBhZ2VGbGlwVGFyZ2V0KHBBTURHUFVFbnQtPmZkLAorCQkJCQkgICAgIGRybW1vZGVf Y3J0Yy0+bW9kZV9jcnRjLT5jcnRjX2lkLAorCQkJCQkgICAgIGZiX2lkLCBmbGFncywgKHZvaWQq KWRybV9xdWV1ZV9zZXEsCisJCQkJCSAgICAgdGFyZ2V0X21zYyk7CisJfQorCisJcmV0dXJuIGRy bW1vZGVfcGFnZV9mbGlwKHBBTURHUFVFbnQsIGRybW1vZGVfY3J0YywgZmJfaWQsIGZsYWdzLAor CQkJCSBkcm1fcXVldWVfc2VxKTsKK30KKwogQm9vbCBkcm1tb2RlX3ByZV9pbml0KFNjcm5JbmZv UHRyIHBTY3JuLCBkcm1tb2RlX3B0ciBkcm1tb2RlLCBpbnQgY3BwKQogewogCUFNREdQVUVudFB0 ciBwQU1ER1BVRW50ID0gQU1ER1BVRW50UHJpdihwU2Nybik7CkBAIC0yMTk4LDYgKzIyNTEsOCBA QCBCb29sIGRybW1vZGVfcHJlX2luaXQoU2NybkluZm9QdHIgcFNjcm4sIGRybW1vZGVfcHRyIGRy bW1vZGUsIGludCBjcHApCiAJZHJtbW9kZS0+ZXZlbnRfY29udGV4dC52YmxhbmtfaGFuZGxlciA9 IGFtZGdwdV9kcm1fcXVldWVfaGFuZGxlcjsKIAlkcm1tb2RlLT5ldmVudF9jb250ZXh0LnBhZ2Vf ZmxpcF9oYW5kbGVyID0gYW1kZ3B1X2RybV9xdWV1ZV9oYW5kbGVyOwogCisJcEFNREdQVUVudC0+ aGFzX3BhZ2VfZmxpcF90YXJnZXQgPSBkcm1tb2RlX3Byb2JlX3BhZ2VfZmxpcF90YXJnZXQocEFN REdQVUVudCk7CisKIAlkcm1Nb2RlRnJlZVJlc291cmNlcyhtb2RlX3Jlcyk7CiAJcmV0dXJuIFRS VUU7CiB9CkBAIC0yNTM1LDcgKzI1OTAsOCBAQCBCb29sIGFtZGdwdV9kb19wYWdlZmxpcChTY3Ju SW5mb1B0ciBzY3JuLCBDbGllbnRQdHIgY2xpZW50LAogCQkJUGl4bWFwUHRyIG5ld19mcm9udCwg dWludDY0X3QgaWQsIHZvaWQgKmRhdGEsCiAJCQlpbnQgcmVmX2NydGNfaHdfaWQsIGFtZGdwdV9k cm1faGFuZGxlcl9wcm9jIGhhbmRsZXIsCiAJCQlhbWRncHVfZHJtX2Fib3J0X3Byb2MgYWJvcnQs Ci0JCQllbnVtIGRybW1vZGVfZmxpcF9zeW5jIGZsaXBfc3luYykKKwkJCWVudW0gZHJtbW9kZV9m bGlwX3N5bmMgZmxpcF9zeW5jLAorCQkJdWludDMyX3QgdGFyZ2V0X21zYykKIHsKIAlBTURHUFVF bnRQdHIgcEFNREdQVUVudCA9IEFNREdQVUVudFByaXYoc2Nybik7CiAJeGY4NkNydGNDb25maWdQ dHIgY29uZmlnID0gWEY4Nl9DUlRDX0NPTkZJR19QVFIoc2Nybik7CkBAIC0yNTQzLDcgKzI1OTks NyBAQCBCb29sIGFtZGdwdV9kb19wYWdlZmxpcChTY3JuSW5mb1B0ciBzY3JuLCBDbGllbnRQdHIg Y2xpZW50LAogCWRybW1vZGVfY3J0Y19wcml2YXRlX3B0ciBkcm1tb2RlX2NydGMgPSBjb25maWct PmNydGNbMF0tPmRyaXZlcl9wcml2YXRlOwogCWRybW1vZGVfcHRyIGRybW1vZGUgPSBkcm1tb2Rl X2NydGMtPmRybW1vZGU7CiAJaW50IGk7Ci0JdWludDMyX3QgZmxpcF9mbGFncyA9IERSTV9NT0RF X1BBR0VfRkxJUF9FVkVOVDsKKwl1aW50MzJfdCBmbGlwX2ZsYWdzID0gZmxpcF9zeW5jID09IEZM SVBfQVNZTkMgPyBEUk1fTU9ERV9QQUdFX0ZMSVBfQVNZTkMgOiAwOwogCWRybW1vZGVfZmxpcGRh dGFfcHRyIGZsaXBkYXRhOwogCXVpbnRwdHJfdCBkcm1fcXVldWVfc2VxID0gMDsKIAl1aW50MzJf dCBuZXdfZnJvbnRfaGFuZGxlOwpAQCAtMjU4NSw5ICsyNjQxLDYgQEAgQm9vbCBhbWRncHVfZG9f cGFnZWZsaXAoU2NybkluZm9QdHIgc2NybiwgQ2xpZW50UHRyIGNsaWVudCwKIAlmbGlwZGF0YS0+ aGFuZGxlciA9IGhhbmRsZXI7CiAJZmxpcGRhdGEtPmFib3J0ID0gYWJvcnQ7CiAKLQlpZiAoZmxp cF9zeW5jID09IEZMSVBfQVNZTkMpCi0JCWZsaXBfZmxhZ3MgfD0gRFJNX01PREVfUEFHRV9GTElQ X0FTWU5DOwotCiAJZm9yIChpID0gMDsgaSA8IGNvbmZpZy0+bnVtX2NydGM7IGkrKykgewogCQlj cnRjID0gY29uZmlnLT5jcnRjW2ldOwogCkBAIC0yNjEzLDEzICsyNjY2LDIzIEBAIEJvb2wgYW1k Z3B1X2RvX3BhZ2VmbGlwKFNjcm5JbmZvUHRyIHNjcm4sIENsaWVudFB0ciBjbGllbnQsCiAJCQln b3RvIGVycm9yOwogCQl9CiAKLQkJaWYgKGRybU1vZGVQYWdlRmxpcChwQU1ER1BVRW50LT5mZCwg ZHJtbW9kZV9jcnRjLT5tb2RlX2NydGMtPmNydGNfaWQsCi0JCQkJICAgIGRybW1vZGUtPmZiX2lk LCBmbGlwX2ZsYWdzLAotCQkJCSAgICAodm9pZCopZHJtX3F1ZXVlX3NlcSkpIHsKLQkJCXhmODZE cnZNc2coc2Nybi0+c2NybkluZGV4LCBYX1dBUk5JTkcsCi0JCQkJICAgImZsaXAgcXVldWUgZmFp bGVkOiAlc1xuIiwgc3RyZXJyb3IoZXJybm8pKTsKLQkJCWdvdG8gZXJyb3I7CisJCWlmIChkcm1t b2RlX2NydGMtPmh3X2lkID09IHJlZl9jcnRjX2h3X2lkKSB7CisJCQlpZiAoZHJtbW9kZV9wYWdl X2ZsaXBfdGFyZ2V0X2Fic29sdXRlKHBBTURHUFVFbnQsCisJCQkJCQkJICAgICAgZHJtbW9kZV9j cnRjLAorCQkJCQkJCSAgICAgIGRybW1vZGUtPmZiX2lkLAorCQkJCQkJCSAgICAgIGZsaXBfZmxh Z3MsCisJCQkJCQkJICAgICAgZHJtX3F1ZXVlX3NlcSwKKwkJCQkJCQkgICAgICB0YXJnZXRfbXNj KSAhPSAwKQorCQkJCWdvdG8gZmxpcF9lcnJvcjsKKwkJfSBlbHNlIHsKKwkJCWlmIChkcm1tb2Rl X3BhZ2VfZmxpcF90YXJnZXRfcmVsYXRpdmUocEFNREdQVUVudCwKKwkJCQkJCQkgICAgICBkcm1t b2RlX2NydGMsCisJCQkJCQkJICAgICAgZHJtbW9kZS0+ZmJfaWQsCisJCQkJCQkJICAgICAgZmxp cF9mbGFncywKKwkJCQkJCQkgICAgICBkcm1fcXVldWVfc2VxLCAwKSAhPSAwKQorCQkJCWdvdG8g ZmxpcF9lcnJvcjsKIAkJfQorCiAJCWRybW1vZGVfY3J0Yy0+ZmxpcF9wZW5kaW5nID0gVFJVRTsK IAkJZHJtX3F1ZXVlX3NlcSA9IDA7CiAJfQpAQCAtMjYyNyw2ICsyNjkwLDEwIEBAIEJvb2wgYW1k Z3B1X2RvX3BhZ2VmbGlwKFNjcm5JbmZvUHRyIHNjcm4sIENsaWVudFB0ciBjbGllbnQsCiAJaWYg KGZsaXBkYXRhLT5mbGlwX2NvdW50ID4gMCkKIAkJcmV0dXJuIFRSVUU7CiAKK2ZsaXBfZXJyb3I6 CisJeGY4NkRydk1zZyhzY3JuLT5zY3JuSW5kZXgsIFhfV0FSTklORywgImZsaXAgcXVldWUgZmFp bGVkOiAlc1xuIiwKKwkJICAgc3RyZXJyb3IoZXJybm8pKTsKKwogZXJyb3I6CiAJaWYgKGZsaXBk YXRhICYmIGZsaXBkYXRhLT5mbGlwX2NvdW50IDw9IDEpIHsKIAkJZHJtTW9kZVJtRkIocEFNREdQ VUVudC0+ZmQsIGRybW1vZGUtPmZiX2lkKTsKZGlmZiAtLWdpdCBhL3NyYy9kcm1tb2RlX2Rpc3Bs YXkuaCBiL3NyYy9kcm1tb2RlX2Rpc3BsYXkuaAppbmRleCAyYzRhODY5Li42MzliM2ZiIDEwMDY0 NAotLS0gYS9zcmMvZHJtbW9kZV9kaXNwbGF5LmgKKysrIGIvc3JjL2RybW1vZGVfZGlzcGxheS5o CkBAIC0xMzAsNiArMTMwLDE2IEBAIGVudW0gZHJtbW9kZV9mbGlwX3N5bmMgewogfTsKIAogCitl eHRlcm4gaW50IGRybW1vZGVfcGFnZV9mbGlwX3RhcmdldF9hYnNvbHV0ZShBTURHUFVFbnRQdHIg cEFNREdQVUVudCwKKwkJCQkJICAgICBkcm1tb2RlX2NydGNfcHJpdmF0ZV9wdHIgZHJtbW9kZV9j cnRjLAorCQkJCQkgICAgIGludCBmYl9pZCwgdWludDMyX3QgZmxhZ3MsCisJCQkJCSAgICAgdWlu dHB0cl90IGRybV9xdWV1ZV9zZXEsCisJCQkJCSAgICAgdWludDMyX3QgdGFyZ2V0X21zYyk7Citl eHRlcm4gaW50IGRybW1vZGVfcGFnZV9mbGlwX3RhcmdldF9yZWxhdGl2ZShBTURHUFVFbnRQdHIg cEFNREdQVUVudCwKKwkJCQkJICAgICBkcm1tb2RlX2NydGNfcHJpdmF0ZV9wdHIgZHJtbW9kZV9j cnRjLAorCQkJCQkgICAgIGludCBmYl9pZCwgdWludDMyX3QgZmxhZ3MsCisJCQkJCSAgICAgdWlu dHB0cl90IGRybV9xdWV1ZV9zZXEsCisJCQkJCSAgICAgdWludDMyX3QgdGFyZ2V0X21zYyk7CiBl eHRlcm4gQm9vbCBkcm1tb2RlX3ByZV9pbml0KFNjcm5JbmZvUHRyIHBTY3JuLCBkcm1tb2RlX3B0 ciBkcm1tb2RlLCBpbnQgY3BwKTsKIGV4dGVybiB2b2lkIGRybW1vZGVfaW5pdChTY3JuSW5mb1B0 ciBwU2NybiwgZHJtbW9kZV9wdHIgZHJtbW9kZSk7CiBleHRlcm4gdm9pZCBkcm1tb2RlX2Zpbmko U2NybkluZm9QdHIgcFNjcm4sIGRybW1vZGVfcHRyIGRybW1vZGUpOwpAQCAtMTUzLDcgKzE2Myw4 IEBAIEJvb2wgYW1kZ3B1X2RvX3BhZ2VmbGlwKFNjcm5JbmZvUHRyIHNjcm4sIENsaWVudFB0ciBj bGllbnQsCiAJCQlQaXhtYXBQdHIgbmV3X2Zyb250LCB1aW50NjRfdCBpZCwgdm9pZCAqZGF0YSwK IAkJCWludCByZWZfY3J0Y19od19pZCwgYW1kZ3B1X2RybV9oYW5kbGVyX3Byb2MgaGFuZGxlciwK IAkJCWFtZGdwdV9kcm1fYWJvcnRfcHJvYyBhYm9ydCwKLQkJCWVudW0gZHJtbW9kZV9mbGlwX3N5 bmMgZmxpcF9zeW5jKTsKKwkJCWVudW0gZHJtbW9kZV9mbGlwX3N5bmMgZmxpcF9zeW5jLAorCQkJ dWludDMyX3QgdGFyZ2V0X21zYyk7CiBpbnQgZHJtbW9kZV9jcnRjX2dldF91c3RfbXNjKHhmODZD cnRjUHRyIGNydGMsIENBUkQ2NCAqdXN0LCBDQVJENjQgKm1zYyk7CiBpbnQgZHJtbW9kZV9nZXRf Y3VycmVudF91c3QoaW50IGRybV9mZCwgQ0FSRDY0ICogdXN0KTsKIAotLSAKMi4xMC4yCgpfX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwphbWQtZ2Z4IG1haWxp bmcgbGlzdAphbWQtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVk ZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2FtZC1nZngK