From: Maarten Lankhorst Subject: [PATCH 2/7] drm/i915/gen11: Link nv12 Y and UV planes in the atomic state, v3. Date: Fri, 21 Sep 2018 19:39:40 +0200 Message-ID: <20180921173945.6276-3-maarten.lankhorst@linux.intel.com> References: <20180921173945.6276-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 850976E890 for ; Fri, 21 Sep 2018 17:39:48 +0000 (UTC) In-Reply-To: <20180921173945.6276-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 VG8gbWFrZSBOVjEyIHdvcmtpbmcgb24gaWNsLCB3ZSBuZWVkIHRvIHVwZGF0ZSAyIHBsYW5lcyBz aW11bHRhbmVvdXNseS4KSSd2ZSBjaG9zZW4gdG8gZG8gdGhpcyBpbiB0aGUgQ1JUQyBzdGVwIGFm dGVyIHBsYW5lIHZhbGlkYXRpb24gaXMgZG9uZSwKc28gd2Uga25vdyB3aGF0IHBsYW5lcyBhcmUg KGluKXZpc2libGUuIFRoZSBsaW5rZWQgWSBwbGFuZSB3aWxsIGdldAp1cGRhdGVkIGluIGludGVs X3BsYW5lX3VwZGF0ZV9wbGFuZXNfb25fY3J0YygpLCBieSB0aGUgY2FsbCB0bwp1cGRhdGVfc2xh dmUsIHdoaWNoIGdldHMgdGhlIG1hc3RlcidzIHBsYW5lX3N0YXRlIGFzIGFyZ3VtZW50LgoKVGhl IGxpbmsgcmVxdWlyZXMgYm90aCBwbGFuZXMgZm9yIGF0b21pY191cGRhdGUgdG8gd29yaywKc28g bWFrZSBzdXJlIHNrbF9kZGJfYWRkX2FmZmVjdGVkX3BsYW5lcygpIGFkZHMgYm90aCBzdGF0ZXMu CgpDaGFuZ2VzIHNpbmNlIHYxOgotIEludHJvZHVjZSBpY2xfaXNfbnYxMl95X3BsYW5lKCksIGlu c3RlYWQgb2YgaGFyZGNvZGluZyBzcHJpdGUgbnVtYmVycy4KLSBQdXQgYWxsIHRoZSBzdGF0ZSB1 cGRhdGluZyBsb2dpbiBpbiBpbnRlbF9wbGFuZV9hdG9taWNfY2hlY2tfd2l0aF9zdGF0ZSgpLgot IENsZWFuIHVwIGNoYW5nZXMgaW4gaW50ZWxfcGxhbmVfYXRvbWljX2NoZWNrKCkuCkNoYW5nZXMg c2luY2UgdjI6Ci0gRml4IGludGVsX2F0b21pY19nZXRfb2xkX3BsYW5lX3N0YXRlKCkgdG8gYWN0 dWFsbHkgcmV0dXJuIG9sZCBzdGF0ZS4KLSBNb3ZlIHZpc2liaWxpdHkgY2hhbmdlcyB0byBwcmVw YXJhdGlvbiBwYXRjaC4KLSBPbmx5IHRyeSB0byBmaW5kIGEgWSBwbGFuZSBvbiBnZW4xMSwgZWFy bGllciBwbGF0Zm9ybXMgb25seSByZXF1aXJlIGEgc2luZ2xlIHBsYW5lLgoKU2lnbmVkLW9mZi1i eTogTWFhcnRlbiBMYW5raG9yc3QgPG1hYXJ0ZW4ubGFua2hvcnN0QGxpbnV4LmludGVsLmNvbT4K CmZpeHVwIFkvVVYgTGlua2FnZQoKU2lnbmVkLW9mZi1ieTogTWFhcnRlbiBMYW5raG9yc3QgPG1h YXJ0ZW4ubGFua2hvcnN0QGxpbnV4LmludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9hdG9taWNfcGxhbmUuYyB8IDEwNiArKysrKysrKysrKysrKysrKystLS0tCiBkcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgICAgICB8ICA1NyArKysrKysrKysrKysK IGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oICAgICAgICAgIHwgIDUzICsrKysrKysr KysrCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jICAgICAgICAgICB8ICAxMiArKy0K IDQgZmlsZXMgY2hhbmdlZCwgMjEwIGluc2VydGlvbnMoKyksIDE4IGRlbGV0aW9ucygtKQoKZGlm ZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2F0b21pY19wbGFuZS5jIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfYXRvbWljX3BsYW5lLmMKaW5kZXggOTg0YmMxZjI2NjI1 Li41MjI2OTkwODVhNTkgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2F0 b21pY19wbGFuZS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2F0b21pY19wbGFu ZS5jCkBAIC0xMjEsNyArMTIxLDExIEBAIGludCBpbnRlbF9wbGFuZV9hdG9taWNfY2hlY2tfd2l0 aF9zdGF0ZShjb25zdCBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqb2xkX2NydGNfCiAJY3J0Y19z dGF0ZS0+bnYxMl9wbGFuZXMgJj0gfkJJVChpbnRlbF9wbGFuZS0+aWQpOwogCWludGVsX3N0YXRl LT5iYXNlLnZpc2libGUgPSBmYWxzZTsKIAotCS8qIElmIHRoaXMgaXMgYSBjdXJzb3IgcGxhbmUs IG5vIGZ1cnRoZXIgY2hlY2tzIGFyZSBuZWVkZWQuICovCisJLyogRGVzdHJveSB0aGUgbGluayAq LworCWludGVsX3N0YXRlLT5saW5rZWRfcGxhbmUgPSBOVUxMOworCWludGVsX3N0YXRlLT5zbGF2 ZSA9IGZhbHNlOworCisJLyogSWYgdGhpcyBpcyBhIGN1cnNvciBvciBZIHBsYW5lLCBubyBmdXJ0 aGVyIGNoZWNrcyBhcmUgbmVlZGVkLiAqLwogCWlmICghaW50ZWxfc3RhdGUtPmJhc2UuY3J0YyAm JiAhb2xkX3BsYW5lX3N0YXRlLT5iYXNlLmNydGMpCiAJCXJldHVybiAwOwogCkBAIC0xNDIsMjcg KzE0Niw3NiBAQCBpbnQgaW50ZWxfcGxhbmVfYXRvbWljX2NoZWNrX3dpdGhfc3RhdGUoY29uc3Qg c3RydWN0IGludGVsX2NydGNfc3RhdGUgKm9sZF9jcnRjXwogCQkJCQkgICAgICAgc3RhdGUpOwog fQogCi1zdGF0aWMgaW50IGludGVsX3BsYW5lX2F0b21pY19jaGVjayhzdHJ1Y3QgZHJtX3BsYW5l ICpwbGFuZSwKLQkJCQkgICAgc3RydWN0IGRybV9wbGFuZV9zdGF0ZSAqbmV3X3BsYW5lX3N0YXRl KQorc3RhdGljIGludCBpbnRlbF9wbGFuZV9hdG9taWNfY2hlY2soc3RydWN0IGRybV9wbGFuZSAq ZHJtX3BsYW5lLAorCQkJCSAgICBzdHJ1Y3QgZHJtX3BsYW5lX3N0YXRlICpuZXdfZHJtX3BsYW5l X3N0YXRlKQogewotCXN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSA9IG5ld19wbGFuZV9z dGF0ZS0+c3RhdGU7Ci0JY29uc3Qgc3RydWN0IGRybV9wbGFuZV9zdGF0ZSAqb2xkX3BsYW5lX3N0 YXRlID0KLQkJZHJtX2F0b21pY19nZXRfb2xkX3BsYW5lX3N0YXRlKHN0YXRlLCBwbGFuZSk7Ci0J c3RydWN0IGRybV9jcnRjICpjcnRjID0gbmV3X3BsYW5lX3N0YXRlLT5jcnRjID86IG9sZF9wbGFu ZV9zdGF0ZS0+Y3J0YzsKLQljb25zdCBzdHJ1Y3QgZHJtX2NydGNfc3RhdGUgKm9sZF9jcnRjX3N0 YXRlOwotCXN0cnVjdCBkcm1fY3J0Y19zdGF0ZSAqbmV3X2NydGNfc3RhdGU7Ci0KLQluZXdfcGxh bmVfc3RhdGUtPnZpc2libGUgPSBmYWxzZTsKKwlzdHJ1Y3QgaW50ZWxfYXRvbWljX3N0YXRlICpz dGF0ZSA9CisJCXRvX2ludGVsX2F0b21pY19zdGF0ZShuZXdfZHJtX3BsYW5lX3N0YXRlLT5zdGF0 ZSk7CisJc3RydWN0IGludGVsX3BsYW5lICpwbGFuZSA9IHRvX2ludGVsX3BsYW5lKGRybV9wbGFu ZSk7CisJY29uc3Qgc3RydWN0IGludGVsX3BsYW5lX3N0YXRlICpvbGRfcGxhbmVfc3RhdGUgPQor CQlpbnRlbF9hdG9taWNfZ2V0X29sZF9wbGFuZV9zdGF0ZShzdGF0ZSwgcGxhbmUpOworCXN0cnVj dCBpbnRlbF9wbGFuZV9zdGF0ZSAqbmV3X3BsYW5lX3N0YXRlID0KKwkJdG9faW50ZWxfcGxhbmVf c3RhdGUobmV3X2RybV9wbGFuZV9zdGF0ZSk7CisJc3RydWN0IGludGVsX2NydGMgKmNydGMgPSB0 b19pbnRlbF9jcnRjKAorCQluZXdfcGxhbmVfc3RhdGUtPmJhc2UuY3J0YyA/OgorCQlvbGRfcGxh bmVfc3RhdGUtPmJhc2UuY3J0Yyk7CisJY29uc3Qgc3RydWN0IGludGVsX2NydGNfc3RhdGUgKm9s ZF9jcnRjX3N0YXRlOworCXN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpuZXdfY3J0Y19zdGF0ZTsK KwlzdHJ1Y3QgaW50ZWxfcGxhbmUgKmxpbmtlZCA9IG9sZF9wbGFuZV9zdGF0ZS0+bGlua2VkX3Bs YW5lOworCWludCByZXQ7CisJY29uc3Qgc3RydWN0IGludGVsX3BsYW5lX3N0YXRlICpvbGRfbGlu a2VkX3N0YXRlOworCXN0cnVjdCBpbnRlbF9wbGFuZV9zdGF0ZSAqbmV3X2xpbmtlZF9zdGF0ZSA9 IE5VTEw7CisKKwlpZiAobGlua2VkKSB7CisJCS8qCisJCSogTWFrZSBzdXJlIGEgcHJldmlvdXNs eSBsaW5rZWQgcGxhbmUgKGFuZCBpbXBsaWNpdGx5LCB0aGUgQ1JUQykKKwkJKiBpcyBwYXJ0IG9m IHRoZSBhdG9taWMgY29tbWl0LgorCQkqLworCQlpZiAoIWludGVsX2F0b21pY19nZXRfbmV3X3Bs YW5lX3N0YXRlKHN0YXRlLCBsaW5rZWQpKSB7CisJCQluZXdfbGlua2VkX3N0YXRlID0gaW50ZWxf YXRvbWljX2dldF9wbGFuZV9zdGF0ZShzdGF0ZSwgbGlua2VkKTsKKwkJCWlmIChJU19FUlIobmV3 X2xpbmtlZF9zdGF0ZSkpCisJCQkJcmV0dXJuIFBUUl9FUlIobmV3X2xpbmtlZF9zdGF0ZSk7CisJ CX0KKworCQlvbGRfbGlua2VkX3N0YXRlID0KKwkJCWludGVsX2F0b21pY19nZXRfb2xkX3BsYW5l X3N0YXRlKHN0YXRlLCBsaW5rZWQpOworCisJCS8qCisJCSAqIFRoaXMgd2lsbCBoYXBwZW4gd2hl biB3ZSdyZSB0aGUgWSBwbGFuZS4gSW4gd2hpY2ggY2FzZQorCQkgKiBvbGQvbmV3X3N0YXRlLT5j cnRjIGFyZSBib3RoIE5VTEwuIFdlIHN0aWxsIG5lZWQgdG8gcGVyZm9ybQorCQkgKiB1cGRhdGVz IG9uIHRoZSBsaW5rZWQgcGxhbmUuCisJCSAqLworCQlpZiAoIWNydGMpCisJCQljcnRjID0gdG9f aW50ZWxfY3J0YyhvbGRfbGlua2VkX3N0YXRlLT5iYXNlLmNydGMpOworCisJCVdBUk5fT04oIWNy dGMpOworCX0KKworCW5ld19wbGFuZV9zdGF0ZS0+YmFzZS52aXNpYmxlID0gZmFsc2U7CiAJaWYg KCFjcnRjKQogCQlyZXR1cm4gMDsKIAotCW9sZF9jcnRjX3N0YXRlID0gZHJtX2F0b21pY19nZXRf b2xkX2NydGNfc3RhdGUoc3RhdGUsIGNydGMpOwotCW5ld19jcnRjX3N0YXRlID0gZHJtX2F0b21p Y19nZXRfbmV3X2NydGNfc3RhdGUoc3RhdGUsIGNydGMpOworCW9sZF9jcnRjX3N0YXRlID0gaW50 ZWxfYXRvbWljX2dldF9vbGRfY3J0Y19zdGF0ZShzdGF0ZSwgY3J0Yyk7CisJbmV3X2NydGNfc3Rh dGUgPSBpbnRlbF9hdG9taWNfZ2V0X25ld19jcnRjX3N0YXRlKHN0YXRlLCBjcnRjKTsKKworCWlm IChuZXdfbGlua2VkX3N0YXRlICYmCisJICAgIGRybV9wbGFuZV9pbmRleCgmbGlua2VkLT5iYXNl KSA8IGRybV9wbGFuZV9pbmRleCgmcGxhbmUtPmJhc2UpKSB7CisJCS8qCisJCSAqIFRoaXMgZnVu Y3Rpb24gaXMgY2FsbGVkIGZyb20gZHJtX2F0b21pY19oZWxwZXJfY2hlY2tfcGxhbmVzKCksIHdo aWNoCisJCSAqIHdpbGwgbm9ybWFsbHkgY2hlY2sgdGhlIG5ld2x5IGFkZGVkIHBsYW5lIGZvciB1 cywgYnV0IHNpbmNlIHdlJ3JlCisJCSAqIGFscmVhZHkgaW4gdGhhdCBmdW5jdGlvbiwgaXQgd29u J3QgY2hlY2sgdGhlIHBsYW5lIGlmIG91ciBpbmRleAorCQkgKiBpcyBiaWdnZXIgdGhhbiB0aGUg bGlua2VkIGluZGV4IGJlY2F1c2Ugb2YgdGhlCisJCSAqIGZvcl9lYWNoX29sZG5ld19wbGFuZV9p bl9zdGF0ZSgpIGNhbGwuCisJCSAqLworCQluZXdfY3J0Y19zdGF0ZS0+YmFzZS5wbGFuZXNfY2hh bmdlZCA9IHRydWU7CisJCXJldCA9IGludGVsX3BsYW5lX2F0b21pY19jaGVja193aXRoX3N0YXRl KG9sZF9jcnRjX3N0YXRlLCBuZXdfY3J0Y19zdGF0ZSwKKwkJCQkJCQkgIG9sZF9saW5rZWRfc3Rh dGUsIG5ld19saW5rZWRfc3RhdGUpOworCQlpZiAocmV0KQorCQkJcmV0dXJuIHJldDsKKwl9CiAK LQlyZXR1cm4gaW50ZWxfcGxhbmVfYXRvbWljX2NoZWNrX3dpdGhfc3RhdGUodG9faW50ZWxfY3J0 Y19zdGF0ZShvbGRfY3J0Y19zdGF0ZSksCi0JCQkJCQkgICB0b19pbnRlbF9jcnRjX3N0YXRlKG5l d19jcnRjX3N0YXRlKSwKLQkJCQkJCSAgIHRvX2ludGVsX3BsYW5lX3N0YXRlKG9sZF9wbGFuZV9z dGF0ZSksCi0JCQkJCQkgICB0b19pbnRlbF9wbGFuZV9zdGF0ZShuZXdfcGxhbmVfc3RhdGUpKTsK KwlyZXR1cm4gaW50ZWxfcGxhbmVfYXRvbWljX2NoZWNrX3dpdGhfc3RhdGUob2xkX2NydGNfc3Rh dGUsIG5ld19jcnRjX3N0YXRlLAorCQkJCQkJICAgb2xkX3BsYW5lX3N0YXRlLCBuZXdfcGxhbmVf c3RhdGUpOwogfQogCiB2b2lkIGludGVsX3VwZGF0ZV9wbGFuZXNfb25fY3J0YyhzdHJ1Y3QgaW50 ZWxfYXRvbWljX3N0YXRlICpvbGRfc3RhdGUsCkBAIC0xODcsNiArMjQwLDI1IEBAIHZvaWQgaW50 ZWxfdXBkYXRlX3BsYW5lc19vbl9jcnRjKHN0cnVjdCBpbnRlbF9hdG9taWNfc3RhdGUgKm9sZF9z dGF0ZSwKIAkJCXRyYWNlX2ludGVsX3VwZGF0ZV9wbGFuZSgmcGxhbmUtPmJhc2UsIGNydGMpOwog CiAJCQlwbGFuZS0+dXBkYXRlX3BsYW5lKHBsYW5lLCBuZXdfY3J0Y19zdGF0ZSwgbmV3X3BsYW5l X3N0YXRlKTsKKwkJfSBlbHNlIGlmIChuZXdfcGxhbmVfc3RhdGUtPnNsYXZlKSB7CisJCQlzdHJ1 Y3QgaW50ZWxfcGxhbmUgKm1hc3RlciA9CisJCQkJbmV3X3BsYW5lX3N0YXRlLT5saW5rZWRfcGxh bmU7CisKKwkJCS8qCisJCQkgKiBXZSB1cGRhdGUgdGhlIHNsYXZlIHBsYW5lIGZyb20gdGhpcyBm dW5jdGlvbiBiZWNhdXNlCisJCQkgKiBwcm9ncmFtbWluZyBpdCBmcm9tIHRoZSBtYXN0ZXIgcGxh bmUncyB1cGRhdGVfcGxhbmUKKwkJCSAqIGNhbGxiYWNrIHJ1bnMgaW50byBpc3N1ZXMgd2hlbiB0 aGUgWSBwbGFuZSBpcworCQkJICogcmVhc3NpZ25lZCwgZGlzYWJsZWQgb3IgdXNlZCBieSBhIGRp ZmZlcmVudCBwbGFuZS4KKwkJCSAqCisJCQkgKiBUaGUgc2xhdmUgcGxhbmUgaXMgdXBkYXRlZCB3 aXRoIHRoZSBtYXN0ZXIgcGxhbmUncworCQkJICogcGxhbmVfc3RhdGUuCisJCQkgKi8KKwkJCW5l d19wbGFuZV9zdGF0ZSA9CisJCQkJaW50ZWxfYXRvbWljX2dldF9uZXdfcGxhbmVfc3RhdGUob2xk X3N0YXRlLCBtYXN0ZXIpOworCisJCQl0cmFjZV9pbnRlbF91cGRhdGVfcGxhbmUoJnBsYW5lLT5i YXNlLCBjcnRjKTsKKworCQkJcGxhbmUtPnVwZGF0ZV9zbGF2ZShwbGFuZSwgbmV3X2NydGNfc3Rh dGUsIG5ld19wbGFuZV9zdGF0ZSk7CiAJCX0gZWxzZSB7CiAJCQl0cmFjZV9pbnRlbF9kaXNhYmxl X3BsYW5lKCZwbGFuZS0+YmFzZSwgY3J0Yyk7CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2Rpc3BsYXkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3Bs YXkuYwppbmRleCAzOTA5MDdkNzdlY2QuLjE5Y2Q2YmJiNDNjNCAxMDA2NDQKLS0tIGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2Rpc3BsYXkuYwpAQCAtMTA3MjYsNiArMTA3MjYsNjAgQEAgc3RhdGljIGJvb2wgY2hl Y2tfc2luZ2xlX2VuY29kZXJfY2xvbmluZyhzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGUs CiAJcmV0dXJuIHRydWU7CiB9CiAKK3N0YXRpYyBpbnQgaWNsX2NoZWNrX252MTJfcGxhbmVzKHN0 cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKKwkJCQkgc3RydWN0IGludGVsX2NydGMg KmNydGMsCisJCQkJIHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0YXRlKQoreworCXN0 cnVjdCBpbnRlbF9hdG9taWNfc3RhdGUgKnN0YXRlID0gdG9faW50ZWxfYXRvbWljX3N0YXRlKGNy dGNfc3RhdGUtPmJhc2Uuc3RhdGUpOworCXN0cnVjdCBpbnRlbF9wbGFuZSAqcGxhbmUsICphdXg7 CisKKwlpZiAoSU5URUxfR0VOKGRldl9wcml2KSA8IDExIHx8ICFjcnRjX3N0YXRlLT5udjEyX3Bs YW5lcykKKwkJcmV0dXJuIDA7CisKKwlmb3JfZWFjaF9pbnRlbF9wbGFuZV9vbl9jcnRjKCZkZXZf cHJpdi0+ZHJtLCBjcnRjLCBwbGFuZSkgeworCQlzdHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKnBs YW5lX3N0YXRlLCAqYXV4X3N0YXRlOworCQlzdHJ1Y3QgZHJtX3BsYW5lX3N0YXRlICpkcm1fYXV4 X3N0YXRlID0gTlVMTDsKKworCQlpZiAoIShjcnRjX3N0YXRlLT5udjEyX3BsYW5lcyAmIEJJVChw bGFuZS0+aWQpKSkKKwkJCWNvbnRpbnVlOworCisJCXBsYW5lX3N0YXRlID0gaW50ZWxfYXRvbWlj X2dldF9uZXdfcGxhbmVfc3RhdGUoc3RhdGUsIHBsYW5lKTsKKwkJaWYgKCFwbGFuZV9zdGF0ZSkK KwkJCWNvbnRpbnVlOworCisJCWZvcl9lYWNoX2ludGVsX3BsYW5lX29uX2NydGMoJmRldl9wcml2 LT5kcm0sIGNydGMsIGF1eCkgeworCQkJaWYgKCFpY2xfaXNfbnYxMl95X3BsYW5lKGF1eC0+aWQp KQorCQkJCWNvbnRpbnVlOworCisJCQlpZiAoY3J0Y19zdGF0ZS0+YWN0aXZlX3BsYW5lcyAmIEJJ VChhdXgtPmlkKSkKKwkJCQljb250aW51ZTsKKworCQkJZHJtX2F1eF9zdGF0ZSA9IGRybV9hdG9t aWNfZ2V0X3BsYW5lX3N0YXRlKCZzdGF0ZS0+YmFzZSwgJmF1eC0+YmFzZSk7CisJCQlpZiAoSVNf RVJSKGRybV9hdXhfc3RhdGUpKQorCQkJCXJldHVybiBQVFJfRVJSKGRybV9hdXhfc3RhdGUpOwor CisJCQlicmVhazsKKwkJfQorCisJCWlmICghZHJtX2F1eF9zdGF0ZSkgeworCQkJRFJNX0RFQlVH X0tNUygiTmVlZCAlZCBmcmVlIFkgcGxhbmVzIGZvciBOVjEyXG4iLAorCQkJCSAgICAgIGh3ZWln aHQ4KGNydGNfc3RhdGUtPm52MTJfcGxhbmVzKSk7CisKKwkJCXJldHVybiAtRUlOVkFMOworCQl9 CisKKwkJcGxhbmVfc3RhdGUtPmxpbmtlZF9wbGFuZSA9IGF1eDsKKworCQlhdXhfc3RhdGUgPSB0 b19pbnRlbF9wbGFuZV9zdGF0ZShkcm1fYXV4X3N0YXRlKTsKKwkJYXV4X3N0YXRlLT5zbGF2ZSA9 IHRydWU7CisJCWF1eF9zdGF0ZS0+bGlua2VkX3BsYW5lID0gcGxhbmU7CisJCWNydGNfc3RhdGUt PmFjdGl2ZV9wbGFuZXMgfD0gQklUKGF1eC0+aWQpOworCQlEUk1fREVCVUdfS01TKCJVc2luZyAl cyBhcyBZIHBsYW5lIGZvciAlc1xuIiwgYXV4LT5iYXNlLm5hbWUsIHBsYW5lLT5iYXNlLm5hbWUp OworCX0KKworCXJldHVybiAwOworfQorCiBzdGF0aWMgaW50IGludGVsX2NydGNfYXRvbWljX2No ZWNrKHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKIAkJCQkgICBzdHJ1Y3QgZHJtX2NydGNfc3RhdGUg KmNydGNfc3RhdGUpCiB7CkBAIC0xMDc5Nyw2ICsxMDg1MSw5IEBAIHN0YXRpYyBpbnQgaW50ZWxf Y3J0Y19hdG9taWNfY2hlY2soc3RydWN0IGRybV9jcnRjICpjcnRjLAogCQlpZiAobW9kZV9jaGFu Z2VkKQogCQkJcmV0ID0gc2tsX3VwZGF0ZV9zY2FsZXJfY3J0YyhwaXBlX2NvbmZpZyk7CiAKKwkJ aWYgKCFyZXQpCisJCQlyZXQgPSBpY2xfY2hlY2tfbnYxMl9wbGFuZXMoZGV2X3ByaXYsIGludGVs X2NydGMsCisJCQkJCQkgICAgcGlwZV9jb25maWcpOwogCQlpZiAoIXJldCkKIAkJCXJldCA9IHNr bF9jaGVja19waXBlX21heF9waXhlbF9yYXRlKGludGVsX2NydGMsCiAJCQkJCQkJICAgIHBpcGVf Y29uZmlnKTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKaW5kZXggODA3M2E4NWQ3MTc4Li4yOWM3 YTRiYjQ4NGQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCisr KyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCkBAIC01MzksNiArNTM5LDI2IEBA IHN0cnVjdCBpbnRlbF9wbGFuZV9zdGF0ZSB7CiAJICovCiAJaW50IHNjYWxlcl9pZDsKIAorCS8q CisJICogbGlua2VkX3BsYW5lOgorCSAqCisJICogSUNMIHBsYW5hciBmb3JtYXRzIHJlcXVpcmUg MiBwbGFuZXMgdGhhdCBhcmUgdXBkYXRlZCBhcyBwYWlycy4KKwkgKiBUaGlzIG1lbWJlciBpcyB1 c2VkIHRvIG1ha2Ugc3VyZSB0aGUgb3RoZXIgcGxhbmUgaXMgYWxzbyB1cGRhdGVkCisJICogd2hl biByZXF1aXJlZCwgYW5kIGZvciB1cGRhdGVfc2xhdmUoKSB0byBmaW5kIHRoZSBjb3JyZWN0CisJ ICogcGxhbmVfc3RhdGUgdG8gcGFzcyBhcyBhcmd1bWVudC4KKwkgKi8KKwlzdHJ1Y3QgaW50ZWxf cGxhbmUgKmxpbmtlZF9wbGFuZTsKKworCS8qCisJICogc2xhdmU6CisJICogSWYgc2V0IGRvbid0 IHVwZGF0ZSB1c2UgdGhlIGxpbmtlZCBwbGFuZSdzIHN0YXRlIGZvciB1cGRhdGluZworCSAqIHRo aXMgcGxhbmUgZHVyaW5nIGF0b21pYyBjb21taXQgd2l0aCB0aGUgdXBkYXRlX3NsYXZlKCkgY2Fs bGJhY2suCisJICoKKwkgKiBJdCdzIGFsc28gdXNlZCBieSB0aGUgd2F0ZXJtYXJrIGNvZGUgdG8g aWdub3JlIHdtIGNhbGN1bGF0aW9ucyBvbgorCSAqIHRoaXMgcGxhbmUuIFRoZXkncmUgY2FsY3Vs YXRlZCBieSB0aGUgbGlua2VkIHBsYW5lJ3Mgd20gY29kZS4KKwkgKi8KKwlib29sIHNsYXZlOwor CiAJc3RydWN0IGRybV9pbnRlbF9zcHJpdGVfY29sb3JrZXkgY2tleTsKIH07CiAKQEAgLTk3Myw2 ICs5OTMsOSBAQCBzdHJ1Y3QgaW50ZWxfcGxhbmUgewogCXZvaWQgKCp1cGRhdGVfcGxhbmUpKHN0 cnVjdCBpbnRlbF9wbGFuZSAqcGxhbmUsCiAJCQkgICAgIGNvbnN0IHN0cnVjdCBpbnRlbF9jcnRj X3N0YXRlICpjcnRjX3N0YXRlLAogCQkJICAgICBjb25zdCBzdHJ1Y3QgaW50ZWxfcGxhbmVfc3Rh dGUgKnBsYW5lX3N0YXRlKTsKKwl2b2lkICgqdXBkYXRlX3NsYXZlKShzdHJ1Y3QgaW50ZWxfcGxh bmUgKnBsYW5lLAorCQkJICAgICBjb25zdCBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19z dGF0ZSwKKwkJCSAgICAgY29uc3Qgc3RydWN0IGludGVsX3BsYW5lX3N0YXRlICpwbGFuZV9zdGF0 ZSk7CiAJdm9pZCAoKmRpc2FibGVfcGxhbmUpKHN0cnVjdCBpbnRlbF9wbGFuZSAqcGxhbmUsCiAJ CQkgICAgICBzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0Yyk7CiAJYm9vbCAoKmdldF9od19zdGF0ZSko c3RydWN0IGludGVsX3BsYW5lICpwbGFuZSwgZW51bSBwaXBlICpwaXBlKTsKQEAgLTEzMzAsNiAr MTM1MywyNyBAQCBoZG1pX3RvX2RpZ19wb3J0KHN0cnVjdCBpbnRlbF9oZG1pICppbnRlbF9oZG1p KQogCXJldHVybiBjb250YWluZXJfb2YoaW50ZWxfaGRtaSwgc3RydWN0IGludGVsX2RpZ2l0YWxf cG9ydCwgaGRtaSk7CiB9CiAKK3N0YXRpYyBpbmxpbmUgc3RydWN0IGludGVsX3BsYW5lX3N0YXRl ICoKK2ludGVsX2F0b21pY19nZXRfcGxhbmVfc3RhdGUoc3RydWN0IGludGVsX2F0b21pY19zdGF0 ZSAqc3RhdGUsCisJCQkJIHN0cnVjdCBpbnRlbF9wbGFuZSAqcGxhbmUpCit7CisJc3RydWN0IGRy bV9wbGFuZV9zdGF0ZSAqcmV0ID0KKwkJZHJtX2F0b21pY19nZXRfcGxhbmVfc3RhdGUoJnN0YXRl LT5iYXNlLCAmcGxhbmUtPmJhc2UpOworCisJaWYgKElTX0VSUihyZXQpKQorCQlyZXR1cm4gRVJS X0NBU1QocmV0KTsKKworCXJldHVybiB0b19pbnRlbF9wbGFuZV9zdGF0ZShyZXQpOworfQorCitz dGF0aWMgaW5saW5lIHN0cnVjdCBpbnRlbF9wbGFuZV9zdGF0ZSAqCitpbnRlbF9hdG9taWNfZ2V0 X29sZF9wbGFuZV9zdGF0ZShzdHJ1Y3QgaW50ZWxfYXRvbWljX3N0YXRlICpzdGF0ZSwKKwkJCQkg c3RydWN0IGludGVsX3BsYW5lICpwbGFuZSkKK3sKKwlyZXR1cm4gdG9faW50ZWxfcGxhbmVfc3Rh dGUoZHJtX2F0b21pY19nZXRfb2xkX3BsYW5lX3N0YXRlKCZzdGF0ZS0+YmFzZSwKKwkJCQkJCQkJ ICAgJnBsYW5lLT5iYXNlKSk7Cit9CisKIHN0YXRpYyBpbmxpbmUgc3RydWN0IGludGVsX3BsYW5l X3N0YXRlICoKIGludGVsX2F0b21pY19nZXRfbmV3X3BsYW5lX3N0YXRlKHN0cnVjdCBpbnRlbF9h dG9taWNfc3RhdGUgKnN0YXRlLAogCQkJCSBzdHJ1Y3QgaW50ZWxfcGxhbmUgKnBsYW5lKQpAQCAt MjE0Myw2ICsyMTg3LDE1IEBAIGludCBza2xfcGxhbmVfY2hlY2soc3RydWN0IGludGVsX2NydGNf c3RhdGUgKmNydGNfc3RhdGUsCiBpbnQgaW50ZWxfcGxhbmVfY2hlY2tfc3JjX2Nvb3JkaW5hdGVz KHN0cnVjdCBpbnRlbF9wbGFuZV9zdGF0ZSAqcGxhbmVfc3RhdGUpOwogaW50IGNodl9wbGFuZV9j aGVja19yb3RhdGlvbihjb25zdCBzdHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKnBsYW5lX3N0YXRl KTsKIAorc3RhdGljIGlubGluZSBib29sIGljbF9pc19udjEyX3lfcGxhbmUoZW51bSBwbGFuZV9p ZCBpZCkKK3sKKwkvKiBEb24ndCBuZWVkIHRvIGRvIGEgZ2VuIGNoZWNrLCB0aGVzZSBwbGFuZXMg YXJlIG9ubHkgYXZhaWxhYmxlIG9uIGdlbjExICovCisJaWYgKGlkID09IFBMQU5FX1NQUklURTQg fHwgaWQgPT0gUExBTkVfU1BSSVRFNSkKKwkJcmV0dXJuIHRydWU7CisKKwlyZXR1cm4gZmFsc2U7 Cit9CisKIC8qIGludGVsX3R2LmMgKi8KIHZvaWQgaW50ZWxfdHZfaW5pdChzdHJ1Y3QgZHJtX2k5 MTVfcHJpdmF0ZSAqZGV2X3ByaXYpOwogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9wbS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYwppbmRleCAxZGI5 YjgzMjgyNzUuLmQ3NmQ5MzQ1MjEzNyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfcG0uYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCkBAIC01MTM3 LDExICs1MTM3LDEyIEBAIHNrbF9kZGJfYWRkX2FmZmVjdGVkX3BsYW5lcyhzdHJ1Y3QgaW50ZWxf Y3J0Y19zdGF0ZSAqY3N0YXRlKQogCXN0cnVjdCBpbnRlbF9hdG9taWNfc3RhdGUgKmludGVsX3N0 YXRlID0gdG9faW50ZWxfYXRvbWljX3N0YXRlKHN0YXRlKTsKIAlzdHJ1Y3Qgc2tsX2RkYl9hbGxv Y2F0aW9uICpuZXdfZGRiID0gJmludGVsX3N0YXRlLT53bV9yZXN1bHRzLmRkYjsKIAlzdHJ1Y3Qg c2tsX2RkYl9hbGxvY2F0aW9uICpjdXJfZGRiID0gJmRldl9wcml2LT53bS5za2xfaHcuZGRiOwot CXN0cnVjdCBkcm1fcGxhbmVfc3RhdGUgKnBsYW5lX3N0YXRlOwogCXN0cnVjdCBkcm1fcGxhbmUg KnBsYW5lOwogCWVudW0gcGlwZSBwaXBlID0gaW50ZWxfY3J0Yy0+cGlwZTsKIAogCWRybV9mb3Jf ZWFjaF9wbGFuZV9tYXNrKHBsYW5lLCBkZXYsIGNzdGF0ZS0+YmFzZS5wbGFuZV9tYXNrKSB7CisJ CXN0cnVjdCBkcm1fcGxhbmVfc3RhdGUgKnBsYW5lX3N0YXRlOworCQlzdHJ1Y3QgaW50ZWxfcGxh bmUgKmxpbmtlZDsKIAkJZW51bSBwbGFuZV9pZCBwbGFuZV9pZCA9IHRvX2ludGVsX3BsYW5lKHBs YW5lKS0+aWQ7CiAKIAkJaWYgKHNrbF9kZGJfZW50cnlfZXF1YWwoJmN1cl9kZGItPnBsYW5lW3Bp cGVdW3BsYW5lX2lkXSwKQEAgLTUxNTMsNiArNTE1NCwxNSBAQCBza2xfZGRiX2FkZF9hZmZlY3Rl ZF9wbGFuZXMoc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNzdGF0ZSkKIAkJcGxhbmVfc3RhdGUg PSBkcm1fYXRvbWljX2dldF9wbGFuZV9zdGF0ZShzdGF0ZSwgcGxhbmUpOwogCQlpZiAoSVNfRVJS KHBsYW5lX3N0YXRlKSkKIAkJCXJldHVybiBQVFJfRVJSKHBsYW5lX3N0YXRlKTsKKworCQkvKiBN YWtlIHN1cmUgbGlua2VkIHBsYW5lIGlzIHVwZGF0ZWQgdG9vICovCisJCWxpbmtlZCA9IHRvX2lu dGVsX3BsYW5lX3N0YXRlKHBsYW5lX3N0YXRlKS0+bGlua2VkX3BsYW5lOworCQlpZiAoIWxpbmtl ZCkKKwkJCWNvbnRpbnVlOworCisJCXBsYW5lX3N0YXRlID0gZHJtX2F0b21pY19nZXRfcGxhbmVf c3RhdGUoc3RhdGUsICZsaW5rZWQtPmJhc2UpOworCQlpZiAoSVNfRVJSKHBsYW5lX3N0YXRlKSkK KwkJCXJldHVybiBQVFJfRVJSKHBsYW5lX3N0YXRlKTsKIAl9CiAKIAlyZXR1cm4gMDsKLS0gCjIu MTguMAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50 ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBz Oi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==