From: "james qian wang (Arm Technology China)" Subject: [PATCH v3 3/6] drm/komeda: Build side by side display output pipeline Date: Thu, 14 Nov 2019 08:37:38 +0000 Message-ID: <20191114083658.27237-4-james.qian.wang@arm.com> References: <20191114083658.27237-1-james.qian.wang@arm.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-eopbgr60072.outbound.protection.outlook.com [40.107.6.72]) by gabe.freedesktop.org (Postfix) with ESMTPS id 82ADD6E434 for ; Thu, 14 Nov 2019 08:37:49 +0000 (UTC) In-Reply-To: <20191114083658.27237-1-james.qian.wang@arm.com> Content-Language: en-US List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Liviu Dudau , "airlied@linux.ie" , Brian Starkey , "maarten.lankhorst@linux.intel.com" , "sean@poorly.run" , Mihail Atanassov Cc: nd , Ayan Halder , "Oscar Zhang (Arm Technology China)" , "Tiannan Zhu (Arm Technology China)" , "Jonathan Chai (Arm Technology China)" , "linux-kernel@vger.kernel.org" , "dri-devel@lists.freedesktop.org" , "Julien Yin (Arm Technology China)" , "Channing Chen (Arm Technology China)" , "james qian wang (Arm Technology China)" , "Yiqi Kang (Arm Technology China)" , "Thomas Sun (Arm Technology China)" , "Lowry Li (Arm Technology China)" , Ben Davis List-Id: dri-devel@lists.freedesktop.org Rm9yIHNpZGUgYnkgc2lkZSwgdGhlIHNsYXZlIHBpcGVsaW5lIG1lcmdlcyB0byBtYXN0ZXIgdmlh IGltYWdlIHByb2Nlc3NvcgoKIHNsYXZlLWxheWVycyAtPiBzbGF2ZS1jb21waXotPiBzbGF2ZS1p bXByb2MtCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFwKIG1h c3Rlci1sYXllcnMgLT4gbWFzdGVyLWNvbXBpeiAtLS0tLS0tLS0tLS0tPiBtYXN0ZXItaW1wcm9j IC0+Cgp2MzogUmViYXNlLgoKU2lnbmVkLW9mZi1ieTogSmFtZXMgUWlhbiBXYW5nIChBcm0gVGVj aG5vbG9neSBDaGluYSkgPGphbWVzLnFpYW4ud2FuZ0Bhcm0uY29tPgotLS0KIC4uLi9hcm0vZGlz cGxheS9rb21lZGEvZDcxL2Q3MV9jb21wb25lbnQuYyAgICB8ICA0ICsrCiAuLi4vZ3B1L2RybS9h cm0vZGlzcGxheS9rb21lZGEva29tZWRhX2NydGMuYyAgfCAxOCArKysrKy0tCiAuLi4vZHJtL2Fy bS9kaXNwbGF5L2tvbWVkYS9rb21lZGFfcGlwZWxpbmUuaCAgfCAgMSArCiAuLi4vZGlzcGxheS9r b21lZGEva29tZWRhX3BpcGVsaW5lX3N0YXRlLmMgICAgfCA1MSArKysrKysrKysrKysrKy0tLS0t CiAuLi4vYXJtL2Rpc3BsYXkva29tZWRhL2tvbWVkYV93Yl9jb25uZWN0b3IuYyAgfCAgMiArLQog NSBmaWxlcyBjaGFuZ2VkLCA1NiBpbnNlcnRpb25zKCspLCAyMCBkZWxldGlvbnMoLSkKCmRpZmYg LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYXJtL2Rpc3BsYXkva29tZWRhL2Q3MS9kNzFfY29tcG9u ZW50LmMgYi9kcml2ZXJzL2dwdS9kcm0vYXJtL2Rpc3BsYXkva29tZWRhL2Q3MS9kNzFfY29tcG9u ZW50LmMKaW5kZXggYjY1MTdjNDZlNjcwLi42ZGFkZjQ0MTNlZjMgMTAwNjQ0Ci0tLSBhL2RyaXZl cnMvZ3B1L2RybS9hcm0vZGlzcGxheS9rb21lZGEvZDcxL2Q3MV9jb21wb25lbnQuYworKysgYi9k cml2ZXJzL2dwdS9kcm0vYXJtL2Rpc3BsYXkva29tZWRhL2Q3MS9kNzFfY29tcG9uZW50LmMKQEAg LTEwODUsNiArMTA4NSwxMCBAQCBzdGF0aWMgdm9pZCBkNzFfaW1wcm9jX3VwZGF0ZShzdHJ1Y3Qg a29tZWRhX2NvbXBvbmVudCAqYywKIAllbHNlIGlmIChzdC0+Y29sb3JfZm9ybWF0ID09IERSTV9D T0xPUl9GT1JNQVRfWUNSQ0I0NDQpCiAJCWN0cmwgfD0gSVBTX0NUUkxfWVVWOwogCisJLyogc2xh dmUgaW5wdXQgaGFzIGJlZW4gZW5hYmxlZCwgbWVhbnMgc2lkZSBieSBzaWRlICovCisJaWYgKGhh c19iaXQoMSwgc3RhdGUtPmFjdGl2ZV9pbnB1dHMpKQorCQljdHJsIHw9IElQU19DVFJMX1NCUzsK KwogCW1hbGlkcF93cml0ZTMyX21hc2socmVnLCBCTEtfQ09OVFJPTCwgbWFzaywgY3RybCk7CiB9 CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hcm0vZGlzcGxheS9rb21lZGEva29tZWRh X2NydGMuYyBiL2RyaXZlcnMvZ3B1L2RybS9hcm0vZGlzcGxheS9rb21lZGEva29tZWRhX2NydGMu YwppbmRleCBjZWU5YTE2OTJlNzEuLjI0OTI4YjkyMmZiZCAxMDA2NDQKLS0tIGEvZHJpdmVycy9n cHUvZHJtL2FybS9kaXNwbGF5L2tvbWVkYS9rb21lZGFfY3J0Yy5jCisrKyBiL2RyaXZlcnMvZ3B1 L2RybS9hcm0vZGlzcGxheS9rb21lZGEva29tZWRhX2NydGMuYwpAQCAtMzg1LDE1ICszODUsMjMg QEAga29tZWRhX2NydGNfYXRvbWljX2ZsdXNoKHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKIAlrb21l ZGFfY3J0Y19kb19mbHVzaChjcnRjLCBvbGQpOwogfQogCi0vKiBSZXR1cm5zIHRoZSBtaW5pbXVt IGZyZXF1ZW5jeSBvZiB0aGUgYWNsayByYXRlIChtYWluIGVuZ2luZSBjbG9jaykgaW4gSHogKi8K Ky8qCisgKiBSZXR1cm5zIHRoZSBtaW5pbXVtIGZyZXF1ZW5jeSBvZiB0aGUgYWNsayByYXRlICht YWluIGVuZ2luZSBjbG9jaykgaW4gSHouCisgKgorICogVGhlIERQVSBvdXRwdXQgY2FuIGJlIHNw bGl0IGludG8gdHdvIGhhbHZlcywgdG8gc3RheSB3aXRoaW4gdGhlIGJhbmR3aWR0aAorICogY2Fw YWJpbGl0aWVzIG9mIHRoZSBleHRlcm5hbCBsaW5rIChkdWFsLWxpbmsgbW9kZSkuCisgKiBJbiB0 aGVzZSBjYXNlcywgZWFjaCBvdXRwdXQgbGluayBydW5zIGF0IGhhbGYgdGhlIHBpeGVsIGNsb2Nr IHJhdGUgb2YgdGhlCisgKiBjb21iaW5lZCBkaXNwbGF5LCBhbmQgaGFzIGhhbGYgdGhlIG51bWJl ciBvZiBwaXhlbHMuCisgKiBCZXNpZGUgc3BsaXQgdGhlIG91dHB1dCwgdGhlIERQVSBpbnRlcm5h bCBwaXhlbCBwcm9jZXNzaW5nIGFsc28gY2FuIGJlIHNwbGl0CisgKiBpbnRvIHR3byBoYWx2ZXMg KExFRlQvUklHSFQpIGFuZCBoYW5kbGVzIGJ5IHR3byBwaXBlbGluZXMgc2ltdWx0YW5lb3VzbHku CisgKiBTbyBpZiBzaWRlIGJ5IHNpZGUsIHRoZSBwaXBlbGluZSAobWFpbiBlbmdpbmUgY2xvY2sp IGFsc28gY2FuIHJ1biBhdCBoYWxmCisgKiB0aGUgY2xvY2sgcmF0ZSBvZiB0aGUgY29tYmluZWQg ZGlzcGxheS4KKyAqLwogc3RhdGljIHVuc2lnbmVkIGxvbmcKIGtvbWVkYV9jYWxjX21pbl9hY2xr X3JhdGUoc3RydWN0IGtvbWVkYV9jcnRjICprY3J0YywKIAkJCSAgdW5zaWduZWQgbG9uZyBweGxj bGspCiB7Ci0JLyogT25jZSBkdWFsLWxpbmsgb25lIGRpc3BsYXkgcGlwZWxpbmUgZHJpdmVzIHR3 byBkaXNwbGF5IG91dHB1dHMsCi0JICogdGhlIGFjbGsgbmVlZHMgcnVuIG9uIHRoZSBkb3VibGUg cmF0ZSBvZiBweGxjbGsKLQkgKi8KLQlpZiAoa2NydGMtPm1hc3Rlci0+ZHVhbF9saW5rKQorCWlm IChrY3J0Yy0+bWFzdGVyLT5kdWFsX2xpbmsgJiYgIWtjcnRjLT5zaWRlX2J5X3NpZGUpCiAJCXJl dHVybiBweGxjbGsgKiAyOwogCWVsc2UKIAkJcmV0dXJuIHB4bGNsazsKZGlmZiAtLWdpdCBhL2Ry aXZlcnMvZ3B1L2RybS9hcm0vZGlzcGxheS9rb21lZGEva29tZWRhX3BpcGVsaW5lLmggYi9kcml2 ZXJzL2dwdS9kcm0vYXJtL2Rpc3BsYXkva29tZWRhL2tvbWVkYV9waXBlbGluZS5oCmluZGV4IDRj MDk0NmZiYWFjMS4uNTlhODFiNDQ3NmRmIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYXJt L2Rpc3BsYXkva29tZWRhL2tvbWVkYV9waXBlbGluZS5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9h cm0vZGlzcGxheS9rb21lZGEva29tZWRhX3BpcGVsaW5lLmgKQEAgLTU0MCw2ICs1NDAsNyBAQCBz dHJ1Y3Qga29tZWRhX2NydGNfc3RhdGU7CiBzdHJ1Y3Qga29tZWRhX2NydGM7CiAKIHZvaWQgcGlw ZWxpbmVfY29tcG9zaXRpb25fc2l6ZShzdHJ1Y3Qga29tZWRhX2NydGNfc3RhdGUgKmtjcnRjX3N0 LAorCQkJICAgICAgIGJvb2wgc2lkZV9ieV9zaWRlLAogCQkJICAgICAgIHUxNiAqaHNpemUsIHUx NiAqdnNpemUpOwogCiBpbnQga29tZWRhX2J1aWxkX2xheWVyX2RhdGFfZmxvdyhzdHJ1Y3Qga29t ZWRhX2xheWVyICpsYXllciwKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hcm0vZGlzcGxh eS9rb21lZGEva29tZWRhX3BpcGVsaW5lX3N0YXRlLmMgYi9kcml2ZXJzL2dwdS9kcm0vYXJtL2Rp c3BsYXkva29tZWRhL2tvbWVkYV9waXBlbGluZV9zdGF0ZS5jCmluZGV4IDVkZTBkMjMxYTFjMy4u NGRiZjcxNDU1ZDFkIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYXJtL2Rpc3BsYXkva29t ZWRhL2tvbWVkYV9waXBlbGluZV9zdGF0ZS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hcm0vZGlz cGxheS9rb21lZGEva29tZWRhX3BpcGVsaW5lX3N0YXRlLmMKQEAgLTY1NCwxMiArNjU0LDEzIEBA IGtvbWVkYV9tZXJnZXJfdmFsaWRhdGUoc3RydWN0IGtvbWVkYV9tZXJnZXIgKm1lcmdlciwKIH0K IAogdm9pZCBwaXBlbGluZV9jb21wb3NpdGlvbl9zaXplKHN0cnVjdCBrb21lZGFfY3J0Y19zdGF0 ZSAqa2NydGNfc3QsCisJCQkgICAgICAgYm9vbCBzaWRlX2J5X3NpZGUsCiAJCQkgICAgICAgdTE2 ICpoc2l6ZSwgdTE2ICp2c2l6ZSkKIHsKIAlzdHJ1Y3QgZHJtX2Rpc3BsYXlfbW9kZSAqbSA9ICZr Y3J0Y19zdC0+YmFzZS5hZGp1c3RlZF9tb2RlOwogCiAJaWYgKGhzaXplKQotCQkqaHNpemUgPSBt LT5oZGlzcGxheTsKKwkJKmhzaXplID0gc2lkZV9ieV9zaWRlID8gbS0+aGRpc3BsYXkgLyAyIDog bS0+aGRpc3BsYXk7CiAJaWYgKHZzaXplKQogCQkqdnNpemUgPSBtLT52ZGlzcGxheTsKIH0KQEAg LTY3MCwxMiArNjcxLDE0IEBAIGtvbWVkYV9jb21waXpfc2V0X2lucHV0KHN0cnVjdCBrb21lZGFf Y29tcGl6ICpjb21waXosCiAJCQlzdHJ1Y3Qga29tZWRhX2RhdGFfZmxvd19jZmcgKmRmbG93KQog ewogCXN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpkcm1fc3QgPSBrY3J0Y19zdC0+YmFzZS5zdGF0 ZTsKKwlzdHJ1Y3QgZHJtX2NydGMgKmNydGMgPSBrY3J0Y19zdC0+YmFzZS5jcnRjOwogCXN0cnVj dCBrb21lZGFfY29tcG9uZW50X3N0YXRlICpjX3N0LCAqb2xkX3N0OwogCXN0cnVjdCBrb21lZGFf Y29tcGl6X2lucHV0X2NmZyAqY2luOwogCXUxNiBjb21waXpfdywgY29tcGl6X2g7CiAJaW50IGlk eCA9IGRmbG93LT5ibGVuZGluZ196b3JkZXI7CiAKLQlwaXBlbGluZV9jb21wb3NpdGlvbl9zaXpl KGtjcnRjX3N0LCAmY29tcGl6X3csICZjb21waXpfaCk7CisJcGlwZWxpbmVfY29tcG9zaXRpb25f c2l6ZShrY3J0Y19zdCwgdG9fa2NydGMoY3J0YyktPnNpZGVfYnlfc2lkZSwKKwkJCQkgICZjb21w aXpfdywgJmNvbXBpel9oKTsKIAkvKiBjaGVjayBkaXNwbGF5IHJlY3QgKi8KIAlpZiAoKGRmbG93 LT5vdXRfeCArIGRmbG93LT5vdXRfdyA+IGNvbXBpel93KSB8fAogCSAgICAoZGZsb3ctPm91dF95 ICsgZGZsb3ctPm91dF9oID4gY29tcGl6X2gpIHx8CkBAIC02ODcsNyArNjkwLDcgQEAga29tZWRh X2NvbXBpel9zZXRfaW5wdXQoc3RydWN0IGtvbWVkYV9jb21waXogKmNvbXBpeiwKIAl9CiAKIAlj X3N0ID0ga29tZWRhX2NvbXBvbmVudF9nZXRfc3RhdGVfYW5kX3NldF91c2VyKCZjb21waXotPmJh c2UsIGRybV9zdCwKLQkJCWtjcnRjX3N0LT5iYXNlLmNydGMsIGtjcnRjX3N0LT5iYXNlLmNydGMp OworCQkJY3J0YywgY3J0Yyk7CiAJaWYgKElTX0VSUihjX3N0KSkKIAkJcmV0dXJuIFBUUl9FUlIo Y19zdCk7CiAKQEAgLTcyMSwxNyArNzI0LDE5IEBAIGtvbWVkYV9jb21waXpfdmFsaWRhdGUoc3Ry dWN0IGtvbWVkYV9jb21waXogKmNvbXBpeiwKIAkJICAgICAgIHN0cnVjdCBrb21lZGFfY3J0Y19z dGF0ZSAqc3RhdGUsCiAJCSAgICAgICBzdHJ1Y3Qga29tZWRhX2RhdGFfZmxvd19jZmcgKmRmbG93 KQogeworCXN0cnVjdCBkcm1fY3J0YyAqY3J0YyA9IHN0YXRlLT5iYXNlLmNydGM7CiAJc3RydWN0 IGtvbWVkYV9jb21wb25lbnRfc3RhdGUgKmNfc3Q7CiAJc3RydWN0IGtvbWVkYV9jb21waXpfc3Rh dGUgKnN0OwogCiAJY19zdCA9IGtvbWVkYV9jb21wb25lbnRfZ2V0X3N0YXRlX2FuZF9zZXRfdXNl cigmY29tcGl6LT5iYXNlLAotCQkJc3RhdGUtPmJhc2Uuc3RhdGUsIHN0YXRlLT5iYXNlLmNydGMs IHN0YXRlLT5iYXNlLmNydGMpOworCQkJc3RhdGUtPmJhc2Uuc3RhdGUsIGNydGMsIGNydGMpOwog CWlmIChJU19FUlIoY19zdCkpCiAJCXJldHVybiBQVFJfRVJSKGNfc3QpOwogCiAJc3QgPSB0b19j b21waXpfc3QoY19zdCk7CiAKLQlwaXBlbGluZV9jb21wb3NpdGlvbl9zaXplKHN0YXRlLCAmc3Qt PmhzaXplLCAmc3QtPnZzaXplKTsKKwlwaXBlbGluZV9jb21wb3NpdGlvbl9zaXplKHN0YXRlLCB0 b19rY3J0YyhjcnRjKS0+c2lkZV9ieV9zaWRlLAorCQkJCSAgJnN0LT5oc2l6ZSwgJnN0LT52c2l6 ZSk7CiAKIAlrb21lZGFfY29tcG9uZW50X3NldF9vdXRwdXQoJmRmbG93LT5pbnB1dCwgJmNvbXBp ei0+YmFzZSwgMCk7CiAKQEAgLTc1Nyw3ICs3NjIsOCBAQCBrb21lZGFfY29tcGl6X3ZhbGlkYXRl KHN0cnVjdCBrb21lZGFfY29tcGl6ICpjb21waXosCiBzdGF0aWMgaW50CiBrb21lZGFfaW1wcm9j X3ZhbGlkYXRlKHN0cnVjdCBrb21lZGFfaW1wcm9jICppbXByb2MsCiAJCSAgICAgICBzdHJ1Y3Qg a29tZWRhX2NydGNfc3RhdGUgKmtjcnRjX3N0LAotCQkgICAgICAgc3RydWN0IGtvbWVkYV9kYXRh X2Zsb3dfY2ZnICpkZmxvdykKKwkJICAgICAgIHN0cnVjdCBrb21lZGFfZGF0YV9mbG93X2NmZyAq bV9kZmxvdywKKwkJICAgICAgIHN0cnVjdCBrb21lZGFfZGF0YV9mbG93X2NmZyAqc19kZmxvdykK IHsKIAlzdHJ1Y3QgZHJtX2NydGMgKmNydGMgPSBrY3J0Y19zdC0+YmFzZS5jcnRjOwogCXN0cnVj dCBkcm1fY3J0Y19zdGF0ZSAqY3J0Y19zdCA9ICZrY3J0Y19zdC0+YmFzZTsKQEAgLTc3MSw4ICs3 NzcsOCBAQCBrb21lZGFfaW1wcm9jX3ZhbGlkYXRlKHN0cnVjdCBrb21lZGFfaW1wcm9jICppbXBy b2MsCiAKIAlzdCA9IHRvX2ltcHJvY19zdChjX3N0KTsKIAotCXN0LT5oc2l6ZSA9IGRmbG93LT5p bl93OwotCXN0LT52c2l6ZSA9IGRmbG93LT5pbl9oOworCXN0LT5oc2l6ZSA9IG1fZGZsb3ctPmlu X3c7CisJc3QtPnZzaXplID0gbV9kZmxvdy0+aW5faDsKIAogCWlmIChkcm1fYXRvbWljX2NydGNf bmVlZHNfbW9kZXNldChjcnRjX3N0KSkgewogCQl1MzIgb3V0cHV0X2RlcHRocywgb3V0cHV0X2Zv cm1hdHM7CkBAIC04MDgsOCArODE0LDEwIEBAIGtvbWVkYV9pbXByb2NfdmFsaWRhdGUoc3RydWN0 IGtvbWVkYV9pbXByb2MgKmltcHJvYywKIAkJZHJtX2N0bV90b19jb2VmZnMoa2NydGNfc3QtPmJh c2UuY3RtLCBzdC0+Y3RtX2NvZWZmcyk7CiAJfQogCi0Ja29tZWRhX2NvbXBvbmVudF9hZGRfaW5w dXQoJnN0LT5iYXNlLCAmZGZsb3ctPmlucHV0LCAwKTsKLQlrb21lZGFfY29tcG9uZW50X3NldF9v dXRwdXQoJmRmbG93LT5pbnB1dCwgJmltcHJvYy0+YmFzZSwgMCk7CisJa29tZWRhX2NvbXBvbmVu dF9hZGRfaW5wdXQoJnN0LT5iYXNlLCAmbV9kZmxvdy0+aW5wdXQsIDApOworCWlmIChzX2RmbG93 KQorCQlrb21lZGFfY29tcG9uZW50X2FkZF9pbnB1dCgmc3QtPmJhc2UsICZzX2RmbG93LT5pbnB1 dCwgMSk7CisJa29tZWRhX2NvbXBvbmVudF9zZXRfb3V0cHV0KCZtX2RmbG93LT5pbnB1dCwgJmlt cHJvYy0+YmFzZSwgMCk7CiAKIAlyZXR1cm4gMDsKIH0KQEAgLTExNDYsNyArMTE1NCw3IEBAIGtv bWVkYV9zcGxpdF9zYnNfbWFzdGVyX2RhdGFfZmxvdyhzdHJ1Y3Qga29tZWRhX2NydGNfc3RhdGUg KmtjcnRjX3N0LAogCXUzMiBkaXNwX2VuZCA9IG1hc3Rlci0+b3V0X3ggKyBtYXN0ZXItPm91dF93 OwogCXUxNiBib3VuZGFyeTsKIAotCXBpcGVsaW5lX2NvbXBvc2l0aW9uX3NpemUoa2NydGNfc3Qs ICZib3VuZGFyeSwgTlVMTCk7CisJcGlwZWxpbmVfY29tcG9zaXRpb25fc2l6ZShrY3J0Y19zdCwg dHJ1ZSwgJmJvdW5kYXJ5LCBOVUxMKTsKIAogCWlmIChkaXNwX2VuZCA8PSBib3VuZGFyeSkgewog CQkvKiB0aGUgbWFzdGVyIHZpZXdwb3J0IG9ubHkgbG9jYXRlZCBpbiBtYXN0ZXIgc2lkZSwgbm8g bmVlZApAQCAtMTIwOSw3ICsxMjE3LDcgQEAga29tZWRhX3NwbGl0X3Nic19zbGF2ZV9kYXRhX2Zs b3coc3RydWN0IGtvbWVkYV9jcnRjX3N0YXRlICprY3J0Y19zdCwKIHsKIAl1MTYgYm91bmRhcnk7 CiAKLQlwaXBlbGluZV9jb21wb3NpdGlvbl9zaXplKGtjcnRjX3N0LCAmYm91bmRhcnksIE5VTEwp OworCXBpcGVsaW5lX2NvbXBvc2l0aW9uX3NpemUoa2NydGNfc3QsIHRydWUsICZib3VuZGFyeSwg TlVMTCk7CiAKIAlpZiAoc2xhdmUtPm91dF94IDwgYm91bmRhcnkpIHsKIAkJRFJNX0RFQlVHX0FU T01JQygiU0JTIFNsYXZlIHBsYW5lIGlzIG9ubHkgYWxsb3dlZCB0byBjb25maWd1cmUgdGhlIHJp Z2h0IHBhcnQgZnJhbWUuXG4iKTsKQEAgLTEzODQsNyArMTM5MiwyMCBAQCBpbnQga29tZWRhX2J1 aWxkX2Rpc3BsYXlfZGF0YV9mbG93KHN0cnVjdCBrb21lZGFfY3J0YyAqa2NydGMsCiAJbWVtc2V0 KCZtX2RmbG93LCAwLCBzaXplb2YobV9kZmxvdykpOwogCW1lbXNldCgmc19kZmxvdywgMCwgc2l6 ZW9mKHNfZGZsb3cpKTsKIAotCWlmIChzbGF2ZSAmJiBoYXNfYml0KHNsYXZlLT5pZCwga2NydGNf c3QtPmFjdGl2ZV9waXBlcykpIHsKKwkvKiBidWlsZCBzbGF2ZSBvdXRwdXQgZGF0YSBmbG93ICov CisJaWYgKGtjcnRjLT5zaWRlX2J5X3NpZGUpIHsKKwkJLyogb24gc2lkZSBieSBzaWRlLCB0aGUg c2xhdmUgZGF0YSBmbG93cyBpbnRvIHRoZSBpbXByb2Mgb2YKKwkJICogaXRzZWxmIGZpcnN0LCBh bmQgdGhlbiBtZXJnZSBpdCBpbnRvIG1hc3RlcidzIGltYWdlIHByb2Nlc3NvcgorCQkgKi8KKwkJ ZXJyID0ga29tZWRhX2NvbXBpel92YWxpZGF0ZShzbGF2ZS0+Y29tcGl6LCBrY3J0Y19zdCwgJnNf ZGZsb3cpOworCQlpZiAoZXJyKQorCQkJcmV0dXJuIGVycjsKKworCQllcnIgPSBrb21lZGFfaW1w cm9jX3ZhbGlkYXRlKHNsYXZlLT5pbXByb2MsIGtjcnRjX3N0LAorCQkJCQkgICAgICZzX2RmbG93 LCBOVUxMKTsKKwkJaWYgKGVycikKKwkJCXJldHVybiBlcnI7CisJfSBlbHNlIGlmIChzbGF2ZSAm JiBoYXNfYml0KHNsYXZlLT5pZCwga2NydGNfc3QtPmFjdGl2ZV9waXBlcykpIHsKIAkJZXJyID0g a29tZWRhX2NvbXBpel92YWxpZGF0ZShzbGF2ZS0+Y29tcGl6LCBrY3J0Y19zdCwgJnNfZGZsb3cp OwogCQlpZiAoZXJyKQogCQkJcmV0dXJuIGVycjsKQEAgLTE0MDAsNyArMTQyMSw5IEBAIGludCBr b21lZGFfYnVpbGRfZGlzcGxheV9kYXRhX2Zsb3coc3RydWN0IGtvbWVkYV9jcnRjICprY3J0YywK IAlpZiAoZXJyKQogCQlyZXR1cm4gZXJyOwogCi0JZXJyID0ga29tZWRhX2ltcHJvY192YWxpZGF0 ZShtYXN0ZXItPmltcHJvYywga2NydGNfc3QsICZtX2RmbG93KTsKKwkvKiBvbiBzaWRlIGJ5IHNp ZGUsIG1lcmdlIHRoZSBzbGF2ZSBkZmxvdyBpbnRvIG1hc3RlciAqLworCWVyciA9IGtvbWVkYV9p bXByb2NfdmFsaWRhdGUobWFzdGVyLT5pbXByb2MsIGtjcnRjX3N0LCAmbV9kZmxvdywKKwkJCQkg ICAgIGtjcnRjLT5zaWRlX2J5X3NpZGUgPyAmc19kZmxvdyA6IE5VTEwpOwogCWlmIChlcnIpCiAJ CXJldHVybiBlcnI7CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hcm0vZGlzcGxheS9r b21lZGEva29tZWRhX3diX2Nvbm5lY3Rvci5jIGIvZHJpdmVycy9ncHUvZHJtL2FybS9kaXNwbGF5 L2tvbWVkYS9rb21lZGFfd2JfY29ubmVjdG9yLmMKaW5kZXggZTQ2NWNjNDg3OWM5Li4xN2VhMDIx NDg4YWEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hcm0vZGlzcGxheS9rb21lZGEva29t ZWRhX3diX2Nvbm5lY3Rvci5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hcm0vZGlzcGxheS9rb21l ZGEva29tZWRhX3diX2Nvbm5lY3Rvci5jCkBAIC0yMSw3ICsyMSw3IEBAIGtvbWVkYV93Yl9pbml0 X2RhdGFfZmxvdyhzdHJ1Y3Qga29tZWRhX2xheWVyICp3Yl9sYXllciwKIAlkZmxvdy0+b3V0X2gg PSBmYi0+aGVpZ2h0OwogCiAJLyogdGhlIHdyaXRlIGJhY2sgZGF0YSBjb21lcyBmcm9tIHRoZSBj b21waXogKi8KLQlwaXBlbGluZV9jb21wb3NpdGlvbl9zaXplKGtjcnRjX3N0LCAmZGZsb3ctPmlu X3csICZkZmxvdy0+aW5faCk7CisJcGlwZWxpbmVfY29tcG9zaXRpb25fc2l6ZShrY3J0Y19zdCwg ZmFsc2UsICZkZmxvdy0+aW5fdywgJmRmbG93LT5pbl9oKTsKIAlkZmxvdy0+aW5wdXQuY29tcG9u ZW50ID0gJndiX2xheWVyLT5iYXNlLnBpcGVsaW5lLT5jb21waXotPmJhc2U7CiAJLyogY29tcGl6 IGRvZXNuJ3Qgb3V0cHV0IGFscGhhICovCiAJZGZsb3ctPnBpeGVsX2JsZW5kX21vZGUgPSBEUk1f TU9ERV9CTEVORF9QSVhFTF9OT05FOwotLSAKMi4yMC4xCgpfX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZl bEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFp bG1hbi9saXN0aW5mby9kcmktZGV2ZWw=