From: Maarten Lankhorst Subject: [PATCH 15/23] drm/i915: Link planes in a bigjoiner configuration. Date: Fri, 20 Sep 2019 13:42:27 +0200 Message-ID: <20190920114235.22411-15-maarten.lankhorst@linux.intel.com> References: <20190920114235.22411-1-maarten.lankhorst@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mblankhorst.nl (mblankhorst.nl [141.105.120.124]) by gabe.freedesktop.org (Postfix) with ESMTPS id B3EFE6FCA5 for ; Fri, 20 Sep 2019 11:42:42 +0000 (UTC) In-Reply-To: <20190920114235.22411-1-maarten.lankhorst@linux.intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org TWFrZSBzdXJlIHRoYXQgd2hlbiBhIHBsYW5lIGlzIHNldCBpbiBhIGJpZ2pvaW5lciBtb2RlLCB3 ZSB3aWxsIGFkZAp0aGVpciBjb3VudGVycGFydCB0byB0aGUgYXRvbWljIHN0YXRlIGFzIHdlbGwu IFRoaXMgd2lsbCBhbGxvdyB1cyB0bwptYWtlIHN1cmUgYWxsIHN0YXRlIGlzIGF2YWlsYWJsZSB3 aGVuIHBsYW5lcyBhcmUgY2hlY2tlZC4KCkJlY2F1c2Ugb2YgdGhlIGZ1bm55IGludGVyYWN0aW9u cyB3aXRoIGJpZ2pvaW5lciBhbmQgcGxhbmFyIFlVVgpmb3JtYXRzLCB3ZSBtYXkgZW5kIHVwIGFk ZGluZyBhIGxvdCBvZiBwbGFuZXMsIHNvIHdlIGhhdmUgdG8ga2VlcAppdGVyYXRpbmcgdW50aWwg d2Ugbm8gbG9uZ2VyIGFkZCBhbnkgcGxhbmVzLgoKU2lnbmVkLW9mZi1ieTogTWFhcnRlbiBMYW5r aG9yc3QgPG1hYXJ0ZW4ubGFua2hvcnN0QGxpbnV4LmludGVsLmNvbT4KLS0tCiAuLi4vZ3B1L2Ry bS9pOTE1L2Rpc3BsYXkvaW50ZWxfYXRvbWljX3BsYW5lLmMgfCAgMzEgKysrLQogLi4uL2dwdS9k cm0vaTkxNS9kaXNwbGF5L2ludGVsX2F0b21pY19wbGFuZS5oIHwgICA0ICsKIGRyaXZlcnMvZ3B1 L2RybS9pOTE1L2Rpc3BsYXkvaW50ZWxfZGlzcGxheS5jICB8IDE0MiArKysrKysrKysrKysrKysr LS0KIC4uLi9kcm0vaTkxNS9kaXNwbGF5L2ludGVsX2Rpc3BsYXlfdHlwZXMuaCAgICB8ICAxMSAr KwogNCBmaWxlcyBjaGFuZ2VkLCAxNzIgaW5zZXJ0aW9ucygrKSwgMTYgZGVsZXRpb25zKC0pCgpk aWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvZGlzcGxheS9pbnRlbF9hdG9taWNfcGxh bmUuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2Rpc3BsYXkvaW50ZWxfYXRvbWljX3BsYW5lLmMK aW5kZXggOTY0ZGI3Nzc0ZDEwLi5jYzA4ODY3NmYwYTIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2Rpc3BsYXkvaW50ZWxfYXRvbWljX3BsYW5lLmMKKysrIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvZGlzcGxheS9pbnRlbF9hdG9taWNfcGxhbmUuYwpAQCAtMTgyLDE2ICsxODIsMzYg QEAgaW50IGludGVsX3BsYW5lX2F0b21pY19jaGVja193aXRoX3N0YXRlKGNvbnN0IHN0cnVjdCBp bnRlbF9jcnRjX3N0YXRlICpvbGRfY3J0Y18KIAkJCQkJICAgICAgIG9sZF9wbGFuZV9zdGF0ZSwg bmV3X3BsYW5lX3N0YXRlKTsKIH0KIAotc3RhdGljIHN0cnVjdCBpbnRlbF9jcnRjICoKLWdldF9j cnRjX2Zyb21fc3RhdGVzKGNvbnN0IHN0cnVjdCBpbnRlbF9wbGFuZV9zdGF0ZSAqb2xkX3BsYW5l X3N0YXRlLAotCQkgICAgIGNvbnN0IHN0cnVjdCBpbnRlbF9wbGFuZV9zdGF0ZSAqbmV3X3BsYW5l X3N0YXRlKQoteworc3RydWN0IGludGVsX2NydGMgKgoraW50ZWxfcGxhbmVfZ2V0X2NydGNfZnJv bV9zdGF0ZXMoc3RydWN0IGludGVsX2F0b21pY19zdGF0ZSAqc3RhdGUsCisJCQkJIGNvbnN0IHN0 cnVjdCBpbnRlbF9wbGFuZV9zdGF0ZSAqb2xkX3BsYW5lX3N0YXRlLAorCQkJCSBjb25zdCBzdHJ1 Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKm5ld19wbGFuZV9zdGF0ZSkKKyAgeworCXN0cnVjdCBkcm1f aTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoc3RhdGUtPmJhc2UuZGV2KTsKKwlzdHJ1 Y3QgaW50ZWxfcGxhbmUgKnBsYW5lID0gdG9faW50ZWxfcGxhbmUobmV3X3BsYW5lX3N0YXRlLT5i YXNlLnBsYW5lKTsKKwogCWlmIChuZXdfcGxhbmVfc3RhdGUtPmJhc2UuY3J0YykKIAkJcmV0dXJu IHRvX2ludGVsX2NydGMobmV3X3BsYW5lX3N0YXRlLT5iYXNlLmNydGMpOwogCiAJaWYgKG9sZF9w bGFuZV9zdGF0ZS0+YmFzZS5jcnRjKQogCQlyZXR1cm4gdG9faW50ZWxfY3J0YyhvbGRfcGxhbmVf c3RhdGUtPmJhc2UuY3J0Yyk7CiAKKwlpZiAobmV3X3BsYW5lX3N0YXRlLT5iaWdqb2luZXJfc2xh dmUpIHsKKwkJY29uc3Qgc3RydWN0IGludGVsX3BsYW5lX3N0YXRlICpuZXdfbWFzdGVyX3BsYW5l X3N0YXRlID0KKwkJCWludGVsX2F0b21pY19nZXRfbmV3X3BsYW5lX3N0YXRlKHN0YXRlLCBuZXdf cGxhbmVfc3RhdGUtPmJpZ2pvaW5lcl9wbGFuZSk7CisKKwkJaWYgKG5ld19tYXN0ZXJfcGxhbmVf c3RhdGUtPmJhc2UuY3J0YykKKwkJCXJldHVybiBpbnRlbF9nZXRfY3J0Y19mb3JfcGlwZShkZXZf cHJpdiwgcGxhbmUtPnBpcGUpOworCX0KKworCWlmIChvbGRfcGxhbmVfc3RhdGUtPmJpZ2pvaW5l cl9zbGF2ZSkgeworCQljb25zdCBzdHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKm9sZF9tYXN0ZXJf cGxhbmVfc3RhdGUgPQorCQkJaW50ZWxfYXRvbWljX2dldF9vbGRfcGxhbmVfc3RhdGUoc3RhdGUs IG9sZF9wbGFuZV9zdGF0ZS0+Ymlnam9pbmVyX3BsYW5lKTsKKworCQlpZiAob2xkX21hc3Rlcl9w bGFuZV9zdGF0ZS0+YmFzZS5jcnRjKQorCQkJcmV0dXJuIGludGVsX2dldF9jcnRjX2Zvcl9waXBl KGRldl9wcml2LCBwbGFuZS0+cGlwZSk7CisJfQorCiAJcmV0dXJuIE5VTEw7CiB9CiAKQEAgLTIw Niw3ICsyMjYsOCBAQCBzdGF0aWMgaW50IGludGVsX3BsYW5lX2F0b21pY19jaGVjayhzdHJ1Y3Qg ZHJtX3BsYW5lICpfcGxhbmUsCiAJY29uc3Qgc3RydWN0IGludGVsX3BsYW5lX3N0YXRlICpvbGRf cGxhbmVfc3RhdGUgPQogCQlpbnRlbF9hdG9taWNfZ2V0X29sZF9wbGFuZV9zdGF0ZShzdGF0ZSwg cGxhbmUpOwogCXN0cnVjdCBpbnRlbF9jcnRjICpjcnRjID0KLQkJZ2V0X2NydGNfZnJvbV9zdGF0 ZXMob2xkX3BsYW5lX3N0YXRlLCBuZXdfcGxhbmVfc3RhdGUpOworCQlpbnRlbF9wbGFuZV9nZXRf Y3J0Y19mcm9tX3N0YXRlcyhzdGF0ZSwgb2xkX3BsYW5lX3N0YXRlLAorCQkJCQkJIG5ld19wbGFu ZV9zdGF0ZSk7CiAJY29uc3Qgc3RydWN0IGludGVsX2NydGNfc3RhdGUgKm9sZF9jcnRjX3N0YXRl OwogCXN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpuZXdfY3J0Y19zdGF0ZTsKIApkaWZmIC0tZ2l0 IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvZGlzcGxheS9pbnRlbF9hdG9taWNfcGxhbmUuaCBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2Rpc3BsYXkvaW50ZWxfYXRvbWljX3BsYW5lLmgKaW5kZXggMzNm Yjg1Y2QzOTA5Li45MDFhNTBlNmUyZDMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2Rpc3BsYXkvaW50ZWxfYXRvbWljX3BsYW5lLmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv ZGlzcGxheS9pbnRlbF9hdG9taWNfcGxhbmUuaApAQCAtNDIsNSArNDIsOSBAQCBpbnQgaW50ZWxf cGxhbmVfYXRvbWljX2NhbGNfY2hhbmdlcyhjb25zdCBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAq b2xkX2NydGNfc3RhdAogCQkJCSAgICBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0 ZSwKIAkJCQkgICAgY29uc3Qgc3RydWN0IGludGVsX3BsYW5lX3N0YXRlICpvbGRfcGxhbmVfc3Rh dGUsCiAJCQkJICAgIHN0cnVjdCBpbnRlbF9wbGFuZV9zdGF0ZSAqcGxhbmVfc3RhdGUpOworc3Ry dWN0IGludGVsX2NydGMgKgoraW50ZWxfcGxhbmVfZ2V0X2NydGNfZnJvbV9zdGF0ZXMoc3RydWN0 IGludGVsX2F0b21pY19zdGF0ZSAqc3RhdGUsCisJCQkJIGNvbnN0IHN0cnVjdCBpbnRlbF9wbGFu ZV9zdGF0ZSAqb2xkX3BsYW5lX3N0YXRlLAorCQkJCSBjb25zdCBzdHJ1Y3QgaW50ZWxfcGxhbmVf c3RhdGUgKm5ld19wbGFuZV9zdGF0ZSk7CiAKICNlbmRpZiAvKiBfX0lOVEVMX0FUT01JQ19QTEFO RV9IX18gKi8KZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2Rpc3BsYXkvaW50ZWxf ZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvZGlzcGxheS9pbnRlbF9kaXNwbGF5LmMK aW5kZXggZGY1ODhiZjQ3NTU5Li4wNmNlYWM0ZjE0MzYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2Rpc3BsYXkvaW50ZWxfZGlzcGxheS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2Rpc3BsYXkvaW50ZWxfZGlzcGxheS5jCkBAIC0xMTgxMSwyNCArMTE4MTEsMTAxIEBAIHN0 YXRpYyBib29sIGNoZWNrX3NpbmdsZV9lbmNvZGVyX2Nsb25pbmcoc3RydWN0IGRybV9hdG9taWNf c3RhdGUgKnN0YXRlLAogCXJldHVybiB0cnVlOwogfQogCitzdGF0aWMgaW50IGljbF9hZGRfZGVw ZW5kZW50X3BsYW5lcyhzdHJ1Y3QgaW50ZWxfYXRvbWljX3N0YXRlICpzdGF0ZSwKKwkJCQkgICAg c3RydWN0IGludGVsX3BsYW5lX3N0YXRlICpwbGFuZV9zdGF0ZSkKK3sKKwlzdHJ1Y3QgaW50ZWxf cGxhbmVfc3RhdGUgKm5ld19wbGFuZV9zdGF0ZTsKKwlzdHJ1Y3QgaW50ZWxfcGxhbmUgKnBsYW5l OworCWludCByZXQgPSAwOworCisJcGxhbmUgPSBwbGFuZV9zdGF0ZS0+Ymlnam9pbmVyX3BsYW5l OworCWlmIChwbGFuZSAmJiAhaW50ZWxfYXRvbWljX2dldF9uZXdfcGxhbmVfc3RhdGUoc3RhdGUs IHBsYW5lKSkgeworCQluZXdfcGxhbmVfc3RhdGUgPSBpbnRlbF9hdG9taWNfZ2V0X3BsYW5lX3N0 YXRlKHN0YXRlLCBwbGFuZSk7CisJCWlmIChJU19FUlIobmV3X3BsYW5lX3N0YXRlKSkKKwkJCXJl dHVybiBQVFJfRVJSKG5ld19wbGFuZV9zdGF0ZSk7CisKKwkJcmV0ID0gMTsKKwl9CisKKwlwbGFu ZSA9IHBsYW5lX3N0YXRlLT5wbGFuYXJfbGlua2VkX3BsYW5lOworCWlmIChwbGFuZSAmJiAhaW50 ZWxfYXRvbWljX2dldF9uZXdfcGxhbmVfc3RhdGUoc3RhdGUsIHBsYW5lKSkgeworCQluZXdfcGxh bmVfc3RhdGUgPSBpbnRlbF9hdG9taWNfZ2V0X3BsYW5lX3N0YXRlKHN0YXRlLCBwbGFuZSk7CisJ CWlmIChJU19FUlIobmV3X3BsYW5lX3N0YXRlKSkKKwkJCXJldHVybiBQVFJfRVJSKG5ld19wbGFu ZV9zdGF0ZSk7CisKKwkJcmV0ID0gMTsKKwl9CisKKwlyZXR1cm4gcmV0OworfQorCiBzdGF0aWMg aW50IGljbF9hZGRfbGlua2VkX3BsYW5lcyhzdHJ1Y3QgaW50ZWxfYXRvbWljX3N0YXRlICpzdGF0 ZSkKIHsKLQlzdHJ1Y3QgaW50ZWxfcGxhbmUgKnBsYW5lLCAqbGlua2VkOwotCXN0cnVjdCBpbnRl bF9wbGFuZV9zdGF0ZSAqcGxhbmVfc3RhdGUsICpsaW5rZWRfcGxhbmVfc3RhdGU7CisJc3RydWN0 IGludGVsX3BsYW5lICpwbGFuZTsKKwlzdHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKm9sZF9wbGFu ZV9zdGF0ZSwgKm5ld19wbGFuZV9zdGF0ZTsKKwlzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YywgKmxp bmtlZF9jcnRjOworCXN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpvbGRfY3J0Y19zdGF0ZSwgKm5l d19jcnRjX3N0YXRlLCAqbGlua2VkX2NydGNfc3RhdGU7CisJYm9vbCBhZGRlZDsKIAlpbnQgaTsK IAotCWZvcl9lYWNoX25ld19pbnRlbF9wbGFuZV9pbl9zdGF0ZShzdGF0ZSwgcGxhbmUsIHBsYW5l X3N0YXRlLCBpKSB7Ci0JCWxpbmtlZCA9IHBsYW5lX3N0YXRlLT5wbGFuYXJfbGlua2VkX3BsYW5l OworCS8qCisJICogSXRlcmF0aXZlbHkgYWRkIHBsYW5lX3N0YXRlLT5saW5rZWRfcGxhbmUgYW5k IHBsYW5lX3N0YXRlLT5iaWdqb2luZXJfcGxhbmUKKwkgKgorCSAqIFRoaXMgbmVlZHMgdG8gYmUg ZG9uZSByZXBlYXRlZGx5LCBiZWNhdXNlIG9mIGlzIGEgZnVubnkgaW50ZXJhY3Rpb247CisJICog dGhlIFktcGxhbmUgbWF5IGJlIGFzc2lnbmVkIGRpZmZlcmVudGx5IG9uIHRoZSBvdGhlciBiaWdq b2luZXIgY3J0YywKKwkgKiBhbmQgd2UgY291bGQgZW5kIHVwIHdpdGggdGhlIGZvbGxvd2luZyBl dmlsIHJlY3Vyc2lvbiwgd2hlbiBvbmx5IGFkZGluZyBhCisJICogc2luZ2xlIHBsYW5lIHRvIHN0 YXRlOgorCSAqCisJICogWFJHQjg4ODggbWFzdGVyIHBsYW5lIDYgYWRkcyBOVjEyIHNsYXZlIFkt cGxhbmUgNiwgd2hpY2ggYWRkcyBzbGF2ZSBVViBwbGFuZSAwLAorCSAqIHdoaWNoIGFkZHMgbWFz dGVyIFVWIHBsYW5lIDAsIHdoaWNoIGFkZHMgbWFzdGVyIFktcGxhbmUgNywgd2hpY2ggYWRkcyBY UkdCODg4OAorCSAqIHNsYXZlIHBsYW5lIDcuCisJICoKKwkgKiBXZSBjb3VsZCBwdWxsIGluIGV2 ZW4gbW9yZSBiZWNhdXNlIG9mIG9sZF9wbGFuZV9zdGF0ZSB2cyBuZXdfcGxhbmVfc3RhdGUuCisJ ICoKKwkgKiBNYXggZGVwdGggPSA1IChvciA3IGZvciBldmlsIGNhc2UpIGluIHRoaXMgY2FzZS4K KwkgKiBOdW1iZXIgb2YgcGFzc2VzIHdpbGwgYmUgbGVzcywgYmVjYXVzZSBuZXdseSBhZGRlZCBw bGFuZXMgc2hvdyB1cCBpbiB0aGUKKwkgKiBzYW1lIGl0ZXJhdGlvbiByb3VuZCB3aGVuIGFkZGVk X3BsYW5lLT5pbmRleCA+IHBsYW5lLT5pbmRleC4KKwkgKi8KKwlkbyB7CisJCWFkZGVkID0gZmFs c2U7CiAKLQkJaWYgKCFsaW5rZWQpCi0JCQljb250aW51ZTsKKwkJZm9yX2VhY2hfb2xkbmV3X2lu dGVsX3BsYW5lX2luX3N0YXRlKHN0YXRlLCBwbGFuZSwgb2xkX3BsYW5lX3N0YXRlLCBuZXdfcGxh bmVfc3RhdGUsIGkpIHsKKwkJCWludCByZXQsIHJldDI7CisKKwkJCXJldCA9IGljbF9hZGRfZGVw ZW5kZW50X3BsYW5lcyhzdGF0ZSwgb2xkX3BsYW5lX3N0YXRlKTsKKwkJCWlmIChyZXQgPCAwKQor CQkJCXJldHVybiByZXQ7CisKKwkJCXJldDIgPSBpY2xfYWRkX2RlcGVuZGVudF9wbGFuZXMoc3Rh dGUsIG5ld19wbGFuZV9zdGF0ZSk7CisJCQlpZiAocmV0MiA8IDApCisJCQkJcmV0dXJuIHJldDI7 CiAKLQkJbGlua2VkX3BsYW5lX3N0YXRlID0gaW50ZWxfYXRvbWljX2dldF9wbGFuZV9zdGF0ZShz dGF0ZSwgbGlua2VkKTsKLQkJaWYgKElTX0VSUihsaW5rZWRfcGxhbmVfc3RhdGUpKQotCQkJcmV0 dXJuIFBUUl9FUlIobGlua2VkX3BsYW5lX3N0YXRlKTsKKwkJCWFkZGVkIHw9IHJldCB8fCByZXQy OworCQl9CisJfSB3aGlsZSAoYWRkZWQpOworCisJLyoKKwkgKiBNYWtlIHN1cmUgYmlnam9pbmVy IHNsYXZlIGNydGMncyBhcmUgYWxzbyBwdWxsZWQgaW4uIFRoaXMgaXMgbm90IGRvbmUgYXV0b21h dGljYWxseQorCSAqIHdoZW4gYWRkaW5nIHNsYXZlIHBsYW5lcywgYmVjYXVzZSBwbGFuZV9zdGF0 ZS0+Y3J0YyBpcyBudWxsLgorCSAqLworCWZvcl9lYWNoX29sZG5ld19pbnRlbF9jcnRjX2luX3N0 YXRlKHN0YXRlLCBjcnRjLCBvbGRfY3J0Y19zdGF0ZSwgbmV3X2NydGNfc3RhdGUsIGkpIHsKKwkJ bGlua2VkX2NydGMgPSBvbGRfY3J0Y19zdGF0ZS0+Ymlnam9pbmVyX2xpbmtlZF9jcnRjOworCQlp ZiAobGlua2VkX2NydGMpIHsKKwkJCWxpbmtlZF9jcnRjX3N0YXRlID0KKwkJCQlpbnRlbF9hdG9t aWNfZ2V0X2NydGNfc3RhdGUoJnN0YXRlLT5iYXNlLCBsaW5rZWRfY3J0Yyk7CisKKwkJCWlmIChJ U19FUlIobGlua2VkX2NydGNfc3RhdGUpKQorCQkJCXJldHVybiBQVFJfRVJSKGxpbmtlZF9jcnRj X3N0YXRlKTsKKwkJfQorCisJCWxpbmtlZF9jcnRjID0gbmV3X2NydGNfc3RhdGUtPmJpZ2pvaW5l cl9saW5rZWRfY3J0YzsKKwkJaWYgKGxpbmtlZF9jcnRjICYmIGxpbmtlZF9jcnRjICE9IG9sZF9j cnRjX3N0YXRlLT5iaWdqb2luZXJfbGlua2VkX2NydGMpIHsKKwkJCWxpbmtlZF9jcnRjX3N0YXRl ID0KKwkJCQlpbnRlbF9hdG9taWNfZ2V0X2NydGNfc3RhdGUoJnN0YXRlLT5iYXNlLCBsaW5rZWRf Y3J0Yyk7CiAKLQkJV0FSTl9PTihsaW5rZWRfcGxhbmVfc3RhdGUtPnBsYW5hcl9saW5rZWRfcGxh bmUgIT0gcGxhbmUpOwotCQlXQVJOX09OKGxpbmtlZF9wbGFuZV9zdGF0ZS0+cGxhbmFyX3NsYXZl ID09IHBsYW5lX3N0YXRlLT5wbGFuYXJfc2xhdmUpOworCQkJaWYgKElTX0VSUihsaW5rZWRfY3J0 Y19zdGF0ZSkpCisJCQkJcmV0dXJuIFBUUl9FUlIobGlua2VkX2NydGNfc3RhdGUpOworCQl9CiAJ fQogCiAJcmV0dXJuIDA7CkBAIC0xMzc5OSw2ICsxMzg3Niw3IEBAIHN0YXRpYyBpbnQgaW50ZWxf YXRvbWljX2NoZWNrX2JpZ2pvaW5lcihzdHJ1Y3QgaW50ZWxfYXRvbWljX3N0YXRlICpzdGF0ZSkK IAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KHN0YXRlLT5iYXNl LmRldik7CiAJc3RydWN0IGludGVsX2NydGNfc3RhdGUgKm9sZF9jcnRjX3N0YXRlLCAqbmV3X2Ny dGNfc3RhdGUsICpzbGF2ZV9jcnRjX3N0YXRlLCAqbWFzdGVyX2NydGNfc3RhdGU7CiAJc3RydWN0 IGludGVsX2NydGMgKmNydGMsICpzbGF2ZSwgKm1hc3RlcjsKKwlzdHJ1Y3QgaW50ZWxfcGxhbmUg KnBsYW5lOwogCWludCBpLCByZXQgPSAwOwogCiAJaWYgKElOVEVMX0dFTihkZXZfcHJpdikgPCAx MSkKQEAgLTEzODk0LDYgKzEzOTcyLDQ4IEBAIHN0YXRpYyBpbnQgaW50ZWxfYXRvbWljX2NoZWNr X2JpZ2pvaW5lcihzdHJ1Y3QgaW50ZWxfYXRvbWljX3N0YXRlICpzdGF0ZSkKIAkJCXJldHVybiBy ZXQ7CiAJfQogCisJLyoKKwkgKiBTZXR1cCBhbmQgdGVhcmRvd24gdGhlIG5ldyBiaWdqb2luZXIg cGxhbmUgbWFwcGluZ3MuCisJICovCisJZm9yX2VhY2hfaW50ZWxfcGxhbmUoJmRldl9wcml2LT5k cm0sIHBsYW5lKSB7CisJCXN0cnVjdCBpbnRlbF9wbGFuZV9zdGF0ZSAqcGxhbmVfc3RhdGU7CisJ CXN0cnVjdCBpbnRlbF9wbGFuZSAqb3RoZXJfcGxhbmUgPSBOVUxMOworCisJCWNydGMgPSBpbnRl bF9nZXRfY3J0Y19mb3JfcGlwZShkZXZfcHJpdiwgcGxhbmUtPnBpcGUpOworCQlvbGRfY3J0Y19z dGF0ZSA9IGludGVsX2F0b21pY19nZXRfb2xkX2NydGNfc3RhdGUoc3RhdGUsIGNydGMpOworCQlu ZXdfY3J0Y19zdGF0ZSA9IGludGVsX2F0b21pY19nZXRfbmV3X2NydGNfc3RhdGUoc3RhdGUsIGNy dGMpOworCisJCWlmICghbmV3X2NydGNfc3RhdGUgfHwgIW5lZWRzX21vZGVzZXQobmV3X2NydGNf c3RhdGUpKQorCQkJY29udGludWU7CisKKwkJaWYgKG5ld19jcnRjX3N0YXRlLT5iaWdqb2luZXIp IHsKKwkJCXN0cnVjdCBpbnRlbF9jcnRjICpvdGhlcl9jcnRjID0KKwkJCQluZXdfY3J0Y19zdGF0 ZS0+Ymlnam9pbmVyX2xpbmtlZF9jcnRjOworCQkJYm9vbCBmb3VuZCA9IGZhbHNlOworCisJCQlm b3JfZWFjaF9pbnRlbF9wbGFuZV9vbl9jcnRjKCZkZXZfcHJpdi0+ZHJtLCBvdGhlcl9jcnRjLCBv dGhlcl9wbGFuZSkgeworCQkJCWlmIChvdGhlcl9wbGFuZS0+aWQgIT0gcGxhbmUtPmlkKQorCQkJ CQljb250aW51ZTsKKworCQkJCWZvdW5kID0gdHJ1ZTsKKwkJCQlicmVhazsKKwkJCX0KKworCQkJ LyogQWxsIHBpcGVzIHNob3VsZCBoYXZlIGlkZW50aWNhbCBwbGFuZXMuICovCisJCQlpZiAoV0FS Tl9PTighZm91bmQpKQorCQkJCXJldHVybiAtRUlOVkFMOworCQl9IGVsc2UgaWYgKCFvbGRfY3J0 Y19zdGF0ZS0+Ymlnam9pbmVyKSB7CisJCQljb250aW51ZTsKKwkJfQorCisJCXBsYW5lX3N0YXRl ID0gaW50ZWxfYXRvbWljX2dldF9wbGFuZV9zdGF0ZShzdGF0ZSwgcGxhbmUpOworCQlpZiAoSVNf RVJSKHBsYW5lX3N0YXRlKSkKKwkJCXJldHVybiBQVFJfRVJSKHBsYW5lX3N0YXRlKTsKKworCQlw bGFuZV9zdGF0ZS0+Ymlnam9pbmVyX3BsYW5lID0gb3RoZXJfcGxhbmU7CisJCXBsYW5lX3N0YXRl LT5iaWdqb2luZXJfc2xhdmUgPSBuZXdfY3J0Y19zdGF0ZS0+Ymlnam9pbmVyX3NsYXZlOworCX0K KwogCXJldHVybiAwOwogfQogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9kaXNw bGF5L2ludGVsX2Rpc3BsYXlfdHlwZXMuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2Rpc3BsYXkv aW50ZWxfZGlzcGxheV90eXBlcy5oCmluZGV4IGFjZTM3MmE3NjMzMC4uZjA1ZjQ4MzBhNTI5IDEw MDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9kaXNwbGF5L2ludGVsX2Rpc3BsYXlfdHlw ZXMuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9kaXNwbGF5L2ludGVsX2Rpc3BsYXlfdHlw ZXMuaApAQCAtNTcxLDYgKzU3MSwxNyBAQCBzdHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUgewogCSAq LwogCXN0cnVjdCBpbnRlbF9wbGFuZSAqcGxhbmFyX2xpbmtlZF9wbGFuZTsKIAorCS8qCisJICog Ymlnam9pbmVyX3BsYW5lOgorCSAqCisJICogV2hlbiAyIHBpcGVzIGFyZSBqb2luZWQgaW4gYSBi aWdqb2luZXIgY29uZmlndXJhdGlvbiwKKwkgKiBwb2ludHMgdG8gdGhlIHNhbWUgcGxhbmUgb24g dGhlIG90aGVyIHBpcGUuCisJICoKKwkgKiBiaWdqb2luZXJfc2xhdmUgaXMgc2V0IG9uIHRoZSBz bGF2ZSBwaXBlLgorCSAqLworCXN0cnVjdCBpbnRlbF9wbGFuZSAqYmlnam9pbmVyX3BsYW5lOwor CXUzMiBiaWdqb2luZXJfc2xhdmU7CisKIAkvKgogCSAqIHBsYW5hcl9zbGF2ZToKIAkgKiBJZiBz ZXQgZG9uJ3QgdXBkYXRlIHVzZSB0aGUgbGlua2VkIHBsYW5lJ3Mgc3RhdGUgZm9yIHVwZGF0aW5n Ci0tIAoyLjIwLjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9y ZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdm eA==