From: Maarten Lankhorst Subject: [PATCH 08/23] drm/i915: Rename planar linked plane variables Date: Fri, 20 Sep 2019 13:42:20 +0200 Message-ID: <20190920114235.22411-8-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 [IPv6:2a02:2308::216:3eff:fe92:dfa3]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2BF766FC9A 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 UmVuYW1lIGxpbmtlZF9wbGFuZSB0byBwbGFuYXJfbGlua2VkX3BsYW5lIGFuZCBzbGF2ZSB0byBw bGFuYXJfc2xhdmUsCnRoaXMgd2lsbCBtYWtlIGl0IGVhc2llciB0byBrZWVwIGFwYXJ0IGJpZ2pv aW5lciBsaW5raW5nIGFuZCBwbGFuYXIgcGxhbmUKbGlua2luZy4KClNpZ25lZC1vZmYtYnk6IE1h YXJ0ZW4gTGFua2hvcnN0IDxtYWFydGVuLmxhbmtob3JzdEBsaW51eC5pbnRlbC5jb20+Ci0tLQog ZHJpdmVycy9ncHUvZHJtL2k5MTUvZGlzcGxheS9pbnRlbF9hdG9taWMuYyAgIHwgIDcgKysrKy0t CiAuLi4vZ3B1L2RybS9pOTE1L2Rpc3BsYXkvaW50ZWxfYXRvbWljX3BsYW5lLmMgfCAgNCArKy0t CiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9kaXNwbGF5L2ludGVsX2Rpc3BsYXkuYyAgfCAyMiArKysr KysrKystLS0tLS0tLS0tCiAuLi4vZHJtL2k5MTUvZGlzcGxheS9pbnRlbF9kaXNwbGF5X3R5cGVz LmggICAgfCAgOCArKystLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9kaXNwbGF5L2ludGVsX3Nw cml0ZS5jICAgfCAgNCArKy0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jICAgICAg ICAgICAgICAgfCAxMiArKysrKy0tLS0tCiA2IGZpbGVzIGNoYW5nZWQsIDMwIGluc2VydGlvbnMo KyksIDI3IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2Rp c3BsYXkvaW50ZWxfYXRvbWljLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9kaXNwbGF5L2ludGVs X2F0b21pYy5jCmluZGV4IDRiNGVlZTljNDlmNS4uMTU4NTk0ZTY0YmI5IDEwMDY0NAotLS0gYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9kaXNwbGF5L2ludGVsX2F0b21pYy5jCisrKyBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2Rpc3BsYXkvaW50ZWxfYXRvbWljLmMKQEAgLTMxMSwxMCArMzExLDEzIEBA IHN0YXRpYyB2b2lkIGludGVsX2F0b21pY19zZXR1cF9zY2FsZXIoc3RydWN0IGludGVsX2NydGNf c2NhbGVyX3N0YXRlICpzY2FsZXJfc3RhCiAJCQkgKi8KIAkJCW1vZGUgPSBQU19TQ0FMRVJfTU9E RV9OT1JNQUw7CiAJCX0gZWxzZSB7CisJCQlzdHJ1Y3QgaW50ZWxfcGxhbmUgKmxpbmtlZCA9CisJ CQkJcGxhbmVfc3RhdGUtPnBsYW5hcl9saW5rZWRfcGxhbmU7CisKIAkJCW1vZGUgPSBQU19TQ0FM RVJfTU9ERV9QTEFOQVI7CiAKLQkJCWlmIChwbGFuZV9zdGF0ZS0+bGlua2VkX3BsYW5lKQotCQkJ CW1vZGUgfD0gUFNfUExBTkVfWV9TRUwocGxhbmVfc3RhdGUtPmxpbmtlZF9wbGFuZS0+aWQpOwor CQkJaWYgKGxpbmtlZCkKKwkJCQltb2RlIHw9IFBTX1BMQU5FX1lfU0VMKGxpbmtlZC0+aWQpOwog CQl9CiAJfSBlbHNlIGlmIChJTlRFTF9HRU4oZGV2X3ByaXYpID4gOSB8fCBJU19HRU1JTklMQUtF KGRldl9wcml2KSkgewogCQltb2RlID0gUFNfU0NBTEVSX01PREVfTk9STUFMOwpkaWZmIC0tZ2l0 IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvZGlzcGxheS9pbnRlbF9hdG9taWNfcGxhbmUuYyBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2Rpc3BsYXkvaW50ZWxfYXRvbWljX3BsYW5lLmMKaW5kZXggMWY1 MGIxNWVjNzA0Li5hMWEzNGI5OTgxY2MgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2Rpc3BsYXkvaW50ZWxfYXRvbWljX3BsYW5lLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv ZGlzcGxheS9pbnRlbF9hdG9taWNfcGxhbmUuYwpAQCAtMzIxLDkgKzMyMSw5IEBAIHZvaWQgc2ts X3VwZGF0ZV9wbGFuZXNfb25fY3J0YyhzdHJ1Y3QgaW50ZWxfYXRvbWljX3N0YXRlICpzdGF0ZSwK IAogCQlpZiAobmV3X3BsYW5lX3N0YXRlLT5iYXNlLnZpc2libGUpIHsKIAkJCWludGVsX3VwZGF0 ZV9wbGFuZShwbGFuZSwgbmV3X2NydGNfc3RhdGUsIG5ld19wbGFuZV9zdGF0ZSk7Ci0JCX0gZWxz ZSBpZiAobmV3X3BsYW5lX3N0YXRlLT5zbGF2ZSkgeworCQl9IGVsc2UgaWYgKG5ld19wbGFuZV9z dGF0ZS0+cGxhbmFyX3NsYXZlKSB7CiAJCQlzdHJ1Y3QgaW50ZWxfcGxhbmUgKm1hc3RlciA9Ci0J CQkJbmV3X3BsYW5lX3N0YXRlLT5saW5rZWRfcGxhbmU7CisJCQkJbmV3X3BsYW5lX3N0YXRlLT5w bGFuYXJfbGlua2VkX3BsYW5lOwogCiAJCQkvKgogCQkJICogV2UgdXBkYXRlIHRoZSBzbGF2ZSBw bGFuZSBmcm9tIHRoaXMgZnVuY3Rpb24gYmVjYXVzZQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvZGlzcGxheS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9k aXNwbGF5L2ludGVsX2Rpc3BsYXkuYwppbmRleCBmZDhiMzk4NzMzYjguLmJhNTJhNzA4NDBmZCAx MDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvZGlzcGxheS9pbnRlbF9kaXNwbGF5LmMK KysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvZGlzcGxheS9pbnRlbF9kaXNwbGF5LmMKQEAgLTEx NjY2LDcgKzExNjY2LDcgQEAgc3RhdGljIGludCBpY2xfYWRkX2xpbmtlZF9wbGFuZXMoc3RydWN0 IGludGVsX2F0b21pY19zdGF0ZSAqc3RhdGUpCiAJaW50IGk7CiAKIAlmb3JfZWFjaF9uZXdfaW50 ZWxfcGxhbmVfaW5fc3RhdGUoc3RhdGUsIHBsYW5lLCBwbGFuZV9zdGF0ZSwgaSkgewotCQlsaW5r ZWQgPSBwbGFuZV9zdGF0ZS0+bGlua2VkX3BsYW5lOworCQlsaW5rZWQgPSBwbGFuZV9zdGF0ZS0+ cGxhbmFyX2xpbmtlZF9wbGFuZTsKIAogCQlpZiAoIWxpbmtlZCkKIAkJCWNvbnRpbnVlOwpAQCAt MTE2NzUsOCArMTE2NzUsOCBAQCBzdGF0aWMgaW50IGljbF9hZGRfbGlua2VkX3BsYW5lcyhzdHJ1 Y3QgaW50ZWxfYXRvbWljX3N0YXRlICpzdGF0ZSkKIAkJaWYgKElTX0VSUihsaW5rZWRfcGxhbmVf c3RhdGUpKQogCQkJcmV0dXJuIFBUUl9FUlIobGlua2VkX3BsYW5lX3N0YXRlKTsKIAotCQlXQVJO X09OKGxpbmtlZF9wbGFuZV9zdGF0ZS0+bGlua2VkX3BsYW5lICE9IHBsYW5lKTsKLQkJV0FSTl9P TihsaW5rZWRfcGxhbmVfc3RhdGUtPnNsYXZlID09IHBsYW5lX3N0YXRlLT5zbGF2ZSk7CisJCVdB Uk5fT04obGlua2VkX3BsYW5lX3N0YXRlLT5wbGFuYXJfbGlua2VkX3BsYW5lICE9IHBsYW5lKTsK KwkJV0FSTl9PTihsaW5rZWRfcGxhbmVfc3RhdGUtPnBsYW5hcl9zbGF2ZSA9PSBwbGFuZV9zdGF0 ZS0+cGxhbmFyX3NsYXZlKTsKIAl9CiAKIAlyZXR1cm4gMDsKQEAgLTExNjk5LDE2ICsxMTY5OSwx NiBAQCBzdGF0aWMgaW50IGljbF9jaGVja19udjEyX3BsYW5lcyhzdHJ1Y3QgaW50ZWxfY3J0Y19z dGF0ZSAqY3J0Y19zdGF0ZSkKIAkgKiBpbiB0aGUgY3J0Y19zdGF0ZS0+YWN0aXZlX3BsYW5lcyBt YXNrLgogCSAqLwogCWZvcl9lYWNoX25ld19pbnRlbF9wbGFuZV9pbl9zdGF0ZShzdGF0ZSwgcGxh bmUsIHBsYW5lX3N0YXRlLCBpKSB7Ci0JCWlmIChwbGFuZS0+cGlwZSAhPSBjcnRjLT5waXBlIHx8 ICFwbGFuZV9zdGF0ZS0+bGlua2VkX3BsYW5lKQorCQlpZiAocGxhbmUtPnBpcGUgIT0gY3J0Yy0+ cGlwZSB8fCAhcGxhbmVfc3RhdGUtPnBsYW5hcl9saW5rZWRfcGxhbmUpCiAJCQljb250aW51ZTsK IAotCQlwbGFuZV9zdGF0ZS0+bGlua2VkX3BsYW5lID0gTlVMTDsKLQkJaWYgKHBsYW5lX3N0YXRl LT5zbGF2ZSAmJiAhcGxhbmVfc3RhdGUtPmJhc2UudmlzaWJsZSkgeworCQlwbGFuZV9zdGF0ZS0+ cGxhbmFyX2xpbmtlZF9wbGFuZSA9IE5VTEw7CisJCWlmIChwbGFuZV9zdGF0ZS0+cGxhbmFyX3Ns YXZlICYmICFwbGFuZV9zdGF0ZS0+YmFzZS52aXNpYmxlKSB7CiAJCQljcnRjX3N0YXRlLT5hY3Rp dmVfcGxhbmVzICY9IH5CSVQocGxhbmUtPmlkKTsKIAkJCWNydGNfc3RhdGUtPnVwZGF0ZV9wbGFu ZXMgfD0gQklUKHBsYW5lLT5pZCk7CiAJCX0KIAotCQlwbGFuZV9zdGF0ZS0+c2xhdmUgPSBmYWxz ZTsKKwkJcGxhbmVfc3RhdGUtPnBsYW5hcl9zbGF2ZSA9IGZhbHNlOwogCX0KIAogCWlmICghY3J0 Y19zdGF0ZS0+bnYxMl9wbGFuZXMpCkBAIC0xMTc0MiwxMCArMTE3NDIsMTAgQEAgc3RhdGljIGlu dCBpY2xfY2hlY2tfbnYxMl9wbGFuZXMoc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNfc3Rh dGUpCiAJCQlyZXR1cm4gLUVJTlZBTDsKIAkJfQogCi0JCXBsYW5lX3N0YXRlLT5saW5rZWRfcGxh bmUgPSBsaW5rZWQ7CisJCXBsYW5lX3N0YXRlLT5wbGFuYXJfbGlua2VkX3BsYW5lID0gbGlua2Vk OwogCi0JCWxpbmtlZF9zdGF0ZS0+c2xhdmUgPSB0cnVlOwotCQlsaW5rZWRfc3RhdGUtPmxpbmtl ZF9wbGFuZSA9IHBsYW5lOworCQlsaW5rZWRfc3RhdGUtPnBsYW5hcl9zbGF2ZSA9IHRydWU7CisJ CWxpbmtlZF9zdGF0ZS0+cGxhbmFyX2xpbmtlZF9wbGFuZSA9IHBsYW5lOwogCQljcnRjX3N0YXRl LT5hY3RpdmVfcGxhbmVzIHw9IEJJVChsaW5rZWQtPmlkKTsKIAkJY3J0Y19zdGF0ZS0+dXBkYXRl X3BsYW5lcyB8PSBCSVQobGlua2VkLT5pZCk7CiAJCURSTV9ERUJVR19LTVMoIlVzaW5nICVzIGFz IFkgcGxhbmUgZm9yICVzXG4iLCBsaW5rZWQtPmJhc2UubmFtZSwgcGxhbmUtPmJhc2UubmFtZSk7 CkBAIC0xMzIyMSw3ICsxMzIyMSw3IEBAIGludGVsX3ZlcmlmeV9wbGFuZXMoc3RydWN0IGludGVs X2F0b21pY19zdGF0ZSAqc3RhdGUpCiAKIAlmb3JfZWFjaF9uZXdfaW50ZWxfcGxhbmVfaW5fc3Rh dGUoc3RhdGUsIHBsYW5lLAogCQkJCQkgIHBsYW5lX3N0YXRlLCBpKQotCQlhc3NlcnRfcGxhbmUo cGxhbmUsIHBsYW5lX3N0YXRlLT5zbGF2ZSB8fAorCQlhc3NlcnRfcGxhbmUocGxhbmUsIHBsYW5l X3N0YXRlLT5wbGFuYXJfc2xhdmUgfHwKIAkJCSAgICAgcGxhbmVfc3RhdGUtPmJhc2UudmlzaWJs ZSk7CiB9CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2Rpc3BsYXkvaW50ZWxf ZGlzcGxheV90eXBlcy5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvZGlzcGxheS9pbnRlbF9kaXNw bGF5X3R5cGVzLmgKaW5kZXggNTdkYmNmYzEyNmRmLi4zOTRmODRlNWQ1ODMgMTAwNjQ0Ci0tLSBh L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2Rpc3BsYXkvaW50ZWxfZGlzcGxheV90eXBlcy5oCisrKyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2Rpc3BsYXkvaW50ZWxfZGlzcGxheV90eXBlcy5oCkBAIC01 NTksMjQgKzU1OSwyNCBAQCBzdHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUgewogCWludCBzY2FsZXJf aWQ7CiAKIAkvKgotCSAqIGxpbmtlZF9wbGFuZToKKwkgKiBwbGFuYXJfbGlua2VkX3BsYW5lOgog CSAqCiAJICogSUNMIHBsYW5hciBmb3JtYXRzIHJlcXVpcmUgMiBwbGFuZXMgdGhhdCBhcmUgdXBk YXRlZCBhcyBwYWlycy4KIAkgKiBUaGlzIG1lbWJlciBpcyB1c2VkIHRvIG1ha2Ugc3VyZSB0aGUg b3RoZXIgcGxhbmUgaXMgYWxzbyB1cGRhdGVkCiAJICogd2hlbiByZXF1aXJlZCwgYW5kIGZvciB1 cGRhdGVfc2xhdmUoKSB0byBmaW5kIHRoZSBjb3JyZWN0CiAJICogcGxhbmVfc3RhdGUgdG8gcGFz cyBhcyBhcmd1bWVudC4KIAkgKi8KLQlzdHJ1Y3QgaW50ZWxfcGxhbmUgKmxpbmtlZF9wbGFuZTsK KwlzdHJ1Y3QgaW50ZWxfcGxhbmUgKnBsYW5hcl9saW5rZWRfcGxhbmU7CiAKIAkvKgotCSAqIHNs YXZlOgorCSAqIHBsYW5hcl9zbGF2ZToKIAkgKiBJZiBzZXQgZG9uJ3QgdXBkYXRlIHVzZSB0aGUg bGlua2VkIHBsYW5lJ3Mgc3RhdGUgZm9yIHVwZGF0aW5nCiAJICogdGhpcyBwbGFuZSBkdXJpbmcg YXRvbWljIGNvbW1pdCB3aXRoIHRoZSB1cGRhdGVfc2xhdmUoKSBjYWxsYmFjay4KIAkgKgogCSAq IEl0J3MgYWxzbyB1c2VkIGJ5IHRoZSB3YXRlcm1hcmsgY29kZSB0byBpZ25vcmUgd20gY2FsY3Vs YXRpb25zIG9uCiAJICogdGhpcyBwbGFuZS4gVGhleSdyZSBjYWxjdWxhdGVkIGJ5IHRoZSBsaW5r ZWQgcGxhbmUncyB3bSBjb2RlLgogCSAqLwotCXUzMiBzbGF2ZTsKKwl1MzIgcGxhbmFyX3NsYXZl OwogCiAJc3RydWN0IGRybV9pbnRlbF9zcHJpdGVfY29sb3JrZXkgY2tleTsKIH07CmRpZmYgLS1n aXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9kaXNwbGF5L2ludGVsX3Nwcml0ZS5jIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvZGlzcGxheS9pbnRlbF9zcHJpdGUuYwppbmRleCBhNjAyZTIxYzVmZDUu LmYwOTU2ZmVjZGVhNCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvZGlzcGxheS9p bnRlbF9zcHJpdGUuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9kaXNwbGF5L2ludGVsX3Nw cml0ZS5jCkBAIC01NDMsNyArNTQzLDcgQEAgc2tsX3Byb2dyYW1fcGxhbmUoc3RydWN0IGludGVs X3BsYW5lICpwbGFuZSwKIAl1MzIgeSA9IHBsYW5lX3N0YXRlLT5jb2xvcl9wbGFuZVtjb2xvcl9w bGFuZV0ueTsKIAl1MzIgc3JjX3cgPSBkcm1fcmVjdF93aWR0aCgmcGxhbmVfc3RhdGUtPmJhc2Uu c3JjKSA+PiAxNjsKIAl1MzIgc3JjX2ggPSBkcm1fcmVjdF9oZWlnaHQoJnBsYW5lX3N0YXRlLT5i YXNlLnNyYykgPj4gMTY7Ci0Jc3RydWN0IGludGVsX3BsYW5lICpsaW5rZWQgPSBwbGFuZV9zdGF0 ZS0+bGlua2VkX3BsYW5lOworCXN0cnVjdCBpbnRlbF9wbGFuZSAqbGlua2VkID0gcGxhbmVfc3Rh dGUtPnBsYW5hcl9saW5rZWRfcGxhbmU7CiAJY29uc3Qgc3RydWN0IGRybV9mcmFtZWJ1ZmZlciAq ZmIgPSBwbGFuZV9zdGF0ZS0+YmFzZS5mYjsKIAl1OCBhbHBoYSA9IHBsYW5lX3N0YXRlLT5iYXNl LmFscGhhID4+IDg7CiAJdTMyIHBsYW5lX2NvbG9yX2N0bCA9IDA7CkBAIC02NDIsNyArNjQyLDcg QEAgc2tsX3VwZGF0ZV9wbGFuZShzdHJ1Y3QgaW50ZWxfcGxhbmUgKnBsYW5lLAogewogCWludCBj b2xvcl9wbGFuZSA9IDA7CiAKLQlpZiAocGxhbmVfc3RhdGUtPmxpbmtlZF9wbGFuZSkgeworCWlm IChwbGFuZV9zdGF0ZS0+cGxhbmFyX2xpbmtlZF9wbGFuZSkgewogCQkvKiBQcm9ncmFtIHRoZSBV ViBwbGFuZSAqLwogCQljb2xvcl9wbGFuZSA9IDE7CiAJfQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfcG0uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMK aW5kZXggZWRhYmYyY2Y0NDQwLi5hY2M4N2I4NDMxZjMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX3BtLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0u YwpAQCAtNDI5MSw3ICs0MjkxLDcgQEAgaWNsX2dldF90b3RhbF9yZWxhdGl2ZV9kYXRhX3JhdGUo c3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNfc3RhdGUsCiAJCWVudW0gcGxhbmVfaWQgcGxh bmVfaWQgPSB0b19pbnRlbF9wbGFuZShwbGFuZSktPmlkOwogCQl1NjQgcmF0ZTsKIAotCQlpZiAo IXBsYW5lX3N0YXRlLT5saW5rZWRfcGxhbmUpIHsKKwkJaWYgKCFwbGFuZV9zdGF0ZS0+cGxhbmFy X2xpbmtlZF9wbGFuZSkgewogCQkJcmF0ZSA9IHNrbF9wbGFuZV9yZWxhdGl2ZV9kYXRhX3JhdGUo Y3J0Y19zdGF0ZSwgcGxhbmVfc3RhdGUsIDApOwogCQkJcGxhbmVfZGF0YV9yYXRlW3BsYW5lX2lk XSA9IHJhdGU7CiAJCQl0b3RhbF9kYXRhX3JhdGUgKz0gcmF0ZTsKQEAgLTQzMDUsMTIgKzQzMDUs MTIgQEAgaWNsX2dldF90b3RhbF9yZWxhdGl2ZV9kYXRhX3JhdGUoc3RydWN0IGludGVsX2NydGNf c3RhdGUgKmNydGNfc3RhdGUsCiAJCQkgKiBOVUxMIGlmIHdlIHRyeSBnZXRfbmV3X3BsYW5lX3N0 YXRlKCksIHNvIHdlCiAJCQkgKiBhbHdheXMgY2FsY3VsYXRlIGZyb20gdGhlIG1hc3Rlci4KIAkJ CSAqLwotCQkJaWYgKHBsYW5lX3N0YXRlLT5zbGF2ZSkKKwkJCWlmIChwbGFuZV9zdGF0ZS0+cGxh bmFyX3NsYXZlKQogCQkJCWNvbnRpbnVlOwogCiAJCQkvKiBZIHBsYW5lIHJhdGUgaXMgY2FsY3Vs YXRlZCBvbiB0aGUgc2xhdmUgKi8KIAkJCXJhdGUgPSBza2xfcGxhbmVfcmVsYXRpdmVfZGF0YV9y YXRlKGNydGNfc3RhdGUsIHBsYW5lX3N0YXRlLCAwKTsKLQkJCXlfcGxhbmVfaWQgPSBwbGFuZV9z dGF0ZS0+bGlua2VkX3BsYW5lLT5pZDsKKwkJCXlfcGxhbmVfaWQgPSBwbGFuZV9zdGF0ZS0+cGxh bmFyX2xpbmtlZF9wbGFuZS0+aWQ7CiAJCQlwbGFuZV9kYXRhX3JhdGVbeV9wbGFuZV9pZF0gPSBy YXRlOwogCQkJdG90YWxfZGF0YV9yYXRlICs9IHJhdGU7CiAKQEAgLTUwNDksMTIgKzUwNDksMTIg QEAgc3RhdGljIGludCBpY2xfYnVpbGRfcGxhbmVfd20oc3RydWN0IGludGVsX2NydGNfc3RhdGUg KmNydGNfc3RhdGUsCiAJaW50IHJldDsKIAogCS8qIFdhdGVybWFya3MgY2FsY3VsYXRlZCBpbiBt YXN0ZXIgKi8KLQlpZiAocGxhbmVfc3RhdGUtPnNsYXZlKQorCWlmIChwbGFuZV9zdGF0ZS0+cGxh bmFyX3NsYXZlKQogCQlyZXR1cm4gMDsKIAotCWlmIChwbGFuZV9zdGF0ZS0+bGlua2VkX3BsYW5l KSB7CisJaWYgKHBsYW5lX3N0YXRlLT5wbGFuYXJfbGlua2VkX3BsYW5lKSB7CiAJCWNvbnN0IHN0 cnVjdCBkcm1fZnJhbWVidWZmZXIgKmZiID0gcGxhbmVfc3RhdGUtPmJhc2UuZmI7Ci0JCWVudW0g cGxhbmVfaWQgeV9wbGFuZV9pZCA9IHBsYW5lX3N0YXRlLT5saW5rZWRfcGxhbmUtPmlkOworCQll bnVtIHBsYW5lX2lkIHlfcGxhbmVfaWQgPSBwbGFuZV9zdGF0ZS0+cGxhbmFyX2xpbmtlZF9wbGFu ZS0+aWQ7CiAKIAkJV0FSTl9PTighaW50ZWxfd21fcGxhbmVfdmlzaWJsZShjcnRjX3N0YXRlLCBw bGFuZV9zdGF0ZSkpOwogCQlXQVJOX09OKCFmYi0+Zm9ybWF0LT5pc195dXYgfHwKLS0gCjIuMjAu MQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwt Z2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8v bGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4