From: Qiang Yu Subject: [PATCH xserver 5/6] modesetting: merge common page flip code for present and dri2 Date: Wed, 17 Aug 2016 18:29:10 +0800 Message-ID: <1471429751-17269-6-git-send-email-Qiang.Yu@amd.com> References: <1471429751-17269-1-git-send-email-Qiang.Yu@amd.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1471429751-17269-1-git-send-email-Qiang.Yu-5C7GfCeVMHo@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: xorg-devel-bounces-go0+a7rfsptAfugRpC6u6w@public.gmane.org Sender: "xorg-devel" To: xorg-devel-go0+a7rfsptAfugRpC6u6w@public.gmane.org Cc: Qiang Yu , amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org List-Id: amd-gfx.lists.freedesktop.org U2lnbmVkLW9mZi1ieTogUWlhbmcgWXUgPFFpYW5nLll1QGFtZC5jb20+Ci0tLQogaHcveGZyZWU4 Ni9kcml2ZXJzL21vZGVzZXR0aW5nL2RyaTIuYyAgICAgfCAgNzIgKysrKysrLS0tLS0tLS0tLS0t LS0KIGh3L3hmcmVlODYvZHJpdmVycy9tb2Rlc2V0dGluZy9kcml2ZXIuaCAgIHwgIDMzICstLS0t LS0tLS0KIGh3L3hmcmVlODYvZHJpdmVycy9tb2Rlc2V0dGluZy9wYWdlZmxpcC5jIHwgMTA1ICsr KysrKysrKysrKysrKysrKysrKysrKysrKystLQogaHcveGZyZWU4Ni9kcml2ZXJzL21vZGVzZXR0 aW5nL3ByZXNlbnQuYyAgfCAgNzIgKysrKy0tLS0tLS0tLS0tLS0tLS0KIDQgZmlsZXMgY2hhbmdl ZCwgMTM0IGluc2VydGlvbnMoKyksIDE0OCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9ody94 ZnJlZTg2L2RyaXZlcnMvbW9kZXNldHRpbmcvZHJpMi5jIGIvaHcveGZyZWU4Ni9kcml2ZXJzL21v ZGVzZXR0aW5nL2RyaTIuYwppbmRleCAxYWJmOThjLi40Y2Y2MzhlIDEwMDY0NAotLS0gYS9ody94 ZnJlZTg2L2RyaXZlcnMvbW9kZXNldHRpbmcvZHJpMi5jCisrKyBiL2h3L3hmcmVlODYvZHJpdmVy cy9tb2Rlc2V0dGluZy9kcmkyLmMKQEAgLTQwOCw2NSArNDA4LDMxIEBAIHN0cnVjdCBtc19kcmky X3ZibGFua19ldmVudCB7CiB9OwogCiBzdGF0aWMgdm9pZAotbXNfZHJpMl9mbGlwX2ZyZWUoc3Ry dWN0IG1zX2NydGNfcGFnZWZsaXAgKmZsaXApCittc19kcmkyX2ZsaXBfYWJvcnQobW9kZXNldHRp bmdQdHIgbXMsIHZvaWQgKmRhdGEpCiB7Ci0gICAgc3RydWN0IG1zX2ZsaXBkYXRhICpmbGlwZGF0 YSA9IGZsaXAtPmZsaXBkYXRhOworICAgIHN0cnVjdCBtc19wcmVzZW50X3ZibGFua19ldmVudCAq ZXZlbnQgPSBkYXRhOwogCi0gICAgZnJlZShmbGlwKTsKLSAgICBpZiAoLS1mbGlwZGF0YS0+Zmxp cF9jb3VudCA+IDApCi0gICAgICAgIHJldHVybjsKLSAgICBmcmVlKGZsaXBkYXRhKTsKLX0KLQot c3RhdGljIHZvaWQKLW1zX2RyaTJfZmxpcF9hYm9ydCh2b2lkICpkYXRhKQotewotICAgIHN0cnVj dCBtc19jcnRjX3BhZ2VmbGlwICpmbGlwID0gZGF0YTsKLSAgICBzdHJ1Y3QgbXNfZmxpcGRhdGEg KmZsaXBkYXRhID0gZmxpcC0+ZmxpcGRhdGE7Ci0gICAgU2NyZWVuUHRyIHNjcmVlbiA9IGZsaXBk YXRhLT5zY3JlZW47Ci0gICAgU2NybkluZm9QdHIgc2NybiA9IHhmODZTY3JlZW5Ub1Njcm4oc2Ny ZWVuKTsKLSAgICBtb2Rlc2V0dGluZ1B0ciBtcyA9IG1vZGVzZXR0aW5nUFRSKHNjcm4pOwotCi0g ICAgaWYgKGZsaXBkYXRhLT5mbGlwX2NvdW50ID09IDEpIHsKLSAgICAgICAgICAgIG1zLT5kcm1t b2RlLmRyaTJfZmxpcHBpbmcgPSBGQUxTRTsKLSAgICAgICAgICAgIGZyZWUoZmxpcGRhdGEtPmV2 ZW50KTsKLSAgICB9Ci0KLSAgICBtc19kcmkyX2ZsaXBfZnJlZShmbGlwKTsKKyAgICBtcy0+ZHJt bW9kZS5kcmkyX2ZsaXBwaW5nID0gRkFMU0U7CisgICAgZnJlZShldmVudCk7CiB9CiAKIHN0YXRp YyB2b2lkCi1tc19kcmkyX2ZsaXBfaGFuZGxlcih1aW50NjRfdCBtc2MsIHVpbnQ2NF90IHVzdCwg dm9pZCAqZGF0YSkKK21zX2RyaTJfZmxpcF9oYW5kbGVyKG1vZGVzZXR0aW5nUHRyIG1zLCB1aW50 NjRfdCBtc2MsIAorICAgICAgICAgICAgICAgICAgICAgdWludDY0X3QgdXN0LCB2b2lkICpkYXRh KQogewotICAgIHN0cnVjdCBtc19jcnRjX3BhZ2VmbGlwICpmbGlwID0gZGF0YTsKLSAgICBTY3Jl ZW5QdHIgc2NyZWVuID0gZmxpcC0+ZmxpcGRhdGEtPnNjcmVlbjsKLSAgICBTY3JuSW5mb1B0ciBz Y3JuID0geGY4NlNjcmVlblRvU2NybihzY3JlZW4pOwotICAgIG1vZGVzZXR0aW5nUHRyIG1zID0g bW9kZXNldHRpbmdQVFIoc2Nybik7Ci0gICAgc3RydWN0IG1zX2ZsaXBkYXRhICpmbGlwZGF0YSA9 IGZsaXAtPmZsaXBkYXRhOwotICAgIHN0cnVjdCBtc19kcmkyX3ZibGFua19ldmVudCAqZXZlbnQg PSBmbGlwZGF0YS0+ZXZlbnQ7Ci0KLSAgICBpZiAoZmxpcC0+b25fcmVmZXJlbmNlX2NydGMpIHsK LSAgICAgICAgZmxpcGRhdGEtPmZlX21zYyA9IG1zYzsKLSAgICAgICAgZmxpcGRhdGEtPmZlX3Vz ZWMgPSB1c3Q7Ci0gICAgfQotCi0gICAgaWYgKGZsaXBkYXRhLT5mbGlwX2NvdW50ID09IDEpIHsK LSAgICAgICAgdWludDMyX3QgZnJhbWUgPSBmbGlwZGF0YS0+ZmVfbXNjOwotICAgICAgICB1aW50 MzJfdCB0dl9zZWMgPSBmbGlwZGF0YS0+ZmVfdXNlYyAvIDEwMDAwMDA7Ci0gICAgICAgIHVpbnQz Ml90IHR2X3VzZWMgPSBmbGlwZGF0YS0+ZmVfdXNlYyAlIDEwMDAwMDA7Ci0gICAgICAgIERyYXdh YmxlUHRyIGRyYXdhYmxlOwotICAgICAgICBpbnQgc3RhdHVzOwotCi0gICAgICAgIHN0YXR1cyA9 IGRpeExvb2t1cERyYXdhYmxlKCZkcmF3YWJsZSwgZXZlbnQtPmRyYXdhYmxlX2lkLCBzZXJ2ZXJD bGllbnQsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIE1fQU5ZLCBEaXhXcml0 ZUFjY2Vzcyk7Ci0gICAgICAgIGlmIChzdGF0dXMgPT0gU3VjY2VzcykKLSAgICAgICAgICAgIERS STJTd2FwQ29tcGxldGUoZXZlbnQtPmNsaWVudCwgZHJhd2FibGUsIGZyYW1lLCB0dl9zZWMsIHR2 X3VzZWMsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgIERSSTJfRkxJUF9DT01QTEVURSwg ZXZlbnQtPmV2ZW50X2NvbXBsZXRlLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICBldmVu dC0+ZXZlbnRfZGF0YSk7Ci0gICAgICAgIGRybU1vZGVSbUZCKG1zLT5mZCwgZmxpcGRhdGEtPm9s ZF9mYl9pZCk7Ci0gICAgfQotCi0gICAgbXNfZHJpMl9mbGlwX2ZyZWUoZmxpcCk7CisgICAgc3Ry dWN0IG1zX2RyaTJfdmJsYW5rX2V2ZW50ICpldmVudCA9IGRhdGE7CisgICAgdWludDMyX3QgZnJh bWUgPSBtc2M7CisgICAgdWludDMyX3QgdHZfc2VjID0gdXN0IC8gMTAwMDAwMDsKKyAgICB1aW50 MzJfdCB0dl91c2VjID0gdXN0ICUgMTAwMDAwMDsKKyAgICBEcmF3YWJsZVB0ciBkcmF3YWJsZTsK KyAgICBpbnQgc3RhdHVzOworCisgICAgc3RhdHVzID0gZGl4TG9va3VwRHJhd2FibGUoJmRyYXdh YmxlLCBldmVudC0+ZHJhd2FibGVfaWQsIHNlcnZlckNsaWVudCwKKyAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBNX0FOWSwgRGl4V3JpdGVBY2Nlc3MpOworICAgIGlmIChzdGF0dXMgPT0g U3VjY2VzcykKKyAgICAgICAgRFJJMlN3YXBDb21wbGV0ZShldmVudC0+Y2xpZW50LCBkcmF3YWJs ZSwgZnJhbWUsIHR2X3NlYywgdHZfdXNlYywKKyAgICAgICAgICAgICAgICAgICAgICAgICBEUkky X0ZMSVBfQ09NUExFVEUsIGV2ZW50LT5ldmVudF9jb21wbGV0ZSwKKyAgICAgICAgICAgICAgICAg ICAgICAgICBldmVudC0+ZXZlbnRfZGF0YSk7CiB9CiAKIHN0YXRpYyBCb29sCmRpZmYgLS1naXQg YS9ody94ZnJlZTg2L2RyaXZlcnMvbW9kZXNldHRpbmcvZHJpdmVyLmggYi9ody94ZnJlZTg2L2Ry aXZlcnMvbW9kZXNldHRpbmcvZHJpdmVyLmgKaW5kZXggYzBkODBhOC4uNzYxNDkwYSAxMDA2NDQK LS0tIGEvaHcveGZyZWU4Ni9kcml2ZXJzL21vZGVzZXR0aW5nL2RyaXZlci5oCisrKyBiL2h3L3hm cmVlODYvZHJpdmVycy9tb2Rlc2V0dGluZy9kcml2ZXIuaApAQCAtMTU2LDM5ICsxNTYsMTIgQEAg Qm9vbCBtc19wcmVzZW50X3NjcmVlbl9pbml0KFNjcmVlblB0ciBzY3JlZW4pOwogCiAjaWZkZWYg R0xBTU9SCiAKLS8qCi0gKiBFdmVudCBkYXRhIGZvciBhbiBpbiBwcm9ncmVzcyBmbGlwLgotICog VGhpcyBjb250YWlucyBhIHBvaW50ZXIgdG8gdGhlIHZibGFuayBldmVudCwKLSAqIGFuZCBpbmZv cm1hdGlvbiBhYm91dCB0aGUgZmxpcCBpbiBwcm9ncmVzcy4KLSAqIGEgcmVmZXJlbmNlIHRvIHRo aXMgaXMgc3RvcmVkIGluIHRoZSBwZXItY3J0YwotICogZmxpcHMuCi0gKi8KLXN0cnVjdCBtc19m bGlwZGF0YSB7Ci0gICAgU2NyZWVuUHRyIHNjcmVlbjsKLSAgICB2b2lkICpldmVudDsKLSAgICAv KiBudW1iZXIgb2YgQ1JUQyBldmVudHMgcmVmZXJlbmNpbmcgdGhpcyAqLwotICAgIGludCBmbGlw X2NvdW50OwotICAgIHVpbnQ2NF90IGZlX21zYzsKLSAgICB1aW50NjRfdCBmZV91c2VjOwotICAg IHVpbnQzMl90IG9sZF9mYl9pZDsKLX07Ci0KLS8qCi0gKiBQZXIgY3J0YyBwYWdlZmxpcHBpbmcg aW5mb21hdGlvbiwKLSAqIFRoZXNlIGFyZSBzdWJtaXR0ZWQgdG8gdGhlIHF1ZXVpbmcgY29kZQot ICogb25lIG9mIHRoZW0gcGVyIGNydGMgcGVyIGZsaXAuCi0gKi8KLXN0cnVjdCBtc19jcnRjX3Bh Z2VmbGlwIHsKLSAgICBCb29sIG9uX3JlZmVyZW5jZV9jcnRjOwotICAgIC8qIHJlZmVyZW5jZSB0 byB0aGUgbXNfZmxpcGRhdGEgKi8KLSAgICBzdHJ1Y3QgbXNfZmxpcGRhdGEgKmZsaXBkYXRhOwot fTsKLQotdHlwZWRlZiB2b2lkICgqbXNfcGFnZWZsaXBfaGFuZGxlcl9wcm9jKSh1aW50NjRfdCBm cmFtZSwKK3R5cGVkZWYgdm9pZCAoKm1zX3BhZ2VmbGlwX2hhbmRsZXJfcHJvYykobW9kZXNldHRp bmdQdHIgbXMsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHVpbnQ2 NF90IGZyYW1lLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB1aW50 NjRfdCB1c2VjLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB2b2lk ICpkYXRhKTsKIAotdHlwZWRlZiB2b2lkICgqbXNfcGFnZWZsaXBfYWJvcnRfcHJvYykodm9pZCAq ZGF0YSk7Cit0eXBlZGVmIHZvaWQgKCptc19wYWdlZmxpcF9hYm9ydF9wcm9jKShtb2Rlc2V0dGlu Z1B0ciBtcywgdm9pZCAqZGF0YSk7CiAKIGludCBtc19mbHVzaF9kcm1fZXZlbnRzKFNjcmVlblB0 ciBzY3JlZW4pOwogCmRpZmYgLS1naXQgYS9ody94ZnJlZTg2L2RyaXZlcnMvbW9kZXNldHRpbmcv cGFnZWZsaXAuYyBiL2h3L3hmcmVlODYvZHJpdmVycy9tb2Rlc2V0dGluZy9wYWdlZmxpcC5jCmlu ZGV4IDQ1NDk3OTIuLmE4MmUwZDYgMTAwNjQ0Ci0tLSBhL2h3L3hmcmVlODYvZHJpdmVycy9tb2Rl c2V0dGluZy9wYWdlZmxpcC5jCisrKyBiL2h3L3hmcmVlODYvZHJpdmVycy9tb2Rlc2V0dGluZy9w YWdlZmxpcC5jCkBAIC0zMiw2ICszMiwxMDAgQEAKICNpZmRlZiBHTEFNT1IKIAogLyoKKyAqIEV2 ZW50IGRhdGEgZm9yIGFuIGluIHByb2dyZXNzIGZsaXAuCisgKiBUaGlzIGNvbnRhaW5zIGEgcG9p bnRlciB0byB0aGUgdmJsYW5rIGV2ZW50LAorICogYW5kIGluZm9ybWF0aW9uIGFib3V0IHRoZSBm bGlwIGluIHByb2dyZXNzLgorICogYSByZWZlcmVuY2UgdG8gdGhpcyBpcyBzdG9yZWQgaW4gdGhl IHBlci1jcnRjCisgKiBmbGlwcy4KKyAqLworc3RydWN0IG1zX2ZsaXBkYXRhIHsKKyAgICBTY3Jl ZW5QdHIgc2NyZWVuOworICAgIHZvaWQgKmV2ZW50OworICAgIG1zX3BhZ2VmbGlwX2hhbmRsZXJf cHJvYyBldmVudF9oYW5kbGVyOworICAgIG1zX3BhZ2VmbGlwX2Fib3J0X3Byb2MgYWJvcnRfaGFu ZGxlcjsKKyAgICAvKiBudW1iZXIgb2YgQ1JUQyBldmVudHMgcmVmZXJlbmNpbmcgdGhpcyAqLwor ICAgIGludCBmbGlwX2NvdW50OworICAgIHVpbnQ2NF90IGZlX21zYzsKKyAgICB1aW50NjRfdCBm ZV91c2VjOworICAgIHVpbnQzMl90IG9sZF9mYl9pZDsKK307CisKKy8qCisgKiBQZXIgY3J0YyBw YWdlZmxpcHBpbmcgaW5mb21hdGlvbiwKKyAqIFRoZXNlIGFyZSBzdWJtaXR0ZWQgdG8gdGhlIHF1 ZXVpbmcgY29kZQorICogb25lIG9mIHRoZW0gcGVyIGNydGMgcGVyIGZsaXAuCisgKi8KK3N0cnVj dCBtc19jcnRjX3BhZ2VmbGlwIHsKKyAgICBCb29sIG9uX3JlZmVyZW5jZV9jcnRjOworICAgIC8q IHJlZmVyZW5jZSB0byB0aGUgbXNfZmxpcGRhdGEgKi8KKyAgICBzdHJ1Y3QgbXNfZmxpcGRhdGEg KmZsaXBkYXRhOworfTsKKworLyoqCisgKiBGcmVlIGFuIG1zX2NydGNfcGFnZWZsaXAuCisgKgor ICogRHJvcHMgdGhlIHJlZmVyZW5jZSBjb3VudCBvbiB0aGUgZmxpcGRhdGEuCisgKi8KK3N0YXRp YyB2b2lkCittc19wYWdlZmxpcF9mcmVlKHN0cnVjdCBtc19jcnRjX3BhZ2VmbGlwICpmbGlwKQor eworICAgIHN0cnVjdCBtc19mbGlwZGF0YSAqZmxpcGRhdGEgPSBmbGlwLT5mbGlwZGF0YTsKKwor ICAgIGZyZWUoZmxpcCk7CisgICAgaWYgKC0tZmxpcGRhdGEtPmZsaXBfY291bnQgPiAwKQorICAg ICAgICByZXR1cm47CisgICAgZnJlZShmbGlwZGF0YSk7Cit9CisKKy8qKgorICogQ2FsbGJhY2sg Zm9yIHRoZSBEUk0gZXZlbnQgcXVldWUgd2hlbiBhIHNpbmdsZSBmbGlwIGhhcyBjb21wbGV0ZWQK KyAqCisgKiBPbmNlIHRoZSBmbGlwIGhhcyBiZWVuIGNvbXBsZXRlZCBvbiBhbGwgcGlwZXMsIG5v dGlmeSB0aGUKKyAqIGV4dGVuc2lvbiBjb2RlIHRlbGxpbmcgaXQgd2hlbiB0aGF0IGhhcHBlbmVk CisgKi8KK3N0YXRpYyB2b2lkCittc19wYWdlZmxpcF9oYW5kbGVyKHVpbnQ2NF90IG1zYywgdWlu dDY0X3QgdXN0LCB2b2lkICpkYXRhKQoreworICAgIHN0cnVjdCBtc19jcnRjX3BhZ2VmbGlwICpm bGlwID0gZGF0YTsKKyAgICBzdHJ1Y3QgbXNfZmxpcGRhdGEgKmZsaXBkYXRhID0gZmxpcC0+Zmxp cGRhdGE7CisgICAgU2NyZWVuUHRyIHNjcmVlbiA9IGZsaXBkYXRhLT5zY3JlZW47CisgICAgU2Ny bkluZm9QdHIgc2NybiA9IHhmODZTY3JlZW5Ub1Njcm4oc2NyZWVuKTsKKyAgICBtb2Rlc2V0dGlu Z1B0ciBtcyA9IG1vZGVzZXR0aW5nUFRSKHNjcm4pOworCisgICAgaWYgKGZsaXAtPm9uX3JlZmVy ZW5jZV9jcnRjKSB7CisgICAgICAgIGZsaXBkYXRhLT5mZV9tc2MgPSBtc2M7CisgICAgICAgIGZs aXBkYXRhLT5mZV91c2VjID0gdXN0OworICAgIH0KKworICAgIGlmIChmbGlwZGF0YS0+ZmxpcF9j b3VudCA9PSAxKSB7CisgICAgICAgIGZsaXBkYXRhLT5ldmVudF9oYW5kbGVyKG1zLCBmbGlwZGF0 YS0+ZmVfbXNjLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBmbGlwZGF0YS0+ZmVf dXNlYywKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZmxpcGRhdGEtPmV2ZW50KTsK KworICAgICAgICBkcm1Nb2RlUm1GQihtcy0+ZmQsIGZsaXBkYXRhLT5vbGRfZmJfaWQpOworICAg IH0KKyAgICBtc19wYWdlZmxpcF9mcmVlKGZsaXApOworfQorCisvKgorICogQ2FsbGJhY2sgZm9y IHRoZSBEUk0gcXVldWUgYWJvcnQgY29kZS4gIEEgZmxpcCBoYXMgYmVlbiBhYm9ydGVkLgorICov CitzdGF0aWMgdm9pZAorbXNfcGFnZWZsaXBfYWJvcnQodm9pZCAqZGF0YSkKK3sKKyAgICBzdHJ1 Y3QgbXNfY3J0Y19wYWdlZmxpcCAqZmxpcCA9IGRhdGE7CisgICAgc3RydWN0IG1zX2ZsaXBkYXRh ICpmbGlwZGF0YSA9IGZsaXAtPmZsaXBkYXRhOworICAgIFNjcmVlblB0ciBzY3JlZW4gPSBmbGlw ZGF0YS0+c2NyZWVuOworICAgIFNjcm5JbmZvUHRyIHNjcm4gPSB4Zjg2U2NyZWVuVG9TY3JuKHNj cmVlbik7CisgICAgbW9kZXNldHRpbmdQdHIgbXMgPSBtb2Rlc2V0dGluZ1BUUihzY3JuKTsKKwor ICAgIGlmIChmbGlwZGF0YS0+ZmxpcF9jb3VudCA9PSAxKQorICAgICAgICBmbGlwZGF0YS0+YWJv cnRfaGFuZGxlcihtcywgZmxpcGRhdGEtPmV2ZW50KTsKKworICAgIG1zX3BhZ2VmbGlwX2ZyZWUo ZmxpcCk7Cit9CisKKy8qCiAgKiBGbHVzaCB0aGUgRFJNIGV2ZW50IHF1ZXVlIHdoZW4gZnVsbDsg bWFrZXMgc3BhY2UgZm9yIG5ldyBldmVudHMuCiAgKgogICogUmV0dXJucyBhIG5lZ2F0aXZlIHZh bHVlIG9uIGVycm9yLCAwIGlmIHRoZXJlIHdhcyBub3RoaW5nIHRvIHByb2Nlc3MsCkBAIC02OCw5 ICsxNjIsNyBAQCBtc19mbHVzaF9kcm1fZXZlbnRzKFNjcmVlblB0ciBzY3JlZW4pCiBzdGF0aWMg Qm9vbAogcXVldWVfZmxpcF9vbl9jcnRjKFNjcmVlblB0ciBzY3JlZW4sIHhmODZDcnRjUHRyIGNy dGMsCiAgICAgICAgICAgICAgICAgICAgc3RydWN0IG1zX2ZsaXBkYXRhICpmbGlwZGF0YSwKLSAg ICAgICAgICAgICAgICAgICBpbnQgcmVmX2NydGNfdmJsYW5rX3BpcGUsIHVpbnQzMl90IGZsYWdz LAotICAgICAgICAgICAgICAgICAgIG1zX3BhZ2VmbGlwX2hhbmRsZXJfcHJvYyBwYWdlZmxpcF9o YW5kbGVyLAotICAgICAgICAgICAgICAgICAgIG1zX3BhZ2VmbGlwX2Fib3J0X3Byb2MgcGFnZWZs aXBfYWJvcnQpCisgICAgICAgICAgICAgICAgICAgaW50IHJlZl9jcnRjX3ZibGFua19waXBlLCB1 aW50MzJfdCBmbGFncykKIHsKICAgICBTY3JuSW5mb1B0ciBzY3JuID0geGY4NlNjcmVlblRvU2Ny bihzY3JlZW4pOwogICAgIG1vZGVzZXR0aW5nUHRyIG1zID0gbW9kZXNldHRpbmdQVFIoc2Nybik7 CkBAIC05Miw3ICsxODQsNyBAQCBxdWV1ZV9mbGlwX29uX2NydGMoU2NyZWVuUHRyIHNjcmVlbiwg eGY4NkNydGNQdHIgY3J0YywKICAgICBmbGlwLT5vbl9yZWZlcmVuY2VfY3J0YyA9IChkcm1tb2Rl X2NydGMtPnZibGFua19waXBlID09IHJlZl9jcnRjX3ZibGFua19waXBlKTsKICAgICBmbGlwLT5m bGlwZGF0YSA9IGZsaXBkYXRhOwogCi0gICAgc2VxID0gbXNfZHJtX3F1ZXVlX2FsbG9jKGNydGMs IGZsaXAsIHBhZ2VmbGlwX2hhbmRsZXIsIHBhZ2VmbGlwX2Fib3J0KTsKKyAgICBzZXEgPSBtc19k cm1fcXVldWVfYWxsb2MoY3J0YywgZmxpcCwgbXNfcGFnZWZsaXBfaGFuZGxlciwgbXNfcGFnZWZs aXBfYWJvcnQpOwogICAgIGlmICghc2VxKSB7CiAgICAgICAgIGZyZWUoZmxpcCk7CiAgICAgICAg IHJldHVybiBGQUxTRTsKQEAgLTE2NCw2ICsyNTYsOCBAQCBtc19kb19wYWdlZmxpcChTY3JlZW5Q dHIgc2NyZWVuLAogCiAgICAgZmxpcGRhdGEtPmV2ZW50ID0gZXZlbnQ7CiAgICAgZmxpcGRhdGEt PnNjcmVlbiA9IHNjcmVlbjsKKyAgICBmbGlwZGF0YS0+ZXZlbnRfaGFuZGxlciA9IHBhZ2VmbGlw X2hhbmRsZXI7CisgICAgZmxpcGRhdGEtPmFib3J0X2hhbmRsZXIgPSBwYWdlZmxpcF9hYm9ydDsK IAogICAgIC8qCiAgICAgICogVGFrZSBhIGxvY2FsIHJlZmVyZW5jZSBvbiBmbGlwZGF0YS4KQEAg LTIwNiw4ICszMDAsNyBAQCBtc19kb19wYWdlZmxpcChTY3JlZW5QdHIgc2NyZWVuLAogCiAgICAg ICAgIGlmICghcXVldWVfZmxpcF9vbl9jcnRjKHNjcmVlbiwgY3J0YywgZmxpcGRhdGEsCiAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIHJlZl9jcnRjX3ZibGFua19waXBlLAotICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICBmbGFncywgcGFnZWZsaXBfaGFuZGxlciwKLSAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgcGFnZWZsaXBfYWJvcnQpKSB7CisgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIGZsYWdzKSkgewogICAgICAgICAgICAgZ290byBlcnJvcl91 bmRvOwogICAgICAgICB9CiAgICAgfQpkaWZmIC0tZ2l0IGEvaHcveGZyZWU4Ni9kcml2ZXJzL21v ZGVzZXR0aW5nL3ByZXNlbnQuYyBiL2h3L3hmcmVlODYvZHJpdmVycy9tb2Rlc2V0dGluZy9wcmVz ZW50LmMKaW5kZXggZDEwYzY3NC4uMTEwMTgwOCAxMDA2NDQKLS0tIGEvaHcveGZyZWU4Ni9kcml2 ZXJzL21vZGVzZXR0aW5nL3ByZXNlbnQuYworKysgYi9ody94ZnJlZTg2L2RyaXZlcnMvbW9kZXNl dHRpbmcvcHJlc2VudC5jCkBAIC0xOTMsODAgKzE5MywzNCBAQCBtc19wcmVzZW50X2ZsdXNoKFdp bmRvd1B0ciB3aW5kb3cpCiAjaWZkZWYgR0xBTU9SCiAKIC8qKgotICogRnJlZSBhbiBtc19jcnRj X3BhZ2VmbGlwLgotICoKLSAqIERyb3BzIHRoZSByZWZlcmVuY2UgY291bnQgb24gdGhlIGZsaXBk YXRhLgotICovCi1zdGF0aWMgdm9pZAotbXNfcHJlc2VudF9mbGlwX2ZyZWUoc3RydWN0IG1zX2Ny dGNfcGFnZWZsaXAgKmZsaXApCi17Ci0gICAgc3RydWN0IG1zX2ZsaXBkYXRhICpmbGlwZGF0YSA9 IGZsaXAtPmZsaXBkYXRhOwotCi0gICAgZnJlZShmbGlwKTsKLSAgICBpZiAoLS1mbGlwZGF0YS0+ ZmxpcF9jb3VudCA+IDApCi0gICAgICAgIHJldHVybjsKLSAgICBmcmVlKGZsaXBkYXRhKTsKLX0K LQotLyoqCi0gKiBDYWxsYmFjayBmb3IgdGhlIERSTSBldmVudCBxdWV1ZSB3aGVuIGEgc2luZ2xl IGZsaXAgaGFzIGNvbXBsZXRlZAotICoKLSAqIE9uY2UgdGhlIGZsaXAgaGFzIGJlZW4gY29tcGxl dGVkIG9uIGFsbCBwaXBlcywgbm90aWZ5IHRoZQorICogQ2FsbGJhY2sgZm9yIHRoZSBmbGlwIGhh cyBiZWVuIGNvbXBsZXRlZCBvbiBhbGwgcGlwZXMsIG5vdGlmeSB0aGUKICAqIGV4dGVuc2lvbiBj b2RlIHRlbGxpbmcgaXQgd2hlbiB0aGF0IGhhcHBlbmVkCiAgKi8KIHN0YXRpYyB2b2lkCi1tc19w cmVzZW50X2ZsaXBfaGFuZGxlcih1aW50NjRfdCBtc2MsIHVpbnQ2NF90IHVzdCwgdm9pZCAqZGF0 YSkKK21zX3ByZXNlbnRfZmxpcF9oYW5kbGVyKG1vZGVzZXR0aW5nUHRyIG1zLCB1aW50NjRfdCBt c2MsIAorICAgICAgICAgICAgICAgICAgICAgICAgdWludDY0X3QgdXN0LCB2b2lkICpkYXRhKQog ewotICAgIHN0cnVjdCBtc19jcnRjX3BhZ2VmbGlwICpmbGlwID0gZGF0YTsKLSAgICBTY3JlZW5Q dHIgc2NyZWVuID0gZmxpcC0+ZmxpcGRhdGEtPnNjcmVlbjsKLSAgICBTY3JuSW5mb1B0ciBzY3Ju ID0geGY4NlNjcmVlblRvU2NybihzY3JlZW4pOwotICAgIG1vZGVzZXR0aW5nUHRyIG1zID0gbW9k ZXNldHRpbmdQVFIoc2Nybik7Ci0gICAgc3RydWN0IG1zX2ZsaXBkYXRhICpmbGlwZGF0YSA9IGZs aXAtPmZsaXBkYXRhOwotICAgIHN0cnVjdCBtc19wcmVzZW50X3ZibGFua19ldmVudCAqZXZlbnQg PSBmbGlwZGF0YS0+ZXZlbnQ7CisgICAgc3RydWN0IG1zX3ByZXNlbnRfdmJsYW5rX2V2ZW50ICpl dmVudCA9IGRhdGE7CiAKLSAgICBEZWJ1Z1ByZXNlbnQoKCJcdFx0bXM6ZmggJWxsZCBjICVkIG1z YyAlbGx1IHVzdCAlbGx1XG4iLAotICAgICAgICAgICAgICAgICAgKGxvbmcgbG9uZykgZmxpcGRh dGEtPmV2ZW50LT5ldmVudF9pZCwKLSAgICAgICAgICAgICAgICAgIGZsaXBkYXRhLT5mbGlwX2Nv dW50LAorICAgIERlYnVnUHJlc2VudCgoIlx0XHRtczpmYyAlbGxkIG1zYyAlbGx1IHVzdCAlbGx1 XG4iLAorICAgICAgICAgICAgICAgICAgKGxvbmcgbG9uZykgZXZlbnQtPmV2ZW50X2lkLAogICAg ICAgICAgICAgICAgICAgKGxvbmcgbG9uZykgbXNjLCAobG9uZyBsb25nKSB1c3QpKTsKIAotICAg IGlmIChmbGlwLT5vbl9yZWZlcmVuY2VfY3J0YykgewotICAgICAgICBmbGlwZGF0YS0+ZmVfbXNj ID0gbXNjOwotICAgICAgICBmbGlwZGF0YS0+ZmVfdXNlYyA9IHVzdDsKLSAgICB9Ci0KLSAgICBp ZiAoZmxpcGRhdGEtPmZsaXBfY291bnQgPT0gMSkgewotICAgICAgICBEZWJ1Z1ByZXNlbnQoKCJc dFx0bXM6ZmMgJWxsZCBjICVkIG1zYyAlbGx1IHVzdCAlbGx1XG4iLAotICAgICAgICAgICAgICAg ICAgICAgIChsb25nIGxvbmcpIGZsaXBkYXRhLT5ldmVudC0+ZXZlbnRfaWQsCi0gICAgICAgICAg ICAgICAgICAgICAgZmxpcGRhdGEtPmZsaXBfY291bnQsCi0gICAgICAgICAgICAgICAgICAgICAg KGxvbmcgbG9uZykgZmxpcGRhdGEtPmZlX21zYywgKGxvbmcgbG9uZykgZmxpcGRhdGEtPmZlX3Vz ZWMpKTsKLQotICAgICAgICBpZiAoZXZlbnQtPnVuZmxpcCkKLSAgICAgICAgICAgIG1zLT5kcm1t b2RlLnByZXNlbnRfZmxpcHBpbmcgPSBGQUxTRTsKLQotICAgICAgICBtc19wcmVzZW50X3ZibGFu a19oYW5kbGVyKGZsaXBkYXRhLT5mZV9tc2MsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgZmxpcGRhdGEtPmZlX3VzZWMsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgZmxpcGRhdGEtPmV2ZW50KTsKKyAgICBpZiAoZXZlbnQtPnVuZmxpcCkKKyAgICAgICAgbXMt PmRybW1vZGUucHJlc2VudF9mbGlwcGluZyA9IEZBTFNFOwogCi0gICAgICAgIGRybU1vZGVSbUZC KG1zLT5mZCwgZmxpcGRhdGEtPm9sZF9mYl9pZCk7Ci0gICAgfQotICAgIG1zX3ByZXNlbnRfZmxp cF9mcmVlKGZsaXApOworICAgIG1zX3ByZXNlbnRfdmJsYW5rX2hhbmRsZXIobXNjLCB1c3QsIGV2 ZW50KTsKIH0KIAogLyoKLSAqIENhbGxiYWNrIGZvciB0aGUgRFJNIHF1ZXVlIGFib3J0IGNvZGUu ICBBIGZsaXAgaGFzIGJlZW4gYWJvcnRlZC4KKyAqIENhbGxiYWNrIGZvciB0aGUgZmxpcCBoYXMg YmVlbiBhYm9ydGVkLgogICovCiBzdGF0aWMgdm9pZAotbXNfcHJlc2VudF9mbGlwX2Fib3J0KHZv aWQgKmRhdGEpCittc19wcmVzZW50X2ZsaXBfYWJvcnQobW9kZXNldHRpbmdQdHIgbXMsIHZvaWQg KmRhdGEpCiB7Ci0gICAgc3RydWN0IG1zX2NydGNfcGFnZWZsaXAgKmZsaXAgPSBkYXRhOwotICAg IHN0cnVjdCBtc19mbGlwZGF0YSAqZmxpcGRhdGEgPSBmbGlwLT5mbGlwZGF0YTsKLQotICAgIERl YnVnUHJlc2VudCgoIlx0XHRtczpmYSAlbGxkIGMgJWRcbiIsIChsb25nIGxvbmcpIGZsaXBkYXRh LT5ldmVudC0+ZXZlbnRfaWQsIGZsaXBkYXRhLT5mbGlwX2NvdW50KSk7Ci0KLSAgICBpZiAoZmxp cGRhdGEtPmZsaXBfY291bnQgPT0gMSkKLSAgICAgICAgZnJlZShmbGlwZGF0YS0+ZXZlbnQpOwor ICAgIHN0cnVjdCBtc19wcmVzZW50X3ZibGFua19ldmVudCAqZXZlbnQgPSBkYXRhOwogCi0gICAg bXNfcHJlc2VudF9mbGlwX2ZyZWUoZmxpcCk7CisgICAgZnJlZShldmVudCk7CiB9CiAKIC8qCi0t IAoyLjcuNAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18K eG9yZy1kZXZlbEBsaXN0cy54Lm9yZzogWC5PcmcgZGV2ZWxvcG1lbnQKQXJjaGl2ZXM6IGh0dHA6 Ly9saXN0cy54Lm9yZy9hcmNoaXZlcy94b3JnLWRldmVsCkluZm86IGh0dHBzOi8vbGlzdHMueC5v cmcvbWFpbG1hbi9saXN0aW5mby94b3JnLWRldmVs