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: Tue, 22 Nov 2016 16:58:19 +0900 Message-ID: <20161122075819.27641-1-michel@daenzer.net> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: 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 b20gcmFkZW9uIGNvbW1pdCAxMTA2YjJmNzczYWQwNjExYzcyOWIyN2Y0YzE5MmEyNmI0M2VmMWU3 KQoKU2lnbmVkLW9mZi1ieTogTWljaGVsIETDpG56ZXIgPG1pY2hlbC5kYWVuemVyQGFtZC5jb20+ Ci0tLQogc3JjL2FtZGdwdV9kcmkyLmMgICAgIHwgIDMgKy0KIHNyYy9hbWRncHVfa21zLmMgICAg ICB8IDE2ICsrKystLS0tLQogc3JjL2FtZGdwdV9wcmVzZW50LmMgIHwgIDUgKy0tCiBzcmMvYW1k Z3B1X3Byb2JlLmggICAgfCAgMSArCiBzcmMvZHJtbW9kZV9kaXNwbGF5LmMgfCA5OSArKysrKysr KysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKystLS0tLS0KIHNyYy9kcm1tb2Rl X2Rpc3BsYXkuaCB8IDExICsrKysrLQogNiBmaWxlcyBjaGFuZ2VkLCAxMTAgaW5zZXJ0aW9ucygr KSwgMjUgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvc3JjL2FtZGdwdV9kcmkyLmMgYi9zcmMv YW1kZ3B1X2RyaTIuYwppbmRleCAzMWFjM2YzLi5jM2ExMTJkIDEwMDY0NAotLS0gYS9zcmMvYW1k Z3B1X2RyaTIuYworKysgYi9zcmMvYW1kZ3B1X2RyaTIuYwpAQCAtNTYzLDcgKzU2Myw4IEBAIGFt ZGdwdV9kcmkyX3NjaGVkdWxlX2ZsaXAoeGY4NkNydGNQdHIgY3J0YywgQ2xpZW50UHRyIGNsaWVu dCwKIAkJCSAgICAgICBBTURHUFVfRFJNX1FVRVVFX0lEX0RFRkFVTFQsIGZsaXBfaW5mbywKIAkJ CSAgICAgICByZWZfY3J0Y19od19pZCwKIAkJCSAgICAgICBhbWRncHVfZHJpMl9mbGlwX2V2ZW50 X2hhbmRsZXIsCi0JCQkgICAgICAgYW1kZ3B1X2RyaTJfZmxpcF9ldmVudF9hYm9ydCwgRkxJUF9W U1lOQykpIHsKKwkJCSAgICAgICBhbWRncHVfZHJpMl9mbGlwX2V2ZW50X2Fib3J0LCBGTElQX1ZT WU5DLAorCQkJICAgICAgIHRhcmdldF9tc2MgLSBhbWRncHVfZ2V0X21zY19kZWx0YShkcmF3LCBj cnRjKSkpIHsKIAkJaW5mby0+ZHJtbW9kZS5kcmkyX2ZsaXBwaW5nID0gVFJVRTsKIAkJcmV0dXJu IFRSVUU7CiAJfQpkaWZmIC0tZ2l0IGEvc3JjL2FtZGdwdV9rbXMuYyBiL3NyYy9hbWRncHVfa21z LmMKaW5kZXggMzE5YjU3Mi4uMDliN2VhMCAxMDA2NDQKLS0tIGEvc3JjL2FtZGdwdV9rbXMuYwor KysgYi9zcmMvYW1kZ3B1X2ttcy5jCkBAIC03MDEsOSArNzAxLDggQEAgYW1kZ3B1X3ByaW1lX3Nj YW5vdXRfZmxpcChQaXhtYXBEaXJ0eVVwZGF0ZVB0ciBlbnQpCiAJCXJldHVybjsKIAl9CiAKLQlp ZiAoZHJtTW9kZVBhZ2VGbGlwKHBBTURHUFVFbnQtPmZkLCBkcm1tb2RlX2NydGMtPm1vZGVfY3J0 Yy0+Y3J0Y19pZCwKLQkJCSAgICBkcm1tb2RlX2NydGMtPnNjYW5vdXRbc2Nhbm91dF9pZF0uZmJf aWQsCi0JCQkgICAgRFJNX01PREVfUEFHRV9GTElQX0VWRU5ULCAodm9pZCopZHJtX3F1ZXVlX3Nl cSkpIHsKKwlpZiAoZHJtbW9kZV9wYWdlX2ZsaXBfdGFyZ2V0X3JlbGF0aXZlKHBBTURHUFVFbnQs IGRybW1vZGVfY3J0YywgMCwKKwkJCQkJICAgICAgZHJtX3F1ZXVlX3NlcSwgMCkgIT0gMCkgewog CQl4Zjg2RHJ2TXNnKHNjcm4tPnNjcm5JbmRleCwgWF9XQVJOSU5HLCAiZmxpcCBxdWV1ZSBmYWls ZWQgaW4gJXM6ICVzXG4iLAogCQkJICAgX19mdW5jX18sIHN0cmVycm9yKGVycm5vKSk7CiAJCXJl dHVybjsKQEAgLTk0OSw4ICs5NDgsOCBAQCBhbWRncHVfc2Nhbm91dF9mbGlwKFNjcmVlblB0ciBw U2NyZWVuLCBBTURHUFVJbmZvUHRyIGluZm8sCiAJCQkJCXhmODZDcnRjUHRyIHhmODZfY3J0YykK IHsKIAlkcm1tb2RlX2NydGNfcHJpdmF0ZV9wdHIgZHJtbW9kZV9jcnRjID0geGY4Nl9jcnRjLT5k cml2ZXJfcHJpdmF0ZTsKLQlTY3JuSW5mb1B0ciBzY3JuOwotCUFNREdQVUVudFB0ciBwQU1ER1BV RW50OworCVNjcm5JbmZvUHRyIHNjcm4gPSB4Zjg2X2NydGMtPnNjcm47CisJQU1ER1BVRW50UHRy IHBBTURHUFVFbnQgPSBBTURHUFVFbnRQcml2KHNjcm4pOwogCXVpbnRwdHJfdCBkcm1fcXVldWVf c2VxOwogCXVuc2lnbmVkIHNjYW5vdXRfaWQ7CiAKQEAgLTk2MSw3ICs5NjAsNiBAQCBhbWRncHVf c2Nhbm91dF9mbGlwKFNjcmVlblB0ciBwU2NyZWVuLCBBTURHUFVJbmZvUHRyIGluZm8sCiAJaWYg KCFhbWRncHVfc2Nhbm91dF9kb191cGRhdGUoeGY4Nl9jcnRjLCBzY2Fub3V0X2lkKSkKIAkJcmV0 dXJuOwogCi0Jc2NybiA9IHhmODZfY3J0Yy0+c2NybjsKIAlkcm1fcXVldWVfc2VxID0gYW1kZ3B1 X2RybV9xdWV1ZV9hbGxvYyh4Zjg2X2NydGMsCiAJCQkJCSAgICAgICBBTURHUFVfRFJNX1FVRVVF X0NMSUVOVF9ERUZBVUxULAogCQkJCQkgICAgICAgQU1ER1BVX0RSTV9RVUVVRV9JRF9ERUZBVUxU LApAQCAtOTczLDEwICs5NzEsOCBAQCBhbWRncHVfc2Nhbm91dF9mbGlwKFNjcmVlblB0ciBwU2Ny ZWVuLCBBTURHUFVJbmZvUHRyIGluZm8sCiAJCXJldHVybjsKIAl9CiAKLQlwQU1ER1BVRW50ID0g QU1ER1BVRW50UHJpdihzY3JuKTsKLQlpZiAoZHJtTW9kZVBhZ2VGbGlwKHBBTURHUFVFbnQtPmZk LCBkcm1tb2RlX2NydGMtPm1vZGVfY3J0Yy0+Y3J0Y19pZCwKLQkJCSAgICBkcm1tb2RlX2NydGMt PnNjYW5vdXRbc2Nhbm91dF9pZF0uZmJfaWQsCi0JCQkgICAgRFJNX01PREVfUEFHRV9GTElQX0VW RU5ULCAodm9pZCopZHJtX3F1ZXVlX3NlcSkpIHsKKwlpZiAoZHJtbW9kZV9wYWdlX2ZsaXBfdGFy Z2V0X3JlbGF0aXZlKHBBTURHUFVFbnQsIGRybW1vZGVfY3J0YywgMCwKKwkJCQkJICAgICAgZHJt X3F1ZXVlX3NlcSwgMCkgIT0gMCkgewogCQl4Zjg2RHJ2TXNnKHNjcm4tPnNjcm5JbmRleCwgWF9X QVJOSU5HLCAiZmxpcCBxdWV1ZSBmYWlsZWQgaW4gJXM6ICVzXG4iLAogCQkJICAgX19mdW5jX18s IHN0cmVycm9yKGVycm5vKSk7CiAJCXJldHVybjsKZGlmZiAtLWdpdCBhL3NyYy9hbWRncHVfcHJl c2VudC5jIGIvc3JjL2FtZGdwdV9wcmVzZW50LmMKaW5kZXggZGNiMThkYS4uMzY0NjE5MCAxMDA2 NDQKLS0tIGEvc3JjL2FtZGdwdV9wcmVzZW50LmMKKysrIGIvc3JjL2FtZGdwdV9wcmVzZW50LmMK QEAgLTMyOSw3ICszMjksOCBAQCBhbWRncHVfcHJlc2VudF9mbGlwKFJSQ3J0Y1B0ciBjcnRjLCB1 aW50NjRfdCBldmVudF9pZCwgdWludDY0X3QgdGFyZ2V0X21zYywKIAkJCQkgcGl4bWFwLCBldmVu dF9pZCwgZXZlbnQsIGNydGNfaWQsCiAJCQkJIGFtZGdwdV9wcmVzZW50X2ZsaXBfZXZlbnQsCiAJ CQkJIGFtZGdwdV9wcmVzZW50X2ZsaXBfYWJvcnQsCi0JCQkJIHN5bmNfZmxpcCA/IEZMSVBfVlNZ TkMgOiBGTElQX0FTWU5DKTsKKwkJCQkgc3luY19mbGlwID8gRkxJUF9WU1lOQyA6IEZMSVBfQVNZ TkMsCisJCQkJIHRhcmdldF9tc2MpOwogCWlmICghcmV0KQogCQl4Zjg2RHJ2TXNnKHNjcm4tPnNj cm5JbmRleCwgWF9FUlJPUiwgInByZXNlbnQgZmxpcCBmYWlsZWRcbiIpOwogCWVsc2UKQEAgLTM2 Niw3ICszNjcsNyBAQCBhbWRncHVfcHJlc2VudF91bmZsaXAoU2NyZWVuUHRyIHNjcmVlbiwgdWlu dDY0X3QgZXZlbnRfaWQpCiAKIAlpZiAoYW1kZ3B1X2RvX3BhZ2VmbGlwKHNjcm4sIEFNREdQVV9E Uk1fUVVFVUVfQ0xJRU5UX0RFRkFVTFQsIHBpeG1hcCwKIAkJCSAgICAgICBldmVudF9pZCwgZXZl bnQsIC0xLCBhbWRncHVfcHJlc2VudF9mbGlwX2V2ZW50LAotCQkJICAgICAgIGFtZGdwdV9wcmVz ZW50X2ZsaXBfYWJvcnQsIEZMSVBfVlNZTkMpKQorCQkJICAgICAgIGFtZGdwdV9wcmVzZW50X2Zs aXBfYWJvcnQsIEZMSVBfVlNZTkMsIDApKQogCQlyZXR1cm47CiAKIG1vZGVzZXQ6CmRpZmYgLS1n aXQgYS9zcmMvYW1kZ3B1X3Byb2JlLmggYi9zcmMvYW1kZ3B1X3Byb2JlLmgKaW5kZXggMWVjMTI5 OS4uMDMwMmQwMiAxMDA2NDQKLS0tIGEvc3JjL2FtZGdwdV9wcm9iZS5oCisrKyBiL3NyYy9hbWRn cHVfcHJvYmUuaApAQCAtNTYsNiArNTYsNyBAQCBleHRlcm4gRHJpdmVyUmVjIEFNREdQVTsKIAog dHlwZWRlZiBzdHJ1Y3QgewogCUJvb2wgSGFzQ1JUQzI7CQkvKiBBbGwgY2FyZHMgZXhjZXB0IG9y aWdpbmFsIFJhZGVvbiAgKi8KKwlCb29sIGhhc19wYWdlX2ZsaXBfdGFyZ2V0OwogCiAJYW1kZ3B1 X2RldmljZV9oYW5kbGUgcERldjsKIApkaWZmIC0tZ2l0IGEvc3JjL2RybW1vZGVfZGlzcGxheS5j IGIvc3JjL2RybW1vZGVfZGlzcGxheS5jCmluZGV4IGE3NWNjNWMuLmI1NjljNzIgMTAwNjQ0Ci0t LSBhL3NyYy9kcm1tb2RlX2Rpc3BsYXkuYworKysgYi9zcmMvZHJtbW9kZV9kaXNwbGF5LmMKQEAg LTIxMzIsNiArMjEzMiw3MSBAQCBzdGF0aWMgdm9pZCBkcm1fd2FrZXVwX2hhbmRsZXIocG9pbnRl ciBkYXRhLCBpbnQgZXJyLCBwb2ludGVyIHApCiB9CiAjZW5kaWYKIAorc3RhdGljIEJvb2wgZHJt bW9kZV9wcm9iZV9wYWdlX2ZsaXBfdGFyZ2V0KEFNREdQVUVudFB0ciBwQU1ER1BVRW50KQorewor I2lmZGVmIERSTV9DQVBfUEFHRV9GTElQX1RBUkdFVAorCXVpbnQ2NF90IGNhcF92YWx1ZTsKKwor CXJldHVybiBkcm1HZXRDYXAocEFNREdQVUVudC0+ZmQsIERSTV9DQVBfUEFHRV9GTElQX1RBUkdF VCwKKwkJCSAmY2FwX3ZhbHVlKSA9PSAwICYmIGNhcF92YWx1ZSAhPSAwOworI2Vsc2UKKwlyZXR1 cm4gRkFMU0U7CisjZW5kaWYKK30KKworc3RhdGljIGludAorZHJtbW9kZV9wYWdlX2ZsaXAoQU1E R1BVRW50UHRyIHBBTURHUFVFbnQsIGRybW1vZGVfY3J0Y19wcml2YXRlX3B0ciBkcm1tb2RlX2Ny dGMsCisJCSAgdWludDMyX3QgZmxhZ3MsIHVpbnRwdHJfdCBkcm1fcXVldWVfc2VxKQoreworCWRy bW1vZGVfcHRyIGRybW1vZGUgPSBkcm1tb2RlX2NydGMtPmRybW1vZGU7CisKKwlmbGFncyB8PSBE Uk1fTU9ERV9QQUdFX0ZMSVBfRVZFTlQ7CisJcmV0dXJuIGRybU1vZGVQYWdlRmxpcChwQU1ER1BV RW50LT5mZCwgZHJtbW9kZV9jcnRjLT5tb2RlX2NydGMtPmNydGNfaWQsCisJCQkgICAgICAgZHJt bW9kZS0+ZmJfaWQsIGZsYWdzLCAodm9pZCopZHJtX3F1ZXVlX3NlcSk7Cit9CisKK2ludAorZHJt bW9kZV9wYWdlX2ZsaXBfdGFyZ2V0X2Fic29sdXRlKEFNREdQVUVudFB0ciBwQU1ER1BVRW50LAor CQkJCSAgZHJtbW9kZV9jcnRjX3ByaXZhdGVfcHRyIGRybW1vZGVfY3J0YywKKwkJCQkgIHVpbnQz Ml90IGZsYWdzLCB1aW50cHRyX3QgZHJtX3F1ZXVlX3NlcSwKKwkJCQkgIHVpbnQzMl90IHRhcmdl dF9tc2MpCit7CisjaWZkZWYgRFJNX01PREVfUEFHRV9GTElQX1RBUkdFVAorCWlmIChwQU1ER1BV RW50LT5oYXNfcGFnZV9mbGlwX3RhcmdldCkgeworCQlkcm1tb2RlX3B0ciBkcm1tb2RlID0gZHJt bW9kZV9jcnRjLT5kcm1tb2RlOworCisJCWZsYWdzIHw9IERSTV9NT0RFX1BBR0VfRkxJUF9FVkVO VCB8IERSTV9NT0RFX1BBR0VfRkxJUF9UQVJHRVRfQUJTT0xVVEU7CisJCXJldHVybiBkcm1Nb2Rl UGFnZUZsaXBUYXJnZXQocEFNREdQVUVudC0+ZmQsCisJCQkJCSAgICAgZHJtbW9kZV9jcnRjLT5t b2RlX2NydGMtPmNydGNfaWQsCisJCQkJCSAgICAgZHJtbW9kZS0+ZmJfaWQsIGZsYWdzLAorCQkJ CQkgICAgICh2b2lkKilkcm1fcXVldWVfc2VxLCB0YXJnZXRfbXNjKTsKKwl9CisjZW5kaWYKKwor CXJldHVybiBkcm1tb2RlX3BhZ2VfZmxpcChwQU1ER1BVRW50LCBkcm1tb2RlX2NydGMsIGZsYWdz LCBkcm1fcXVldWVfc2VxKTsKK30KKworaW50Citkcm1tb2RlX3BhZ2VfZmxpcF90YXJnZXRfcmVs YXRpdmUoQU1ER1BVRW50UHRyIHBBTURHUFVFbnQsCisJCQkJICBkcm1tb2RlX2NydGNfcHJpdmF0 ZV9wdHIgZHJtbW9kZV9jcnRjLAorCQkJCSAgdWludDMyX3QgZmxhZ3MsIHVpbnRwdHJfdCBkcm1f cXVldWVfc2VxLAorCQkJCSAgdWludDMyX3QgdGFyZ2V0X21zYykKK3sKKyNpZmRlZiBEUk1fTU9E RV9QQUdFX0ZMSVBfVEFSR0VUCisJaWYgKHBBTURHUFVFbnQtPmhhc19wYWdlX2ZsaXBfdGFyZ2V0 KSB7CisJCWRybW1vZGVfcHRyIGRybW1vZGUgPSBkcm1tb2RlX2NydGMtPmRybW1vZGU7CisKKwkJ ZmxhZ3MgfD0gRFJNX01PREVfUEFHRV9GTElQX0VWRU5UIHwgRFJNX01PREVfUEFHRV9GTElQX1RB UkdFVF9SRUxBVElWRTsKKwkJcmV0dXJuIGRybU1vZGVQYWdlRmxpcFRhcmdldChwQU1ER1BVRW50 LT5mZCwKKwkJCQkJICAgICBkcm1tb2RlX2NydGMtPm1vZGVfY3J0Yy0+Y3J0Y19pZCwKKwkJCQkJ ICAgICBkcm1tb2RlLT5mYl9pZCwgZmxhZ3MsCisJCQkJCSAgICAgKHZvaWQqKWRybV9xdWV1ZV9z ZXEsIHRhcmdldF9tc2MpOworCX0KKyNlbmRpZgorCisJcmV0dXJuIGRybW1vZGVfcGFnZV9mbGlw KHBBTURHUFVFbnQsIGRybW1vZGVfY3J0YywgZmxhZ3MsIGRybV9xdWV1ZV9zZXEpOworfQorCiBC b29sIGRybW1vZGVfcHJlX2luaXQoU2NybkluZm9QdHIgcFNjcm4sIGRybW1vZGVfcHRyIGRybW1v ZGUsIGludCBjcHApCiB7CiAJQU1ER1BVRW50UHRyIHBBTURHUFVFbnQgPSBBTURHUFVFbnRQcml2 KHBTY3JuKTsKQEAgLTIxOTgsNiArMjI2Myw4IEBAIEJvb2wgZHJtbW9kZV9wcmVfaW5pdChTY3Ju SW5mb1B0ciBwU2NybiwgZHJtbW9kZV9wdHIgZHJtbW9kZSwgaW50IGNwcCkKIAlkcm1tb2RlLT5l dmVudF9jb250ZXh0LnZibGFua19oYW5kbGVyID0gYW1kZ3B1X2RybV9xdWV1ZV9oYW5kbGVyOwog CWRybW1vZGUtPmV2ZW50X2NvbnRleHQucGFnZV9mbGlwX2hhbmRsZXIgPSBhbWRncHVfZHJtX3F1 ZXVlX2hhbmRsZXI7CiAKKwlwQU1ER1BVRW50LT5oYXNfcGFnZV9mbGlwX3RhcmdldCA9IGRybW1v ZGVfcHJvYmVfcGFnZV9mbGlwX3RhcmdldChwQU1ER1BVRW50KTsKKwogCWRybU1vZGVGcmVlUmVz b3VyY2VzKG1vZGVfcmVzKTsKIAlyZXR1cm4gVFJVRTsKIH0KQEAgLTI1MzUsNyArMjYwMiw4IEBA IEJvb2wgYW1kZ3B1X2RvX3BhZ2VmbGlwKFNjcm5JbmZvUHRyIHNjcm4sIENsaWVudFB0ciBjbGll bnQsCiAJCQlQaXhtYXBQdHIgbmV3X2Zyb250LCB1aW50NjRfdCBpZCwgdm9pZCAqZGF0YSwKIAkJ CWludCByZWZfY3J0Y19od19pZCwgYW1kZ3B1X2RybV9oYW5kbGVyX3Byb2MgaGFuZGxlciwKIAkJ CWFtZGdwdV9kcm1fYWJvcnRfcHJvYyBhYm9ydCwKLQkJCWVudW0gZHJtbW9kZV9mbGlwX3N5bmMg ZmxpcF9zeW5jKQorCQkJZW51bSBkcm1tb2RlX2ZsaXBfc3luYyBmbGlwX3N5bmMsCisJCQl1aW50 MzJfdCB0YXJnZXRfbXNjKQogewogCUFNREdQVUVudFB0ciBwQU1ER1BVRW50ID0gQU1ER1BVRW50 UHJpdihzY3JuKTsKIAl4Zjg2Q3J0Y0NvbmZpZ1B0ciBjb25maWcgPSBYRjg2X0NSVENfQ09ORklH X1BUUihzY3JuKTsKQEAgLTI1NDMsNyArMjYxMSw3IEBAIEJvb2wgYW1kZ3B1X2RvX3BhZ2VmbGlw KFNjcm5JbmZvUHRyIHNjcm4sIENsaWVudFB0ciBjbGllbnQsCiAJZHJtbW9kZV9jcnRjX3ByaXZh dGVfcHRyIGRybW1vZGVfY3J0YyA9IGNvbmZpZy0+Y3J0Y1swXS0+ZHJpdmVyX3ByaXZhdGU7CiAJ ZHJtbW9kZV9wdHIgZHJtbW9kZSA9IGRybW1vZGVfY3J0Yy0+ZHJtbW9kZTsKIAlpbnQgaTsKLQl1 aW50MzJfdCBmbGlwX2ZsYWdzID0gRFJNX01PREVfUEFHRV9GTElQX0VWRU5UOworCXVpbnQzMl90 IGZsaXBfZmxhZ3MgPSBmbGlwX3N5bmMgPT0gRkxJUF9BU1lOQyA/IERSTV9NT0RFX1BBR0VfRkxJ UF9BU1lOQyA6IDA7CiAJZHJtbW9kZV9mbGlwZGF0YV9wdHIgZmxpcGRhdGE7CiAJdWludHB0cl90 IGRybV9xdWV1ZV9zZXEgPSAwOwogCXVpbnQzMl90IG5ld19mcm9udF9oYW5kbGU7CkBAIC0yNTg1 LDkgKzI2NTMsNiBAQCBCb29sIGFtZGdwdV9kb19wYWdlZmxpcChTY3JuSW5mb1B0ciBzY3JuLCBD bGllbnRQdHIgY2xpZW50LAogCWZsaXBkYXRhLT5oYW5kbGVyID0gaGFuZGxlcjsKIAlmbGlwZGF0 YS0+YWJvcnQgPSBhYm9ydDsKIAotCWlmIChmbGlwX3N5bmMgPT0gRkxJUF9BU1lOQykKLQkJZmxp cF9mbGFncyB8PSBEUk1fTU9ERV9QQUdFX0ZMSVBfQVNZTkM7Ci0KIAlmb3IgKGkgPSAwOyBpIDwg Y29uZmlnLT5udW1fY3J0YzsgaSsrKSB7CiAJCWNydGMgPSBjb25maWctPmNydGNbaV07CiAKQEAg LTI2MTMsMTMgKzI2NzgsMjEgQEAgQm9vbCBhbWRncHVfZG9fcGFnZWZsaXAoU2NybkluZm9QdHIg c2NybiwgQ2xpZW50UHRyIGNsaWVudCwKIAkJCWdvdG8gZXJyb3I7CiAJCX0KIAotCQlpZiAoZHJt TW9kZVBhZ2VGbGlwKHBBTURHUFVFbnQtPmZkLCBkcm1tb2RlX2NydGMtPm1vZGVfY3J0Yy0+Y3J0 Y19pZCwKLQkJCQkgICAgZHJtbW9kZS0+ZmJfaWQsIGZsaXBfZmxhZ3MsCi0JCQkJICAgICh2b2lk Kilkcm1fcXVldWVfc2VxKSkgewotCQkJeGY4NkRydk1zZyhzY3JuLT5zY3JuSW5kZXgsIFhfV0FS TklORywKLQkJCQkgICAiZmxpcCBxdWV1ZSBmYWlsZWQ6ICVzXG4iLCBzdHJlcnJvcihlcnJubykp OwotCQkJZ290byBlcnJvcjsKKwkJaWYgKGRybW1vZGVfY3J0Yy0+aHdfaWQgPT0gcmVmX2NydGNf aHdfaWQpIHsKKwkJCWlmIChkcm1tb2RlX3BhZ2VfZmxpcF90YXJnZXRfYWJzb2x1dGUocEFNREdQ VUVudCwKKwkJCQkJCQkgICAgICBkcm1tb2RlX2NydGMsCisJCQkJCQkJICAgICAgZmxpcF9mbGFn cywKKwkJCQkJCQkgICAgICBkcm1fcXVldWVfc2VxLAorCQkJCQkJCSAgICAgIHRhcmdldF9tc2Mp ICE9IDApCisJCQkJZ290byBmbGlwX2Vycm9yOworCQl9IGVsc2UgeworCQkJaWYgKGRybW1vZGVf cGFnZV9mbGlwX3RhcmdldF9yZWxhdGl2ZShwQU1ER1BVRW50LAorCQkJCQkJCSAgICAgIGRybW1v ZGVfY3J0YywKKwkJCQkJCQkgICAgICBmbGlwX2ZsYWdzLAorCQkJCQkJCSAgICAgIGRybV9xdWV1 ZV9zZXEsIDApICE9IDApCisJCQkJZ290byBmbGlwX2Vycm9yOwogCQl9CisKIAkJZHJtbW9kZV9j cnRjLT5mbGlwX3BlbmRpbmcgPSBUUlVFOwogCQlkcm1fcXVldWVfc2VxID0gMDsKIAl9CkBAIC0y NjI3LDYgKzI3MDAsMTAgQEAgQm9vbCBhbWRncHVfZG9fcGFnZWZsaXAoU2NybkluZm9QdHIgc2Ny biwgQ2xpZW50UHRyIGNsaWVudCwKIAlpZiAoZmxpcGRhdGEtPmZsaXBfY291bnQgPiAwKQogCQly ZXR1cm4gVFJVRTsKIAorZmxpcF9lcnJvcjoKKwl4Zjg2RHJ2TXNnKHNjcm4tPnNjcm5JbmRleCwg WF9XQVJOSU5HLCAiZmxpcCBxdWV1ZSBmYWlsZWQ6ICVzXG4iLAorCQkgICBzdHJlcnJvcihlcnJu bykpOworCiBlcnJvcjoKIAlpZiAoZmxpcGRhdGEgJiYgZmxpcGRhdGEtPmZsaXBfY291bnQgPD0g MSkgewogCQlkcm1Nb2RlUm1GQihwQU1ER1BVRW50LT5mZCwgZHJtbW9kZS0+ZmJfaWQpOwpkaWZm IC0tZ2l0IGEvc3JjL2RybW1vZGVfZGlzcGxheS5oIGIvc3JjL2RybW1vZGVfZGlzcGxheS5oCmlu ZGV4IDJjNGE4NjkuLjQ5Y2YwMTIgMTAwNjQ0Ci0tLSBhL3NyYy9kcm1tb2RlX2Rpc3BsYXkuaAor KysgYi9zcmMvZHJtbW9kZV9kaXNwbGF5LmgKQEAgLTEzMCw2ICsxMzAsMTQgQEAgZW51bSBkcm1t b2RlX2ZsaXBfc3luYyB7CiB9OwogCiAKK2V4dGVybiBpbnQgZHJtbW9kZV9wYWdlX2ZsaXBfdGFy Z2V0X2Fic29sdXRlKEFNREdQVUVudFB0ciBwQU1ER1BVRW50LAorCQkJCQkgICAgIGRybW1vZGVf Y3J0Y19wcml2YXRlX3B0ciBkcm1tb2RlX2NydGMsCisJCQkJCSAgICAgdWludDMyX3QgZmxhZ3Ms IHVpbnRwdHJfdCBkcm1fcXVldWVfc2VxLAorCQkJCQkgICAgIHVpbnQzMl90IHRhcmdldF9tc2Mp OworZXh0ZXJuIGludCBkcm1tb2RlX3BhZ2VfZmxpcF90YXJnZXRfcmVsYXRpdmUoQU1ER1BVRW50 UHRyIHBBTURHUFVFbnQsCisJCQkJCSAgICAgZHJtbW9kZV9jcnRjX3ByaXZhdGVfcHRyIGRybW1v ZGVfY3J0YywKKwkJCQkJICAgICB1aW50MzJfdCBmbGFncywgdWludHB0cl90IGRybV9xdWV1ZV9z ZXEsCisJCQkJCSAgICAgdWludDMyX3QgdGFyZ2V0X21zYyk7CiBleHRlcm4gQm9vbCBkcm1tb2Rl X3ByZV9pbml0KFNjcm5JbmZvUHRyIHBTY3JuLCBkcm1tb2RlX3B0ciBkcm1tb2RlLCBpbnQgY3Bw KTsKIGV4dGVybiB2b2lkIGRybW1vZGVfaW5pdChTY3JuSW5mb1B0ciBwU2NybiwgZHJtbW9kZV9w dHIgZHJtbW9kZSk7CiBleHRlcm4gdm9pZCBkcm1tb2RlX2ZpbmkoU2NybkluZm9QdHIgcFNjcm4s IGRybW1vZGVfcHRyIGRybW1vZGUpOwpAQCAtMTUzLDcgKzE2MSw4IEBAIEJvb2wgYW1kZ3B1X2Rv X3BhZ2VmbGlwKFNjcm5JbmZvUHRyIHNjcm4sIENsaWVudFB0ciBjbGllbnQsCiAJCQlQaXhtYXBQ dHIgbmV3X2Zyb250LCB1aW50NjRfdCBpZCwgdm9pZCAqZGF0YSwKIAkJCWludCByZWZfY3J0Y19o d19pZCwgYW1kZ3B1X2RybV9oYW5kbGVyX3Byb2MgaGFuZGxlciwKIAkJCWFtZGdwdV9kcm1fYWJv cnRfcHJvYyBhYm9ydCwKLQkJCWVudW0gZHJtbW9kZV9mbGlwX3N5bmMgZmxpcF9zeW5jKTsKKwkJ CWVudW0gZHJtbW9kZV9mbGlwX3N5bmMgZmxpcF9zeW5jLAorCQkJdWludDMyX3QgdGFyZ2V0X21z Yyk7CiBpbnQgZHJtbW9kZV9jcnRjX2dldF91c3RfbXNjKHhmODZDcnRjUHRyIGNydGMsIENBUkQ2 NCAqdXN0LCBDQVJENjQgKm1zYyk7CiBpbnQgZHJtbW9kZV9nZXRfY3VycmVudF91c3QoaW50IGRy bV9mZCwgQ0FSRDY0ICogdXN0KTsKIAotLSAKMi4xMC4yCgpfX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fXwphbWQtZ2Z4IG1haWxpbmcgbGlzdAphbWQtZ2Z4QGxp c3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFu L2xpc3RpbmZvL2FtZC1nZngK