From: =?UTF-8?q?Michel=20D=C3=A4nzer?= Subject: [PATCH xf86-video-amdgpu 09/10] Always allow Present page flipping with TearFree Date: Fri, 18 Aug 2017 17:53:21 +0900 Message-ID: <20170818085322.3040-9-michel@daenzer.net> References: <20170818085322.3040-1-michel@daenzer.net> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20170818085322.3040-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+CgpFdmVuIGlmIFRl YXJGcmVlIGlzIGFjdGl2ZSBmb3IgdGhlIHRoZSBDUlRDIHdlJ3JlIHN5bmNocm9uaXppbmcgdG8u IEluCnRoYXQgY2FzZSwgZm9yIFByZXNlbnQgZmxpcHMgc3luY2hyb25pemVkIHRvIHZlcnRpY2Fs IGJsYW5rLCB0aGUgb3RoZXIKc2Nhbm91dCBidWZmZXIgaXMgaW1tZWRpYXRlbHkgc3luY2hyb25p emVkIGFuZCBmbGlwcGVkIHRvIGR1cmluZyB0aGUKdGFyZ2V0IHZlcnRpY2FsIGJsYW5rIHBlcmlv ZC4gRm9yIFByZXNlbnQgZmxpcHMgbm90IHN5bmNocm9uaXplZCB0bwp2ZXJ0aWNhbCBibGFuaywg d2Ugc2ltcGx5IHVzZSB0aGUgTVNDIGFuZCB0aW1lc3RhbXAgdmFsdWVzIG9mIHRoZSBsYXN0CnZl cnRpY2FsIGJsYW5rIHBlcmlvZCBmb3IgdGltaW5nIHB1cnBvc2VzLCBhbmQgbGV0IHRoZSBub3Jt YWwgVGVhckZyZWUKbWVjaGFuaXNtIGhhbmRsZSBkaXNwbGF5IHVwZGF0ZXMuCgooUG9ydGVkIGZy b20gcmFkZW9uIGNvbW1pdCA0NDQ1NzY1YWY1Yjk3ZDBjZmQxMDg4OWZlNmQ2ZjU4ZjJjZTg1NjU5 KQoKU2lnbmVkLW9mZi1ieTogTWljaGVsIETDpG56ZXIgPG1pY2hlbC5kYWVuemVyQGFtZC5jb20+ Ci0tLQogc3JjL2FtZGdwdV9rbXMuYyAgICAgIHwgMjcgKysrKysrKysrKysrKysrKy0tLQogc3Jj L2FtZGdwdV9wcmVzZW50LmMgIHwgNzUgKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysr KysrKysrKysrKy0tLS0tLS0tCiBzcmMvZHJtbW9kZV9kaXNwbGF5LmMgfCA2MSArKysrKysrKysr KysrKysrKysrKysrKysrKysrKysrKysrKystLS0tLQogc3JjL2RybW1vZGVfZGlzcGxheS5oIHwg MTIgKysrKysrKystCiA0IGZpbGVzIGNoYW5nZWQsIDE1MiBpbnNlcnRpb25zKCspLCAyMyBkZWxl dGlvbnMoLSkKCmRpZmYgLS1naXQgYS9zcmMvYW1kZ3B1X2ttcy5jIGIvc3JjL2FtZGdwdV9rbXMu YwppbmRleCBhZWRiM2YwNjYuLmIwZjFhM2Q5NCAxMDA2NDQKLS0tIGEvc3JjL2FtZGdwdV9rbXMu YworKysgYi9zcmMvYW1kZ3B1X2ttcy5jCkBAIC00MSw2ICs0MSwxMCBAQAogI2luY2x1ZGUgInNo YWRvdy5oIgogI2luY2x1ZGUgPHhmODZQcml2Lmg+CiAKKyNpZiBIQVZFX1BSRVNFTlRfSAorI2lu Y2x1ZGUgPHByZXNlbnQuaD4KKyNlbmRpZgorCiAvKiBEUE1TICovCiAjaWZkZWYgSEFWRV9YRVhU UFJPVE9fNzEKICNpbmNsdWRlIDxYMTEvZXh0ZW5zaW9ucy9kcG1zY29uc3QuaD4KQEAgLTY4MSw2 ICs2ODUsMTUgQEAgYW1kZ3B1X3ByaW1lX3NjYW5vdXRfZmxpcF9oYW5kbGVyKHhmODZDcnRjUHRy IGNydGMsIHVpbnQzMl90IG1zYywgdWludDY0X3QgdXNlYywKIAlkcm1tb2RlX2ZiX3JlZmVyZW5j ZShwQU1ER1BVRW50LT5mZCwgJmRybW1vZGVfY3J0Yy0+ZmIsCiAJCQkgICAgIGRybW1vZGVfY3J0 Yy0+ZmxpcF9wZW5kaW5nKTsKIAlhbWRncHVfcHJpbWVfc2Nhbm91dF9mbGlwX2Fib3J0KGNydGMs IGV2ZW50X2RhdGEpOworCisjaWZkZWYgSEFWRV9QUkVTRU5UX0gKKwlpZiAoZHJtbW9kZV9jcnRj LT5wcmVzZW50X3ZibGFua19ldmVudF9pZCkgeworCQlwcmVzZW50X2V2ZW50X25vdGlmeShkcm1t b2RlX2NydGMtPnByZXNlbnRfdmJsYW5rX2V2ZW50X2lkLAorCQkJCSAgICAgZHJtbW9kZV9jcnRj LT5wcmVzZW50X3ZibGFua191c2VjLAorCQkJCSAgICAgZHJtbW9kZV9jcnRjLT5wcmVzZW50X3Zi bGFua19tc2MpOworCQlkcm1tb2RlX2NydGMtPnByZXNlbnRfdmJsYW5rX2V2ZW50X2lkID0gMDsK Kwl9CisjZW5kaWYKIH0KIAogc3RhdGljIHZvaWQKQEAgLTg5NSwxMCArOTA4LDE0IEBAIGFtZGdw dV9zY2Fub3V0X3VwZGF0ZV9oYW5kbGVyKHhmODZDcnRjUHRyIGNydGMsIHVpbnQzMl90IGZyYW1l LCB1aW50NjRfdCB1c2VjLAogCVNjcmVlblB0ciBzY3JlZW4gPSBjcnRjLT5zY3JuLT5wU2NyZWVu OwogCVJlZ2lvblB0ciByZWdpb24gPSBEYW1hZ2VSZWdpb24oZHJtbW9kZV9jcnRjLT5zY2Fub3V0 X2RhbWFnZSk7CiAKLQlhbWRncHVfc2Nhbm91dF9kb191cGRhdGUoY3J0YywgZHJtbW9kZV9jcnRj LT5zY2Fub3V0X2lkLAotCQkJCSAmc2NyZWVuLT5HZXRXaW5kb3dQaXhtYXAoc2NyZWVuLT5yb290 KS0+ZHJhd2FibGUsCi0JCQkJICZyZWdpb24tPmV4dGVudHMpOwotCVJlZ2lvbkVtcHR5KHJlZ2lv bik7CisJaWYgKGNydGMtPmVuYWJsZWQgJiYKKwkgICAgIWRybW1vZGVfY3J0Yy0+ZmxpcF9wZW5k aW5nICYmCisJICAgIGRybW1vZGVfY3J0Yy0+ZHBtc19tb2RlID09IERQTVNNb2RlT24pIHsKKwkJ aWYgKGFtZGdwdV9zY2Fub3V0X2RvX3VwZGF0ZShjcnRjLCBkcm1tb2RlX2NydGMtPnNjYW5vdXRf aWQsCisJCQkJCSAgICAgJnNjcmVlbi0+R2V0V2luZG93UGl4bWFwKHNjcmVlbi0+cm9vdCktPmRy YXdhYmxlLAorCQkJCQkgICAgICZyZWdpb24tPmV4dGVudHMpKQorCQkJUmVnaW9uRW1wdHkocmVn aW9uKTsKKwl9CiAKIAlhbWRncHVfc2Nhbm91dF91cGRhdGVfYWJvcnQoY3J0YywgZXZlbnRfZGF0 YSk7CiB9CkBAIC05MTUsNiArOTMyLDcgQEAgYW1kZ3B1X3NjYW5vdXRfdXBkYXRlKHhmODZDcnRj UHRyIHhmODZfY3J0YykKIAogCWlmICgheGY4Nl9jcnRjLT5lbmFibGVkIHx8CiAJICAgIGRybW1v ZGVfY3J0Yy0+c2Nhbm91dF91cGRhdGVfcGVuZGluZyB8fAorCSAgICBkcm1tb2RlX2NydGMtPmZs aXBfcGVuZGluZyB8fAogCSAgICBkcm1tb2RlX2NydGMtPmRwbXNfbW9kZSAhPSBEUE1TTW9kZU9u KQogCQlyZXR1cm47CiAKQEAgLTk4Miw2ICsxMDAwLDcgQEAgYW1kZ3B1X3NjYW5vdXRfZmxpcChT Y3JlZW5QdHIgcFNjcmVlbiwgQU1ER1BVSW5mb1B0ciBpbmZvLAogCXVuc2lnbmVkIHNjYW5vdXRf aWQ7CiAKIAlpZiAoZHJtbW9kZV9jcnRjLT5zY2Fub3V0X3VwZGF0ZV9wZW5kaW5nIHx8CisJICAg IGRybW1vZGVfY3J0Yy0+ZmxpcF9wZW5kaW5nIHx8CiAJICAgIGRybW1vZGVfY3J0Yy0+ZHBtc19t b2RlICE9IERQTVNNb2RlT24pCiAJCXJldHVybjsKIApkaWZmIC0tZ2l0IGEvc3JjL2FtZGdwdV9w cmVzZW50LmMgYi9zcmMvYW1kZ3B1X3ByZXNlbnQuYwppbmRleCBjN2ZjNDAyY2QuLmNlZjkzYzA2 OCAxMDA2NDQKLS0tIGEvc3JjL2FtZGdwdV9wcmVzZW50LmMKKysrIGIvc3JjL2FtZGdwdV9wcmVz ZW50LmMKQEAgLTUyLDYgKzUyLDcgQEAgc3RhdGljIHByZXNlbnRfc2NyZWVuX2luZm9fcmVjIGFt ZGdwdV9wcmVzZW50X3NjcmVlbl9pbmZvOwogCiBzdHJ1Y3QgYW1kZ3B1X3ByZXNlbnRfdmJsYW5r X2V2ZW50IHsKIAl1aW50NjRfdCBldmVudF9pZDsKKwlCb29sIHZibGFua19mb3JfZmxpcDsKIAlC b29sIHVuZmxpcDsKIH07CiAKQEAgLTExOSw5ICsxMjAsMjYgQEAgc3RhdGljIHZvaWQKIGFtZGdw dV9wcmVzZW50X3ZibGFua19oYW5kbGVyKHhmODZDcnRjUHRyIGNydGMsIHVuc2lnbmVkIGludCBt c2MsCiAJCQkgICAgICB1aW50NjRfdCB1c2VjLCB2b2lkICpkYXRhKQogeworCWRybW1vZGVfY3J0 Y19wcml2YXRlX3B0ciBkcm1tb2RlX2NydGMgPSBjcnRjLT5kcml2ZXJfcHJpdmF0ZTsKIAlzdHJ1 Y3QgYW1kZ3B1X3ByZXNlbnRfdmJsYW5rX2V2ZW50ICpldmVudCA9IGRhdGE7CiAKLQlwcmVzZW50 X2V2ZW50X25vdGlmeShldmVudC0+ZXZlbnRfaWQsIHVzZWMsIG1zYyk7CisJaWYgKGV2ZW50LT52 YmxhbmtfZm9yX2ZsaXAgJiYKKwkgICAgZHJtbW9kZV9jcnRjLT50ZWFyX2ZyZWUgJiYKKwkgICAg ZHJtbW9kZV9jcnRjLT5zY2Fub3V0X3VwZGF0ZV9wZW5kaW5nKSB7CisJCWlmIChkcm1tb2RlX2Ny dGMtPnByZXNlbnRfdmJsYW5rX2V2ZW50X2lkICE9IDApIHsKKwkJCXhmODZEcnZNc2coY3J0Yy0+ c2Nybi0+c2NybkluZGV4LCBYX1dBUk5JTkcsCisJCQkJICAgIk5lZWQgdG8gaGFuZGxlIHByZXZp b3VzbHkgZGVmZXJyZWQgdmJsYW5rIGV2ZW50XG4iKTsKKwkJCXByZXNlbnRfZXZlbnRfbm90aWZ5 KGRybW1vZGVfY3J0Yy0+cHJlc2VudF92YmxhbmtfZXZlbnRfaWQsCisJCQkJCSAgICAgZHJtbW9k ZV9jcnRjLT5wcmVzZW50X3ZibGFua191c2VjLAorCQkJCQkgICAgIGRybW1vZGVfY3J0Yy0+cHJl c2VudF92YmxhbmtfbXNjKTsKKwkJfQorCisJCWRybW1vZGVfY3J0Yy0+cHJlc2VudF92Ymxhbmtf ZXZlbnRfaWQgPSBldmVudC0+ZXZlbnRfaWQ7CisJCWRybW1vZGVfY3J0Yy0+cHJlc2VudF92Ymxh bmtfbXNjID0gbXNjOworCQlkcm1tb2RlX2NydGMtPnByZXNlbnRfdmJsYW5rX3VzZWMgPSB1c2Vj OworCX0gZWxzZQorCQlwcmVzZW50X2V2ZW50X25vdGlmeShldmVudC0+ZXZlbnRfaWQsIHVzZWMs IG1zYyk7CisKIAlmcmVlKGV2ZW50KTsKIH0KIApAQCAtMTQ0LDYgKzE2Miw3IEBAIHN0YXRpYyBp bnQKIGFtZGdwdV9wcmVzZW50X3F1ZXVlX3ZibGFuayhSUkNydGNQdHIgY3J0YywgdWludDY0X3Qg ZXZlbnRfaWQsIHVpbnQ2NF90IG1zYykKIHsKIAl4Zjg2Q3J0Y1B0ciB4Zjg2X2NydGMgPSBjcnRj LT5kZXZQcml2YXRlOworCWRybW1vZGVfY3J0Y19wcml2YXRlX3B0ciBkcm1tb2RlX2NydGMgPSB4 Zjg2X2NydGMtPmRyaXZlcl9wcml2YXRlOwogCVNjcmVlblB0ciBzY3JlZW4gPSBjcnRjLT5wU2Ny ZWVuOwogCXN0cnVjdCBhbWRncHVfcHJlc2VudF92YmxhbmtfZXZlbnQgKmV2ZW50OwogCXVpbnRw dHJfdCBkcm1fcXVldWVfc2VxOwpAQCAtMTUyLDYgKzE3MSw5IEBAIGFtZGdwdV9wcmVzZW50X3F1 ZXVlX3ZibGFuayhSUkNydGNQdHIgY3J0YywgdWludDY0X3QgZXZlbnRfaWQsIHVpbnQ2NF90IG1z YykKIAlpZiAoIWV2ZW50KQogCQlyZXR1cm4gQmFkQWxsb2M7CiAJZXZlbnQtPmV2ZW50X2lkID0g ZXZlbnRfaWQ7CisJZXZlbnQtPnZibGFua19mb3JfZmxpcCA9IGRybW1vZGVfY3J0Yy0+cHJlc2Vu dF9mbGlwX2V4cGVjdGVkOworCWRybW1vZGVfY3J0Yy0+cHJlc2VudF9mbGlwX2V4cGVjdGVkID0g RkFMU0U7CisKIAlkcm1fcXVldWVfc2VxID0gYW1kZ3B1X2RybV9xdWV1ZV9hbGxvYyh4Zjg2X2Ny dGMsCiAJCQkJCSAgICAgICBBTURHUFVfRFJNX1FVRVVFX0NMSUVOVF9ERUZBVUxULAogCQkJCQkg ICAgICAgZXZlbnRfaWQsIGV2ZW50LApAQCAtMjExLDggKzIzMywxNyBAQCBhbWRncHVfcHJlc2Vu dF9jaGVja191bmZsaXAoU2NybkluZm9QdHIgc2NybikKIAkJcmV0dXJuIEZBTFNFOwogCiAJZm9y IChpID0gMCwgbnVtX2NydGNzX29uID0gMDsgaSA8IGNvbmZpZy0+bnVtX2NydGM7IGkrKykgewot CQlpZiAoZHJtbW9kZV9jcnRjX2Nhbl9mbGlwKGNvbmZpZy0+Y3J0Y1tpXSkpCi0JCQludW1fY3J0 Y3Nfb24rKzsKKwkJeGY4NkNydGNQdHIgY3J0YyA9IGNvbmZpZy0+Y3J0Y1tpXTsKKworCQlpZiAo ZHJtbW9kZV9jcnRjX2Nhbl9mbGlwKGNydGMpKSB7CisJCQlkcm1tb2RlX2NydGNfcHJpdmF0ZV9w dHIgZHJtbW9kZV9jcnRjID0gY3J0Yy0+ZHJpdmVyX3ByaXZhdGU7CisKKwkJCWlmIChkcm1tb2Rl X2NydGMtPmZsaXBfcGVuZGluZykKKwkJCQlyZXR1cm4gRkFMU0U7CisKKwkJCWlmICghZHJtbW9k ZV9jcnRjLT50ZWFyX2ZyZWUpCisJCQkJbnVtX2NydGNzX29uKys7CisJCX0KIAl9CiAKIAlyZXR1 cm4gbnVtX2NydGNzX29uID4gMDsKQEAgLTIyNSw5ICsyNTYsMTkgQEAgc3RhdGljIEJvb2wKIGFt ZGdwdV9wcmVzZW50X2NoZWNrX2ZsaXAoUlJDcnRjUHRyIGNydGMsIFdpbmRvd1B0ciB3aW5kb3cs IFBpeG1hcFB0ciBwaXhtYXAsCiAJCQkgIEJvb2wgc3luY19mbGlwKQogeworCXhmODZDcnRjUHRy IHhmODZfY3J0YyA9IGNydGMtPmRldlByaXZhdGU7CisJZHJtbW9kZV9jcnRjX3ByaXZhdGVfcHRy IGRybW1vZGVfY3J0YyA9IHhmODZfY3J0Yy0+ZHJpdmVyX3ByaXZhdGU7CiAJU2NyZWVuUHRyIHNj cmVlbiA9IHdpbmRvdy0+ZHJhd2FibGUucFNjcmVlbjsKLQlTY3JuSW5mb1B0ciBzY3JuID0geGY4 NlNjcmVlblRvU2NybihzY3JlZW4pOworCVNjcm5JbmZvUHRyIHNjcm4gPSB4Zjg2X2NydGMtPnNj cm47CisJeGY4NkNydGNDb25maWdQdHIgY29uZmlnID0gWEY4Nl9DUlRDX0NPTkZJR19QVFIoc2Ny bik7CiAJQU1ER1BVSW5mb1B0ciBpbmZvID0gQU1ER1BVUFRSKHNjcm4pOworCWludCBudW1fY3J0 Y3Nfb247CisJaW50IGk7CisKKwlkcm1tb2RlX2NydGMtPnByZXNlbnRfZmxpcF9leHBlY3RlZCA9 IEZBTFNFOworCisJaWYgKCFzY3JuLT52dFNlbWEpCisJCXJldHVybiBGQUxTRTsKIAogCWlmICgh aW5mby0+YWxsb3dQYWdlRmxpcCkKIAkJcmV0dXJuIEZBTFNFOwpAQCAtMjQ1LDEwICsyODYsMTgg QEAgYW1kZ3B1X3ByZXNlbnRfY2hlY2tfZmxpcChSUkNydGNQdHIgY3J0YywgV2luZG93UHRyIHdp bmRvdywgUGl4bWFwUHRyIHBpeG1hcCwKIAkgICAgYW1kZ3B1X3BpeG1hcF9nZXRfdGlsaW5nX2lu Zm8oc2NyZWVuLT5HZXRTY3JlZW5QaXhtYXAoc2NyZWVuKSkpCiAJCXJldHVybiBGQUxTRTsKIAot CWlmICghZHJtbW9kZV9jcnRjX2Nhbl9mbGlwKGNydGMtPmRldlByaXZhdGUpKQorCWZvciAoaSA9 IDAsIG51bV9jcnRjc19vbiA9IDA7IGkgPCBjb25maWctPm51bV9jcnRjOyBpKyspIHsKKwkJaWYg KGRybW1vZGVfY3J0Y19jYW5fZmxpcChjb25maWctPmNydGNbaV0pKQorCQkJbnVtX2NydGNzX29u Kys7CisJCWVsc2UgaWYgKGNvbmZpZy0+Y3J0Y1tpXSA9PSBjcnRjLT5kZXZQcml2YXRlKQorCQkJ cmV0dXJuIEZBTFNFOworCX0KKworCWlmIChudW1fY3J0Y3Nfb24gPT0gMCkKIAkJcmV0dXJuIEZB TFNFOwogCi0JcmV0dXJuIGFtZGdwdV9wcmVzZW50X2NoZWNrX3VuZmxpcChzY3JuKTsKKwlkcm1t b2RlX2NydGMtPnByZXNlbnRfZmxpcF9leHBlY3RlZCA9IFRSVUU7CisJcmV0dXJuIFRSVUU7CiB9 CiAKIC8qCkBAIC0yODcsMTggKzMzNiwyMCBAQCBzdGF0aWMgQm9vbAogYW1kZ3B1X3ByZXNlbnRf ZmxpcChSUkNydGNQdHIgY3J0YywgdWludDY0X3QgZXZlbnRfaWQsIHVpbnQ2NF90IHRhcmdldF9t c2MsCiAgICAgICAgICAgICAgICAgICAgUGl4bWFwUHRyIHBpeG1hcCwgQm9vbCBzeW5jX2ZsaXAp CiB7CisJeGY4NkNydGNQdHIgeGY4Nl9jcnRjID0gY3J0Yy0+ZGV2UHJpdmF0ZTsKKwlkcm1tb2Rl X2NydGNfcHJpdmF0ZV9wdHIgZHJtbW9kZV9jcnRjID0geGY4Nl9jcnRjLT5kcml2ZXJfcHJpdmF0 ZTsKIAlTY3JlZW5QdHIgc2NyZWVuID0gY3J0Yy0+cFNjcmVlbjsKLQlTY3JuSW5mb1B0ciBzY3Ju ID0geGY4NlNjcmVlblRvU2NybihzY3JlZW4pOworCVNjcm5JbmZvUHRyIHNjcm4gPSB4Zjg2X2Ny dGMtPnNjcm47CiAJQU1ER1BVSW5mb1B0ciBpbmZvID0gQU1ER1BVUFRSKHNjcm4pOwogCXN0cnVj dCBhbWRncHVfcHJlc2VudF92YmxhbmtfZXZlbnQgKmV2ZW50OwotCUJvb2wgcmV0OworCUJvb2wg cmV0ID0gRkFMU0U7CiAKIAlpZiAoIWFtZGdwdV9wcmVzZW50X2NoZWNrX2ZsaXAoY3J0Yywgc2Ny ZWVuLT5yb290LCBwaXhtYXAsIHN5bmNfZmxpcCkpCi0JCXJldHVybiBGQUxTRTsKKwkJZ290byBv dXQ7CiAKIAlldmVudCA9IGNhbGxvYygxLCBzaXplb2Yoc3RydWN0IGFtZGdwdV9wcmVzZW50X3Zi bGFua19ldmVudCkpOwogCWlmICghZXZlbnQpCi0JCXJldHVybiBGQUxTRTsKKwkJZ290byBvdXQ7 CiAKIAlldmVudC0+ZXZlbnRfaWQgPSBldmVudF9pZDsKIApAQCAtMzE1LDYgKzM2Niw4IEBAIGFt ZGdwdV9wcmVzZW50X2ZsaXAoUlJDcnRjUHRyIGNydGMsIHVpbnQ2NF90IGV2ZW50X2lkLCB1aW50 NjRfdCB0YXJnZXRfbXNjLAogCWVsc2UKIAkJaW5mby0+ZHJtbW9kZS5wcmVzZW50X2ZsaXBwaW5n ID0gVFJVRTsKIAorIG91dDoKKwlkcm1tb2RlX2NydGMtPnByZXNlbnRfZmxpcF9leHBlY3RlZCA9 IEZBTFNFOwogCXJldHVybiByZXQ7CiB9CiAKQEAgLTM1OCw3ICs0MTEsNyBAQCBtb2Rlc2V0Ogog CQl4Zjg2Q3J0Y1B0ciBjcnRjID0gY29uZmlnLT5jcnRjW2ldOwogCQlkcm1tb2RlX2NydGNfcHJp dmF0ZV9wdHIgZHJtbW9kZV9jcnRjID0gY3J0Yy0+ZHJpdmVyX3ByaXZhdGU7CiAKLQkJaWYgKCFj cnRjLT5lbmFibGVkKQorCQlpZiAoIWNydGMtPmVuYWJsZWQgfHwgZHJtbW9kZV9jcnRjLT50ZWFy X2ZyZWUpCiAJCQljb250aW51ZTsKIAogCQlpZiAoZHJtbW9kZV9jcnRjLT5kcG1zX21vZGUgPT0g RFBNU01vZGVPbikKZGlmZiAtLWdpdCBhL3NyYy9kcm1tb2RlX2Rpc3BsYXkuYyBiL3NyYy9kcm1t b2RlX2Rpc3BsYXkuYwppbmRleCBmYTE5ZmQ3YWIuLmVkZDk1NWVjZSAxMDA2NDQKLS0tIGEvc3Jj L2RybW1vZGVfZGlzcGxheS5jCisrKyBiL3NyYy9kcm1tb2RlX2Rpc3BsYXkuYwpAQCAtNTUwLDYg KzU1MCwxNCBAQCBlcnJvcjoKIHN0YXRpYyB2b2lkCiBhbWRncHVfc2NyZWVuX2RhbWFnZV9yZXBv cnQoRGFtYWdlUHRyIGRhbWFnZSwgUmVnaW9uUHRyIHJlZ2lvbiwgdm9pZCAqY2xvc3VyZSkKIHsK Kwlkcm1tb2RlX2NydGNfcHJpdmF0ZV9wdHIgZHJtbW9kZV9jcnRjID0gY2xvc3VyZTsKKworCWlm IChkcm1tb2RlX2NydGMtPmlnbm9yZV9kYW1hZ2UpIHsKKwkJUmVnaW9uRW1wdHkoJmRhbWFnZS0+ ZGFtYWdlKTsKKwkJZHJtbW9kZV9jcnRjLT5pZ25vcmVfZGFtYWdlID0gRkFMU0U7CisJCXJldHVy bjsKKwl9CisKIAkvKiBPbmx5IGtlZXAgdHJhY2sgb2YgdGhlIGV4dGVudHMgKi8KIAlSZWdpb25V bmluaXQoJmRhbWFnZS0+ZGFtYWdlKTsKIAlkYW1hZ2UtPmRhbWFnZS5kYXRhID0gTlVMTDsKQEAg LTIyNTMsNyArMjI2MSw4IEBAIGRybW1vZGVfZmxpcF9oYW5kbGVyKHhmODZDcnRjUHRyIGNydGMs IHVpbnQzMl90IGZyYW1lLCB1aW50NjRfdCB1c2VjLCB2b2lkICpldmVuCiAKIAlkcm1tb2RlX2Zi X3JlZmVyZW5jZShwQU1ER1BVRW50LT5mZCwgJmRybW1vZGVfY3J0Yy0+ZmIsCiAJCQkgICAgIGZs aXBkYXRhLT5mYik7Ci0JaWYgKGRybW1vZGVfY3J0Yy0+ZmxpcF9wZW5kaW5nID09IGZsaXBkYXRh LT5mYikgeworCWlmIChkcm1tb2RlX2NydGMtPnRlYXJfZnJlZSB8fAorCSAgICBkcm1tb2RlX2Ny dGMtPmZsaXBfcGVuZGluZyA9PSBmbGlwZGF0YS0+ZmIpIHsKIAkJZHJtbW9kZV9mYl9yZWZlcmVu Y2UocEFNREdQVUVudC0+ZmQsCiAJCQkJICAgICAmZHJtbW9kZV9jcnRjLT5mbGlwX3BlbmRpbmcs IE5VTEwpOwogCX0KQEAgLTI3OTgsMTMgKzI4MDcsMTYgQEAgQm9vbCBhbWRncHVfZG9fcGFnZWZs aXAoU2NybkluZm9QdHIgc2NybiwgQ2xpZW50UHRyIGNsaWVudCwKIAlmbGlwZGF0YS0+ZmVfY3J0 YyA9IHJlZl9jcnRjOwogCiAJZm9yIChpID0gMDsgaSA8IGNvbmZpZy0+bnVtX2NydGM7IGkrKykg eworCQlzdHJ1Y3QgZHJtbW9kZV9mYiAqZmIgPSBmbGlwZGF0YS0+ZmI7CisKIAkJY3J0YyA9IGNv bmZpZy0+Y3J0Y1tpXTsKKwkJZHJtbW9kZV9jcnRjID0gY3J0Yy0+ZHJpdmVyX3ByaXZhdGU7CiAK LQkJaWYgKCFkcm1tb2RlX2NydGNfY2FuX2ZsaXAoY3J0YykpCisJCWlmICghZHJtbW9kZV9jcnRj X2Nhbl9mbGlwKGNydGMpIHx8CisJCSAgICAoZHJtbW9kZV9jcnRjLT50ZWFyX2ZyZWUgJiYgY3J0 YyAhPSByZWZfY3J0YykpCiAJCQljb250aW51ZTsKIAogCQlmbGlwZGF0YS0+ZmxpcF9jb3VudCsr OwotCQlkcm1tb2RlX2NydGMgPSBjcnRjLT5kcml2ZXJfcHJpdmF0ZTsKIAogCQlkcm1fcXVldWVf c2VxID0gYW1kZ3B1X2RybV9xdWV1ZV9hbGxvYyhjcnRjLCBjbGllbnQsIGlkLAogCQkJCQkJICAg ICAgIGZsaXBkYXRhLApAQCAtMjgxNiwxMCArMjgyOCwzOSBAQCBCb29sIGFtZGdwdV9kb19wYWdl ZmxpcChTY3JuSW5mb1B0ciBzY3JuLCBDbGllbnRQdHIgY2xpZW50LAogCQkJZ290byBlcnJvcjsK IAkJfQogCisJCWlmIChkcm1tb2RlX2NydGMtPnRlYXJfZnJlZSkgeworCQkJQm94UmVjIGV4dGVu dHMgPSB7IC54MSA9IDAsIC55MSA9IDAsCisJCQkJCSAgIC54MiA9IG5ld19mcm9udC0+ZHJhd2Fi bGUud2lkdGgsCisJCQkJCSAgIC55MiA9IG5ld19mcm9udC0+ZHJhd2FibGUuaGVpZ2h0IH07CisJ CQlpbnQgc2Nhbm91dF9pZCA9IGRybW1vZGVfY3J0Yy0+c2Nhbm91dF9pZCBeIDE7CisKKwkJCWlm IChmbGlwX3N5bmMgPT0gRkxJUF9BU1lOQykgeworCQkJCWlmICghZHJtbW9kZV93YWl0X3ZibGFu ayhjcnRjLAorCQkJCQkJCSBEUk1fVkJMQU5LX1JFTEFUSVZFIHwKKwkJCQkJCQkgRFJNX1ZCTEFO S19FVkVOVCwKKwkJCQkJCQkgMCwgZHJtX3F1ZXVlX3NlcSwKKwkJCQkJCQkgTlVMTCwgTlVMTCkp CisJCQkJCWdvdG8gZmxpcF9lcnJvcjsKKwkJCQlnb3RvIG5leHQ7CisJCQl9CisKKwkJCWZiID0g YW1kZ3B1X3BpeG1hcF9nZXRfZmIoZHJtbW9kZV9jcnRjLT5zY2Fub3V0W3NjYW5vdXRfaWRdLnBp eG1hcCk7CisJCQlpZiAoIWZiKSB7CisJCQkJRXJyb3JGKCJGYWlsZWQgdG8gZ2V0IEZCIGZvciBU ZWFyRnJlZSBmbGlwXG4iKTsKKwkJCQlnb3RvIGVycm9yOworCQkJfQorCisJCQlhbWRncHVfc2Nh bm91dF9kb191cGRhdGUoY3J0Yywgc2Nhbm91dF9pZCwKKwkJCQkJCSAmbmV3X2Zyb250LT5kcmF3 YWJsZSwgJmV4dGVudHMpOworCisJCQlkcm1tb2RlX2NydGNfd2FpdF9wZW5kaW5nX2V2ZW50KGRy bW1vZGVfY3J0YywgcEFNREdQVUVudC0+ZmQsCisJCQkJCQkJZHJtbW9kZV9jcnRjLT5zY2Fub3V0 X3VwZGF0ZV9wZW5kaW5nKTsKKwkJfQorCiAJCWlmIChjcnRjID09IHJlZl9jcnRjKSB7CiAJCQlp ZiAoZHJtbW9kZV9wYWdlX2ZsaXBfdGFyZ2V0X2Fic29sdXRlKHBBTURHUFVFbnQsCiAJCQkJCQkJ ICAgICAgZHJtbW9kZV9jcnRjLAotCQkJCQkJCSAgICAgIGZsaXBkYXRhLT5mYi0+aGFuZGxlLAor CQkJCQkJCSAgICAgIGZiLT5oYW5kbGUsCiAJCQkJCQkJICAgICAgZmxpcF9mbGFncywKIAkJCQkJ CQkgICAgICBkcm1fcXVldWVfc2VxLAogCQkJCQkJCSAgICAgIHRhcmdldF9tc2MpICE9IDApCkBA IC0yODI3LDE0ICsyODY4LDIwIEBAIEJvb2wgYW1kZ3B1X2RvX3BhZ2VmbGlwKFNjcm5JbmZvUHRy IHNjcm4sIENsaWVudFB0ciBjbGllbnQsCiAJCX0gZWxzZSB7CiAJCQlpZiAoZHJtbW9kZV9wYWdl X2ZsaXBfdGFyZ2V0X3JlbGF0aXZlKHBBTURHUFVFbnQsCiAJCQkJCQkJICAgICAgZHJtbW9kZV9j cnRjLAotCQkJCQkJCSAgICAgIGZsaXBkYXRhLT5mYi0+aGFuZGxlLAorCQkJCQkJCSAgICAgIGZi LT5oYW5kbGUsCiAJCQkJCQkJICAgICAgZmxpcF9mbGFncywKIAkJCQkJCQkgICAgICBkcm1fcXVl dWVfc2VxLCAwKSAhPSAwKQogCQkJCWdvdG8gZmxpcF9lcnJvcjsKIAkJfQogCi0JCWRybW1vZGVf ZmJfcmVmZXJlbmNlKHBBTURHUFVFbnQtPmZkLCAmZHJtbW9kZV9jcnRjLT5mbGlwX3BlbmRpbmcs Ci0JCQkJICAgICBmbGlwZGF0YS0+ZmIpOworCQlpZiAoZHJtbW9kZV9jcnRjLT50ZWFyX2ZyZWUp IHsKKwkJCWRybW1vZGVfY3J0Yy0+c2Nhbm91dF9pZCBePSAxOworCQkJZHJtbW9kZV9jcnRjLT5p Z25vcmVfZGFtYWdlID0gVFJVRTsKKwkJfQorCisJbmV4dDoKKwkJZHJtbW9kZV9mYl9yZWZlcmVu Y2UocEFNREdQVUVudC0+ZmQsCisJCQkJICAgICAmZHJtbW9kZV9jcnRjLT5mbGlwX3BlbmRpbmcs IGZiKTsKIAkJZHJtX3F1ZXVlX3NlcSA9IDA7CiAJfQogCmRpZmYgLS1naXQgYS9zcmMvZHJtbW9k ZV9kaXNwbGF5LmggYi9zcmMvZHJtbW9kZV9kaXNwbGF5LmgKaW5kZXggYjU3ODhlMjk1Li4xYTY0 NTRjMTIgMTAwNjQ0Ci0tLSBhL3NyYy9kcm1tb2RlX2Rpc3BsYXkuaAorKysgYi9zcmMvZHJtbW9k ZV9kaXNwbGF5LmgKQEAgLTgxLDYgKzgxLDcgQEAgdHlwZWRlZiBzdHJ1Y3QgewogCXN0cnVjdCBk cm1tb2RlX3NjYW5vdXQgcm90YXRlOwogCXN0cnVjdCBkcm1tb2RlX3NjYW5vdXQgc2Nhbm91dFsy XTsKIAlEYW1hZ2VQdHIgc2Nhbm91dF9kYW1hZ2U7CisJQm9vbCBpZ25vcmVfZGFtYWdlOwogCVJl Z2lvblJlYyBzY2Fub3V0X2xhc3RfcmVnaW9uOwogCXVuc2lnbmVkIHNjYW5vdXRfaWQ7CiAJQm9v bCBzY2Fub3V0X3VwZGF0ZV9wZW5kaW5nOwpAQCAtMTAwLDYgKzEwMSwxNCBAQCB0eXBlZGVmIHN0 cnVjdCB7CiAJc3RydWN0IGRybW1vZGVfZmIgKmZsaXBfcGVuZGluZzsKIAkvKiBUaGUgRkIgY3Vy cmVudGx5IGJlaW5nIHNjYW5uZWQgb3V0IGJ5IHRoaXMgQ1JUQywgaWYgYW55ICovCiAJc3RydWN0 IGRybW1vZGVfZmIgKmZiOworCisjaWZkZWYgSEFWRV9QUkVTRU5UX0gKKwkvKiBEZWZlcnJlZCBw cm9jZXNzaW5nIG9mIFByZXNlbnQgdmJsYW5rIGV2ZW50ICovCisJdWludDY0X3QgcHJlc2VudF92 YmxhbmtfZXZlbnRfaWQ7CisJdWludDY0X3QgcHJlc2VudF92YmxhbmtfdXNlYzsKKwl1bnNpZ25l ZCBwcmVzZW50X3ZibGFua19tc2M7CisJQm9vbCBwcmVzZW50X2ZsaXBfZXhwZWN0ZWQ7CisjZW5k aWYKIH0gZHJtbW9kZV9jcnRjX3ByaXZhdGVfcmVjLCAqZHJtbW9kZV9jcnRjX3ByaXZhdGVfcHRy OwogCiB0eXBlZGVmIHN0cnVjdCB7CkBAIC0xMzksNyArMTQ4LDggQEAgZHJtbW9kZV9jcnRjX2Nh bl9mbGlwKHhmODZDcnRjUHRyIGNydGMpCiAJcmV0dXJuIGNydGMtPmVuYWJsZWQgJiYKIAkJZHJt bW9kZV9jcnRjLT5kcG1zX21vZGUgPT0gRFBNU01vZGVPbiAmJgogCQkhZHJtbW9kZV9jcnRjLT5y b3RhdGUuYm8gJiYKLQkJIWRybW1vZGVfY3J0Yy0+c2Nhbm91dFtkcm1tb2RlX2NydGMtPnNjYW5v dXRfaWRdLmJvOworCQkoZHJtbW9kZV9jcnRjLT50ZWFyX2ZyZWUgfHwKKwkJICFkcm1tb2RlX2Ny dGMtPnNjYW5vdXRbZHJtbW9kZV9jcnRjLT5zY2Fub3V0X2lkXS5ibyk7CiB9CiAKIAotLSAKMi4x NC4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwphbWQt Z2Z4IG1haWxpbmcgbGlzdAphbWQtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xp c3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2FtZC1nZngK