From: =?UTF-8?q?Michel=20D=C3=A4nzer?= Subject: [PATCH xf86-video-amdgpu 3/4] Defer vblank event handling while waiting for a pending flip Date: Tue, 24 Jul 2018 19:16:55 +0200 Message-ID: <20180724171656.13378-3-michel@daenzer.net> References: <20180724171656.13378-1-michel@daenzer.net> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20180724171656.13378-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+CgpUaGlzIGlzIGEg bW9yZSByb2J1c3Qgd2F5IHRvIHByZXZlbnQgaGFuZ3MgZHVlIHRvIG5lc3RlZCBjYWxscyB0bwpk cm1IYW5kbGVFdmVudC4KClNpZ25lZC1vZmYtYnk6IE1pY2hlbCBEw6RuemVyIDxtaWNoZWwuZGFl bnplckBhbWQuY29tPgotLS0KIHNyYy9hbWRncHVfZHJtX3F1ZXVlLmMgfCAxMjQgKysrKysrKysr KysrKysrKysrKysrKysrKysrKysrKysrKysrKy0tLS0KIHNyYy9hbWRncHVfZHJtX3F1ZXVlLmgg fCAgIDEgKwogc3JjL2RybW1vZGVfZGlzcGxheS5jICB8ICAxOCArKysrLS0KIHNyYy9kcm1tb2Rl X2Rpc3BsYXkuaCAgfCAgIDQgKysKIDQgZmlsZXMgY2hhbmdlZCwgMTMxIGluc2VydGlvbnMoKyks IDE2IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL3NyYy9hbWRncHVfZHJtX3F1ZXVlLmMgYi9z cmMvYW1kZ3B1X2RybV9xdWV1ZS5jCmluZGV4IDljMDE2NjE0Ny4uZDQzNTNlNzAzIDEwMDY0NAot LS0gYS9zcmMvYW1kZ3B1X2RybV9xdWV1ZS5jCisrKyBiL3NyYy9hbWRncHVfZHJtX3F1ZXVlLmMK QEAgLTQwLDYgKzQwLDcgQEAKIAogc3RydWN0IGFtZGdwdV9kcm1fcXVldWVfZW50cnkgewogCXN0 cnVjdCB4b3JnX2xpc3QgbGlzdDsKKwl1aW50NjRfdCB1c2VjOwogCXVpbnQ2NF90IGlkOwogCXVp bnRwdHJfdCBzZXE7CiAJdm9pZCAqZGF0YTsKQEAgLTQ3LDEzICs0OCwyNyBAQCBzdHJ1Y3QgYW1k Z3B1X2RybV9xdWV1ZV9lbnRyeSB7CiAJeGY4NkNydGNQdHIgY3J0YzsKIAlhbWRncHVfZHJtX2hh bmRsZXJfcHJvYyBoYW5kbGVyOwogCWFtZGdwdV9kcm1fYWJvcnRfcHJvYyBhYm9ydDsKKwl1bnNp Z25lZCBpbnQgZnJhbWU7CiB9OwogCiBzdGF0aWMgaW50IGFtZGdwdV9kcm1fcXVldWVfcmVmY250 Owogc3RhdGljIHN0cnVjdCB4b3JnX2xpc3QgYW1kZ3B1X2RybV9xdWV1ZTsKK3N0YXRpYyBzdHJ1 Y3QgeG9yZ19saXN0IGFtZGdwdV9kcm1fcXVldWVfZGVmZXJyZWQ7CiBzdGF0aWMgdWludHB0cl90 IGFtZGdwdV9kcm1fcXVldWVfc2VxOwogCiAKK3N0YXRpYyB2b2lkCithbWRncHVfZHJtX3F1ZXVl X2hhbmRsZV9vbmUoc3RydWN0IGFtZGdwdV9kcm1fcXVldWVfZW50cnkgKmUsIHVuc2lnbmVkIGlu dCBmcmFtZSwKKwkJCSAgICB1aW50NjRfdCB1c2VjKQoreworCXhvcmdfbGlzdF9kZWwoJmUtPmxp c3QpOworCWlmIChlLT5oYW5kbGVyKSB7CisJCWUtPmhhbmRsZXIoZS0+Y3J0YywgZnJhbWUsIHVz ZWMsIGUtPmRhdGEpOworCX0gZWxzZQorCQllLT5hYm9ydChlLT5jcnRjLCBlLT5kYXRhKTsKKwlm cmVlKGUpOworfQorCiAvKgogICogSGFuZGxlIGEgRFJNIGV2ZW50CiAgKi8KQEAgLTY2LDE5ICs4 MSw4MCBAQCBhbWRncHVfZHJtX3F1ZXVlX2hhbmRsZXIoaW50IGZkLCB1bnNpZ25lZCBpbnQgZnJh bWUsIHVuc2lnbmVkIGludCBzZWMsCiAKIAl4b3JnX2xpc3RfZm9yX2VhY2hfZW50cnlfc2FmZShl LCB0bXAsICZhbWRncHVfZHJtX3F1ZXVlLCBsaXN0KSB7CiAJCWlmIChlLT5zZXEgPT0gc2VxKSB7 Ci0JCQl4b3JnX2xpc3RfZGVsKCZlLT5saXN0KTsKLQkJCWlmIChlLT5oYW5kbGVyKQotCQkJCWUt PmhhbmRsZXIoZS0+Y3J0YywgZnJhbWUsCi0JCQkJCSAgICh1aW50NjRfdClzZWMgKiAxMDAwMDAw ICsgdXNlYywKLQkJCQkJICAgZS0+ZGF0YSk7Ci0JCQllbHNlCi0JCQkJZS0+YWJvcnQoZS0+Y3J0 YywgZS0+ZGF0YSk7Ci0JCQlmcmVlKGUpOworCQkJYW1kZ3B1X2RybV9xdWV1ZV9oYW5kbGVfb25l KGUsIGZyYW1lLCAodWludDY0X3Qpc2VjICoKKwkJCQkJCSAgICAxMDAwMDAwICsgdXNlYyk7CiAJ CQlicmVhazsKIAkJfQogCX0KIH0KIAorLyoKKyAqIEhhbmRsZSBhIERSTSB2YmxhbmsgZXZlbnQK KyAqLworc3RhdGljIHZvaWQKK2FtZGdwdV9kcm1fcXVldWVfdmJsYW5rX2hhbmRsZXIoaW50IGZk LCB1bnNpZ25lZCBpbnQgZnJhbWUsIHVuc2lnbmVkIGludCBzZWMsCisJCQkJdW5zaWduZWQgaW50 IHVzZWMsIHZvaWQgKnVzZXJfcHRyKQoreworCXVpbnRwdHJfdCBzZXEgPSAodWludHB0cl90KXVz ZXJfcHRyOworCXN0cnVjdCBhbWRncHVfZHJtX3F1ZXVlX2VudHJ5ICplLCAqdG1wOworCisJeG9y Z19saXN0X2Zvcl9lYWNoX2VudHJ5X3NhZmUoZSwgdG1wLCAmYW1kZ3B1X2RybV9xdWV1ZSwgbGlz dCkgeworCQlpZiAoZS0+c2VxID09IHNlcSkgeworCQkJQU1ER1BVSW5mb1B0ciBpbmZvID0gQU1E R1BVUFRSKGUtPmNydGMtPnNjcm4pOworCQkJZHJtbW9kZV9wdHIgZHJtbW9kZSA9ICZpbmZvLT5k cm1tb2RlOworCisJCQllLT51c2VjID0gKHVpbnQ2NF90KXNlYyAqIDEwMDAwMDAgKyB1c2VjOwor CisJCQlpZiAoZHJtbW9kZS0+ZXZlbnRfY29udGV4dC52YmxhbmtfaGFuZGxlciA9PQorCQkJICAg IGFtZGdwdV9kcm1fcXVldWVfdmJsYW5rX2hhbmRsZXIpIHsKKwkJCQlhbWRncHVfZHJtX3F1ZXVl X2hhbmRsZV9vbmUoZSwgZnJhbWUsIGUtPnVzZWMpOworCQkJfSBlbHNlIHsKKwkJCQl4b3JnX2xp c3RfZGVsKCZlLT5saXN0KTsKKwkJCQllLT5mcmFtZSA9IGZyYW1lOworCQkJCXhvcmdfbGlzdF9h cHBlbmQoJmUtPmxpc3QsCisJCQkJCQkgJmFtZGdwdV9kcm1fcXVldWVfZGVmZXJyZWQpOworCQkJ fQorCisJCQlicmVhazsKKwkJfQorCX0KK30KKworLyoKKyAqIFJlLXF1ZXVlIGEgRFJNIHZibGFu ayBldmVudCBmb3IgZGVmZXJyZWQgaGFuZGxpbmcKKyAqLworc3RhdGljIHZvaWQKK2FtZGdwdV9k cm1fcXVldWVfdmJsYW5rX2RlZmVyKGludCBmZCwgdW5zaWduZWQgaW50IGZyYW1lLCB1bnNpZ25l ZCBpbnQgc2VjLAorCQkJICAgICAgdW5zaWduZWQgaW50IHVzZWMsIHZvaWQgKnVzZXJfcHRyKQor eworCWFtZGdwdV9kcm1fcXVldWVfdmJsYW5rX2hhbmRsZXIoZmQsIGZyYW1lLCBzZWMsIHVzZWMs IHVzZXJfcHRyKTsKK30KKworLyoKKyAqIEhhbmRsZSBkZWZlcnJlZCBEUk0gdmJsYW5rIGV2ZW50 cworICoKKyAqIFRoaXMgZnVuY3Rpb24gbXVzdCBiZSBjYWxsZWQgYWZ0ZXIgYW1kZ3B1X2RybV93 YWl0X3BlbmRpbmdfZmxpcCwgb25jZQorICogaXQncyBzYWZlIHRvIGF0dGVtcHQgcXVldWVpbmcg YSBmbGlwIGFnYWluCisgKi8KK3ZvaWQKK2FtZGdwdV9kcm1fcXVldWVfaGFuZGxlX2RlZmVycmVk KHhmODZDcnRjUHRyIGNydGMpCit7CisJZHJtbW9kZV9jcnRjX3ByaXZhdGVfcHRyIGRybW1vZGVf Y3J0YyA9IGNydGMtPmRyaXZlcl9wcml2YXRlOworCWRybW1vZGVfcHRyIGRybW1vZGUgPSBkcm1t b2RlX2NydGMtPmRybW1vZGU7CisJc3RydWN0IGFtZGdwdV9kcm1fcXVldWVfZW50cnkgKmUsICp0 bXA7CisKKwlpZiAoZHJtbW9kZV9jcnRjLT53YWl0X2ZsaXBfbmVzdGluZ19sZXZlbCA9PSAwIHx8 CisJICAgIC0tZHJtbW9kZV9jcnRjLT53YWl0X2ZsaXBfbmVzdGluZ19sZXZlbCA+IDApCisJCXJl dHVybjsKKworCXhvcmdfbGlzdF9mb3JfZWFjaF9lbnRyeV9zYWZlKGUsIHRtcCwgJmFtZGdwdV9k cm1fcXVldWVfZGVmZXJyZWQsIGxpc3QpIHsKKwkJaWYgKGUtPmNydGMgPT0gY3J0YykKKwkJCWFt ZGdwdV9kcm1fcXVldWVfaGFuZGxlX29uZShlLCBlLT5mcmFtZSwgZS0+dXNlYyk7CisJfQorCisJ ZHJtbW9kZS0+ZXZlbnRfY29udGV4dC52YmxhbmtfaGFuZGxlciA9IGFtZGdwdV9kcm1fcXVldWVf dmJsYW5rX2hhbmRsZXI7Cit9CisKIC8qCiAgKiBFbnF1ZXVlIGEgcG90ZW50aWFsIGRybSByZXNw b25zZTsgd2hlbiB0aGUgYXNzb2NpYXRlZCByZXNwb25zZQogICogYXBwZWFycywgd2UndmUgZ290 IGRhdGEgdG8gcGFzcyB0byB0aGUgaGFuZGxlciBmcm9tIGhlcmUKQEAgLTEzNCwxMiArMjEwLDE3 IEBAIGFtZGdwdV9kcm1fYWJvcnRfb25lKHN0cnVjdCBhbWRncHVfZHJtX3F1ZXVlX2VudHJ5ICpl KQogdm9pZAogYW1kZ3B1X2RybV9hYm9ydF9jbGllbnQoQ2xpZW50UHRyIGNsaWVudCkKIHsKLQlz dHJ1Y3QgYW1kZ3B1X2RybV9xdWV1ZV9lbnRyeSAqZTsKKwlzdHJ1Y3QgYW1kZ3B1X2RybV9xdWV1 ZV9lbnRyeSAqZSwgKnRtcDsKIAogCXhvcmdfbGlzdF9mb3JfZWFjaF9lbnRyeShlLCAmYW1kZ3B1 X2RybV9xdWV1ZSwgbGlzdCkgewogCQlpZiAoZS0+Y2xpZW50ID09IGNsaWVudCkKIAkJCWUtPmhh bmRsZXIgPSBOVUxMOwogCX0KKworCXhvcmdfbGlzdF9mb3JfZWFjaF9lbnRyeV9zYWZlKGUsIHRt cCwgJmFtZGdwdV9kcm1fcXVldWVfZGVmZXJyZWQsIGxpc3QpIHsKKwkJaWYgKGUtPmNsaWVudCA9 PSBjbGllbnQpCisJCQlhbWRncHVfZHJtX2Fib3J0X29uZShlKTsKKwl9CiB9CiAKIC8qCkBAIC0x NTMsNiArMjM0LDEzIEBAIGFtZGdwdV9kcm1fYWJvcnRfZW50cnkodWludHB0cl90IHNlcSkKIAlp ZiAoc2VxID09IEFNREdQVV9EUk1fUVVFVUVfRVJST1IpCiAJCXJldHVybjsKIAorCXhvcmdfbGlz dF9mb3JfZWFjaF9lbnRyeV9zYWZlKGUsIHRtcCwgJmFtZGdwdV9kcm1fcXVldWVfZGVmZXJyZWQs IGxpc3QpIHsKKwkJaWYgKGUtPnNlcSA9PSBzZXEpIHsKKwkJCWFtZGdwdV9kcm1fYWJvcnRfb25l KGUpOworCQkJcmV0dXJuOworCQl9CisJfQorCiAJeG9yZ19saXN0X2Zvcl9lYWNoX2VudHJ5X3Nh ZmUoZSwgdG1wLCAmYW1kZ3B1X2RybV9xdWV1ZSwgbGlzdCkgewogCQlpZiAoZS0+c2VxID09IHNl cSkgewogCQkJYW1kZ3B1X2RybV9hYm9ydF9vbmUoZSk7CkBAIC0xNjksNiArMjU3LDEzIEBAIGFt ZGdwdV9kcm1fYWJvcnRfaWQodWludDY0X3QgaWQpCiB7CiAJc3RydWN0IGFtZGdwdV9kcm1fcXVl dWVfZW50cnkgKmUsICp0bXA7CiAKKwl4b3JnX2xpc3RfZm9yX2VhY2hfZW50cnlfc2FmZShlLCB0 bXAsICZhbWRncHVfZHJtX3F1ZXVlX2RlZmVycmVkLCBsaXN0KSB7CisJCWlmIChlLT5pZCA9PSBp ZCkgeworCQkJYW1kZ3B1X2RybV9hYm9ydF9vbmUoZSk7CisJCQlicmVhazsKKwkJfQorCX0KKwog CXhvcmdfbGlzdF9mb3JfZWFjaF9lbnRyeV9zYWZlKGUsIHRtcCwgJmFtZGdwdV9kcm1fcXVldWUs IGxpc3QpIHsKIAkJaWYgKGUtPmlkID09IGlkKSB7CiAJCQlhbWRncHVfZHJtX2Fib3J0X29uZShl KTsKQEAgLTE4Niw2ICsyODEsOSBAQCB2b2lkIGFtZGdwdV9kcm1fd2FpdF9wZW5kaW5nX2ZsaXAo eGY4NkNydGNQdHIgY3J0YykKIAlBTURHUFVFbnRQdHIgcEFNREdQVUVudCA9IEFNREdQVUVudFBy aXYoY3J0Yy0+c2Nybik7CiAJZHJtbW9kZV9wdHIgZHJtbW9kZSA9IGRybW1vZGVfY3J0Yy0+ZHJt bW9kZTsKIAorCWRybW1vZGVfY3J0Yy0+d2FpdF9mbGlwX25lc3RpbmdfbGV2ZWwrKzsKKwlkcm1t b2RlLT5ldmVudF9jb250ZXh0LnZibGFua19oYW5kbGVyID0gYW1kZ3B1X2RybV9xdWV1ZV92Ymxh bmtfZGVmZXI7CisKIAl3aGlsZSAoZHJtbW9kZV9jcnRjLT5mbGlwX3BlbmRpbmcgJiYKIAkgICAg ICAgZHJtSGFuZGxlRXZlbnQocEFNREdQVUVudC0+ZmQsICZkcm1tb2RlLT5ldmVudF9jb250ZXh0 KSA+IDApOwogfQpAQCAtMjAwLDEzICsyOTgsMTQgQEAgYW1kZ3B1X2RybV9xdWV1ZV9pbml0KFNj cm5JbmZvUHRyIHNjcm4pCiAJZHJtbW9kZV9wdHIgZHJtbW9kZSA9ICZpbmZvLT5kcm1tb2RlOwog CiAJZHJtbW9kZS0+ZXZlbnRfY29udGV4dC52ZXJzaW9uID0gMjsKLQlkcm1tb2RlLT5ldmVudF9j b250ZXh0LnZibGFua19oYW5kbGVyID0gYW1kZ3B1X2RybV9xdWV1ZV9oYW5kbGVyOworCWRybW1v ZGUtPmV2ZW50X2NvbnRleHQudmJsYW5rX2hhbmRsZXIgPSBhbWRncHVfZHJtX3F1ZXVlX3ZibGFu a19oYW5kbGVyOwogCWRybW1vZGUtPmV2ZW50X2NvbnRleHQucGFnZV9mbGlwX2hhbmRsZXIgPSBh bWRncHVfZHJtX3F1ZXVlX2hhbmRsZXI7CiAKIAlpZiAoYW1kZ3B1X2RybV9xdWV1ZV9yZWZjbnQr KykKIAkJcmV0dXJuOwogCiAJeG9yZ19saXN0X2luaXQoJmFtZGdwdV9kcm1fcXVldWUpOworCXhv cmdfbGlzdF9pbml0KCZhbWRncHVfZHJtX3F1ZXVlX2RlZmVycmVkKTsKIH0KIAogLyoKQEAgLTIy Miw1ICszMjEsMTAgQEAgYW1kZ3B1X2RybV9xdWV1ZV9jbG9zZShTY3JuSW5mb1B0ciBzY3JuKQog CQkJYW1kZ3B1X2RybV9hYm9ydF9vbmUoZSk7CiAJfQogCisJeG9yZ19saXN0X2Zvcl9lYWNoX2Vu dHJ5X3NhZmUoZSwgdG1wLCAmYW1kZ3B1X2RybV9xdWV1ZV9kZWZlcnJlZCwgbGlzdCkgeworCQlp ZiAoZS0+Y3J0Yy0+c2NybiA9PSBzY3JuKQorCQkJYW1kZ3B1X2RybV9hYm9ydF9vbmUoZSk7CisJ fQorCiAJYW1kZ3B1X2RybV9xdWV1ZV9yZWZjbnQtLTsKIH0KZGlmZiAtLWdpdCBhL3NyYy9hbWRn cHVfZHJtX3F1ZXVlLmggYi9zcmMvYW1kZ3B1X2RybV9xdWV1ZS5oCmluZGV4IGNiNmQ1ZmY1OS4u NzU2MDllMzliIDEwMDY0NAotLS0gYS9zcmMvYW1kZ3B1X2RybV9xdWV1ZS5oCisrKyBiL3NyYy9h bWRncHVfZHJtX3F1ZXVlLmgKQEAgLTQyLDYgKzQyLDcgQEAgdHlwZWRlZiB2b2lkICgqYW1kZ3B1 X2RybV9oYW5kbGVyX3Byb2MpKHhmODZDcnRjUHRyIGNydGMsIHVpbnQzMl90IHNlcSwKIAkJCQkJ dWludDY0X3QgdXNlYywgdm9pZCAqZGF0YSk7CiB0eXBlZGVmIHZvaWQgKCphbWRncHVfZHJtX2Fi b3J0X3Byb2MpKHhmODZDcnRjUHRyIGNydGMsIHZvaWQgKmRhdGEpOwogCit2b2lkIGFtZGdwdV9k cm1fcXVldWVfaGFuZGxlX2RlZmVycmVkKHhmODZDcnRjUHRyIGNydGMpOwogdWludHB0cl90IGFt ZGdwdV9kcm1fcXVldWVfYWxsb2MoeGY4NkNydGNQdHIgY3J0YywgQ2xpZW50UHRyIGNsaWVudCwK IAkJCQkgdWludDY0X3QgaWQsIHZvaWQgKmRhdGEsCiAJCQkJIGFtZGdwdV9kcm1faGFuZGxlcl9w cm9jIGhhbmRsZXIsCmRpZmYgLS1naXQgYS9zcmMvZHJtbW9kZV9kaXNwbGF5LmMgYi9zcmMvZHJt bW9kZV9kaXNwbGF5LmMKaW5kZXggNjE1ZDNiZThmLi4zYjJkZTY4MzkgMTAwNjQ0Ci0tLSBhL3Ny Yy9kcm1tb2RlX2Rpc3BsYXkuYworKysgYi9zcmMvZHJtbW9kZV9kaXNwbGF5LmMKQEAgLTMwNSw2 ICszMDUsOSBAQCBkcm1tb2RlX2RvX2NydGNfZHBtcyh4Zjg2Q3J0Y1B0ciBjcnRjLCBpbnQgbW9k ZSkKIAkJCQlub21pbmFsX2ZyYW1lX3JhdGUgLz0gcGl4X2luX2ZyYW1lOwogCQkJZHJtbW9kZV9j cnRjLT5kcG1zX2xhc3RfZnBzID0gbm9taW5hbF9mcmFtZV9yYXRlOwogCQl9CisKKwkJZHJtbW9k ZV9jcnRjLT5kcG1zX21vZGUgPSBtb2RlOworCQlhbWRncHVfZHJtX3F1ZXVlX2hhbmRsZV9kZWZl cnJlZChjcnRjKTsKIAl9IGVsc2UgaWYgKGRybW1vZGVfY3J0Yy0+ZHBtc19tb2RlICE9IERQTVNN b2RlT24gJiYgbW9kZSA9PSBEUE1TTW9kZU9uKSB7CiAJCS8qCiAJCSAqIE9mZi0+T24gdHJhbnNp dGlvbjogY2FsY3VsYXRlIGFuZCBhY2N1bXVsYXRlIHRoZQpAQCAtMzIyLDggKzMyNSw5IEBAIGRy bW1vZGVfZG9fY3J0Y19kcG1zKHhmODZDcnRjUHRyIGNydGMsIGludCBtb2RlKQogCQkJZHJtbW9k ZV9jcnRjLT5pbnRlcnBvbGF0ZWRfdmJsYW5rcyArPSBkZWx0YV9zZXE7CiAKIAkJfQorCisJCWRy bW1vZGVfY3J0Yy0+ZHBtc19tb2RlID0gRFBNU01vZGVPbjsKIAl9Ci0JZHJtbW9kZV9jcnRjLT5k cG1zX21vZGUgPSBtb2RlOwogfQogCiBzdGF0aWMgdm9pZApAQCAtMTQxNSw2ICsxNDE5LDcgQEAg ZG9uZToKIAkJfQogCX0KIAorCWFtZGdwdV9kcm1fcXVldWVfaGFuZGxlX2RlZmVycmVkKGNydGMp OwogCXJldHVybiByZXQ7CiB9CiAKQEAgLTIzMjAsMTEgKzIzMjUsNiBAQCBkcm1tb2RlX291dHB1 dF9zZXRfdGVhcl9mcmVlKEFNREdQVUVudFB0ciBwQU1ER1BVRW50LAogCWRybW1vZGVfb3V0cHV0 LT50ZWFyX2ZyZWUgPSB0ZWFyX2ZyZWU7CiAKIAlpZiAoY3J0YykgewotCQkvKiBXYWl0IGZvciBw ZW5kaW5nIGZsaXBzIGJlZm9yZSBkcm1tb2RlX3NldF9tb2RlX21ham9yIGNhbGxzCi0JCSAqIGRy bW1vZGVfY3J0Y191cGRhdGVfdGVhcl9mcmVlLCB0byBwcmV2ZW50IGEgbmVzdGVkCi0JCSAqIGRy bUhhbmRsZUV2ZW50IGNhbGwsIHdoaWNoIHdvdWxkIGhhbmcKLQkJICovCi0JCWFtZGdwdV9kcm1f d2FpdF9wZW5kaW5nX2ZsaXAoY3J0Yyk7CiAJCWRybW1vZGVfc2V0X21vZGVfbWFqb3IoY3J0Yywg JmNydGMtPm1vZGUsIGNydGMtPnJvdGF0aW9uLAogCQkJCSAgICAgICBjcnRjLT54LCBjcnRjLT55 KTsKIAl9CkBAIC0zODYxLDYgKzM4NjEsNyBAQCBCb29sIGFtZGdwdV9kb19wYWdlZmxpcChTY3Ju SW5mb1B0ciBzY3JuLCBDbGllbnRQdHIgY2xpZW50LAogCWludCBpOwogCXVpbnQzMl90IGZsaXBf ZmxhZ3MgPSBmbGlwX3N5bmMgPT0gRkxJUF9BU1lOQyA/IERSTV9NT0RFX1BBR0VfRkxJUF9BU1lO QyA6IDA7CiAJZHJtbW9kZV9mbGlwZGF0YV9wdHIgZmxpcGRhdGE7CisJQm9vbCBoYW5kbGVfZGVm ZXJyZWQgPSBGQUxTRTsKIAl1aW50cHRyX3QgZHJtX3F1ZXVlX3NlcSA9IDA7CiAKIAlmbGlwZGF0 YSA9IGNhbGxvYygxLCBzaXplb2YoZHJtbW9kZV9mbGlwZGF0YV9yZWMpKTsKQEAgLTM5NDIsNiAr Mzk0Myw3IEBAIEJvb2wgYW1kZ3B1X2RvX3BhZ2VmbGlwKFNjcm5JbmZvUHRyIHNjcm4sIENsaWVu dFB0ciBjbGllbnQsCiAKIAkJCWlmIChkcm1tb2RlX2NydGMtPnNjYW5vdXRfdXBkYXRlX3BlbmRp bmcpIHsKIAkJCQlhbWRncHVfZHJtX3dhaXRfcGVuZGluZ19mbGlwKGNydGMpOworCQkJCWhhbmRs ZV9kZWZlcnJlZCA9IFRSVUU7CiAJCQkJYW1kZ3B1X2RybV9hYm9ydF9lbnRyeShkcm1tb2RlX2Ny dGMtPnNjYW5vdXRfdXBkYXRlX3BlbmRpbmcpOwogCQkJCWRybW1vZGVfY3J0Yy0+c2Nhbm91dF91 cGRhdGVfcGVuZGluZyA9IDA7CiAJCQl9CkBAIC0zOTc1LDYgKzM5NzcsOCBAQCBCb29sIGFtZGdw dV9kb19wYWdlZmxpcChTY3JuSW5mb1B0ciBzY3JuLCBDbGllbnRQdHIgY2xpZW50LAogCQlkcm1f cXVldWVfc2VxID0gMDsKIAl9CiAKKwlpZiAoaGFuZGxlX2RlZmVycmVkKQorCQlhbWRncHVfZHJt X3F1ZXVlX2hhbmRsZV9kZWZlcnJlZChyZWZfY3J0Yyk7CiAJaWYgKGZsaXBkYXRhLT5mbGlwX2Nv dW50ID4gMCkKIAkJcmV0dXJuIFRSVUU7CiAKQEAgLTM5OTUsNSArMzk5OSw3IEBAIGVycm9yOgog CiAJeGY4NkRydk1zZyhzY3JuLT5zY3JuSW5kZXgsIFhfV0FSTklORywgIlBhZ2UgZmxpcCBmYWls ZWQ6ICVzXG4iLAogCQkgICBzdHJlcnJvcihlcnJubykpOworCWlmIChoYW5kbGVfZGVmZXJyZWQp CisJCWFtZGdwdV9kcm1fcXVldWVfaGFuZGxlX2RlZmVycmVkKHJlZl9jcnRjKTsKIAlyZXR1cm4g RkFMU0U7CiB9CmRpZmYgLS1naXQgYS9zcmMvZHJtbW9kZV9kaXNwbGF5LmggYi9zcmMvZHJtbW9k ZV9kaXNwbGF5LmgKaW5kZXggOGI5NDlmNzlkLi4yOGQxNWUyODIgMTAwNjQ0Ci0tLSBhL3NyYy9k cm1tb2RlX2Rpc3BsYXkuaAorKysgYi9zcmMvZHJtbW9kZV9kaXNwbGF5LmgKQEAgLTExOSw2ICsx MTksMTAgQEAgdHlwZWRlZiBzdHJ1Y3QgewogCiAJLyogTW9kZXNldCBuZWVkZWQgZm9yIERQTVMg b24gKi8KIAlCb29sIG5lZWRfbW9kZXNldDsKKwkvKiBGb3Iga2VlcGluZyB0cmFjayBvZiBuZXN0 ZWQgY2FsbHMgdG8gZHJtX3dhaXRfcGVuZGluZ19mbGlwIC8KKwkgKiBkcm1fcXVldWVfaGFuZGxl X2RlZmVycmVkCisJICovCisJaW50IHdhaXRfZmxpcF9uZXN0aW5nX2xldmVsOwogCS8qIEEgZmxp cCB0byB0aGlzIEZCIGlzIHBlbmRpbmcgZm9yIHRoaXMgQ1JUQyAqLwogCXN0cnVjdCBkcm1tb2Rl X2ZiICpmbGlwX3BlbmRpbmc7CiAJLyogVGhlIEZCIGN1cnJlbnRseSBiZWluZyBzY2FubmVkIG91 dCBieSB0aGlzIENSVEMsIGlmIGFueSAqLwotLSAKMi4xOC4wCgpfX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fXwphbWQtZ2Z4IG1haWxpbmcgbGlzdAphbWQtZ2Z4 QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWls bWFuL2xpc3RpbmZvL2FtZC1nZngK