From: Harry Wentland Subject: [PATCH 04/27] drm/amd/display: Universal cursor plane hook-up. Date: Fri, 9 Jun 2017 16:11:17 -0400 Message-ID: <20170609201140.1046-5-harry.wentland@amd.com> References: <20170609201140.1046-1-harry.wentland@amd.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20170609201140.1046-1-harry.wentland-5C7GfCeVMHo@public.gmane.org> List-Id: Discussion list for AMD gfx List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Sender: "amd-gfx" To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Cc: Leo Li , Andrey Grodzovsky RnJvbTogQW5kcmV5IEdyb2R6b3Zza3kgPEFuZHJleS5Hcm9kem92c2t5QGFtZC5jb20+CgpTd2l0 Y2ggZnJvbSBsZWdhY3kgY3Vyc29yIHRvIERSTSBjdXJzb3IgcGxhbmUuIEN1cnNvcgppcyBub3Qg YW4gYWN0dWFsIHBsYW5lIGJ1dCBtb3JlIG9mIGEgc3VicGxhbmUgb2YgZWFjaApwaXBlLiBCaW5k IGEgRFJNIGN1cnNvciBwbGFuZSBpbnN0YW5jZSB0byBlYWNoIENSVEMuCkVsaW1pbmF0ZSBzZXBl cmF0ZSBGQiBvYmplY3QgYWxsb2NhdGlvbiBmb3IgY3Vyc29yIGFuZApjbGVhbiAgZG1fY3J0Y19j dXJzb3Jfc2V0LgoKQ2hhbmdlLUlkOiBJMWQ3MTZmZmUxNDI3YzI3ZWYwNzBhY2FiZDg1MGY2ZmQ1 Njg2NDQxNQpTaWduZWQtb2ZmLWJ5OiBBbmRyZXkgR3JvZHpvdnNreSA8QW5kcmV5Lkdyb2R6b3Zz a3lAYW1kLmNvbT4KU2lnbmVkLW9mZi1ieTogTGVvIChTdW5wZW5nKSBMaSA8c3VucGVuZy5saUBh bWQuY29tPgpSZXZpZXdlZC1ieTogSGFycnkgV2VudGxhbmQgPEhhcnJ5LldlbnRsYW5kQGFtZC5j b20+Ci0tLQogLi4uL2RybS9hbWQvZGlzcGxheS9hbWRncHVfZG0vYW1kZ3B1X2RtX3R5cGVzLmMg ICAgfCAyNDIgKysrKysrKystLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgOTEgaW5zZXJ0 aW9ucygrKSwgMTUxIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9h bWQvZGlzcGxheS9hbWRncHVfZG0vYW1kZ3B1X2RtX3R5cGVzLmMgYi9kcml2ZXJzL2dwdS9kcm0v YW1kL2Rpc3BsYXkvYW1kZ3B1X2RtL2FtZGdwdV9kbV90eXBlcy5jCmluZGV4IDkzOWVhOGRmMzQ0 MC4uNzUxMDJmZDFmMWY3IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkv YW1kZ3B1X2RtL2FtZGdwdV9kbV90eXBlcy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlz cGxheS9hbWRncHVfZG0vYW1kZ3B1X2RtX3R5cGVzLmMKQEAgLTEzNywxMjcgKzEzNywyNyBAQCBz dGF0aWMgdm9pZCBkbV9zZXRfY3Vyc29yKAogCX0KIH0KIAotc3RhdGljIGludCBkbV9jcnRjX3Vu cGluX2N1cnNvcl9ib19vbGQoCi0Jc3RydWN0IGFtZGdwdV9jcnRjICphbWRncHVfY3J0YykKLXsK LQlzdHJ1Y3QgYW1kZ3B1X2JvICpyb2JqOwotCWludCByZXQgPSAwOwotCi0JaWYgKE5VTEwgIT0g YW1kZ3B1X2NydGMgJiYgTlVMTCAhPSBhbWRncHVfY3J0Yy0+Y3Vyc29yX2JvKSB7Ci0JCXJvYmog PSBnZW1fdG9fYW1kZ3B1X2JvKGFtZGdwdV9jcnRjLT5jdXJzb3JfYm8pOwotCi0JCXJldCA9IGFt ZGdwdV9ib19yZXNlcnZlKHJvYmosIGZhbHNlKTsKLQotCQlpZiAobGlrZWx5KHJldCA9PSAwKSkg ewotCQkJcmV0ID0gYW1kZ3B1X2JvX3VucGluKHJvYmopOwotCi0JCQlpZiAodW5saWtlbHkocmV0 ICE9IDApKSB7Ci0JCQkJRFJNX0VSUk9SKAotCQkJCQkiJXM6IHVucGluIGZhaWxlZCAocmV0PSVk KSwgYm8gJXBcbiIsCi0JCQkJCV9fZnVuY19fLAotCQkJCQlyZXQsCi0JCQkJCWFtZGdwdV9jcnRj LT5jdXJzb3JfYm8pOwotCQkJfQotCi0JCQlhbWRncHVfYm9fdW5yZXNlcnZlKHJvYmopOwotCQl9 IGVsc2UgewotCQkJRFJNX0VSUk9SKAotCQkJCSIlczogcmVzZXJ2ZSBmYWlsZWQgKHJldD0lZCks IGJvICVwXG4iLAotCQkJCV9fZnVuY19fLAotCQkJCXJldCwKLQkJCQlhbWRncHVfY3J0Yy0+Y3Vy c29yX2JvKTsKLQkJfQotCi0JCWRybV9nZW1fb2JqZWN0X3VucmVmZXJlbmNlX3VubG9ja2VkKGFt ZGdwdV9jcnRjLT5jdXJzb3JfYm8pOwotCQlhbWRncHVfY3J0Yy0+Y3Vyc29yX2JvID0gTlVMTDsK LQl9Ci0KLQlyZXR1cm4gcmV0OwotfQotCi1zdGF0aWMgaW50IGRtX2NydGNfcGluX2N1cnNvcl9i b19uZXcoCi0Jc3RydWN0IGRybV9jcnRjICpjcnRjLAotCXN0cnVjdCBkcm1fZmlsZSAqZmlsZV9w cml2LAotCXVpbnQzMl90IGhhbmRsZSwKLQlzdHJ1Y3QgYW1kZ3B1X2JvICoqcmV0X29iaikKLXsK LQlzdHJ1Y3QgYW1kZ3B1X2NydGMgKmFtZGdwdV9jcnRjOwotCXN0cnVjdCBhbWRncHVfYm8gKnJv Ymo7Ci0Jc3RydWN0IGRybV9nZW1fb2JqZWN0ICpvYmo7Ci0JaW50IHJldCA9IC1FSU5WQUw7Ci0K LQlpZiAoTlVMTCAhPSBjcnRjKSB7Ci0JCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBjcnRjLT5k ZXY7Ci0JCXN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKLQkJ dWludDY0X3QgZ3B1X2FkZHI7Ci0KLQkJYW1kZ3B1X2NydGMgPSB0b19hbWRncHVfY3J0YyhjcnRj KTsKLQotCQlvYmogPSBkcm1fZ2VtX29iamVjdF9sb29rdXAoZmlsZV9wcml2LCBoYW5kbGUpOwot Ci0JCWlmICghb2JqKSB7Ci0JCQlEUk1fRVJST1IoCi0JCQkJIkNhbm5vdCBmaW5kIGN1cnNvciBv YmplY3QgJXggZm9yIGNydGMgJWRcbiIsCi0JCQkJaGFuZGxlLAotCQkJCWFtZGdwdV9jcnRjLT5j cnRjX2lkKTsKLQkJCWdvdG8gcmVsZWFzZTsKLQkJfQotCQlyb2JqID0gZ2VtX3RvX2FtZGdwdV9i byhvYmopOwotCi0JCXJldCAgPSBhbWRncHVfYm9fcmVzZXJ2ZShyb2JqLCBmYWxzZSk7Ci0KLQkJ aWYgKHVubGlrZWx5KHJldCAhPSAwKSkgewotCQkJZHJtX2dlbV9vYmplY3RfdW5yZWZlcmVuY2Vf dW5sb2NrZWQob2JqKTsKLQkJRFJNX0VSUk9SKCJkbV9jcnRjX3Bpbl9jdXJzb3JfYm9fbmV3IHJl dCAleCwgaGFuZGxlICV4XG4iLAotCQkJCSByZXQsIGhhbmRsZSk7Ci0JCQlnb3RvIHJlbGVhc2U7 Ci0JCX0KLQotCQlyZXQgPSBhbWRncHVfYm9fcGluX3Jlc3RyaWN0ZWQocm9iaiwgQU1ER1BVX0dF TV9ET01BSU5fVlJBTSwgMCwKLQkJCQkJCWFkZXYtPm1jLnZpc2libGVfdnJhbV9zaXplLAotCQkJ CQkJJmdwdV9hZGRyKTsKLQotCQlpZiAocmV0ID09IDApIHsKLQkJCWFtZGdwdV9jcnRjLT5jdXJz b3JfYWRkciA9IGdwdV9hZGRyOwotCQkJKnJldF9vYmogID0gcm9iajsKLQkJfQotCQlhbWRncHVf Ym9fdW5yZXNlcnZlKHJvYmopOwotCQlpZiAocmV0KQotCQkJZHJtX2dlbV9vYmplY3RfdW5yZWZl cmVuY2VfdW5sb2NrZWQob2JqKTsKLQotCX0KLXJlbGVhc2U6Ci0KLQlyZXR1cm4gcmV0OwotfQot CiBzdGF0aWMgaW50IGRtX2NydGNfY3Vyc29yX3NldCgKIAlzdHJ1Y3QgZHJtX2NydGMgKmNydGMs Ci0Jc3RydWN0IGRybV9maWxlICpmaWxlX3ByaXYsCi0JdWludDMyX3QgaGFuZGxlLAorCXVpbnQ2 NF90IGFkZHJlc3MsCiAJdWludDMyX3Qgd2lkdGgsCiAJdWludDMyX3QgaGVpZ2h0KQogewotCXN0 cnVjdCBhbWRncHVfYm8gKm5ld19jdXJzb3JfYm87CiAJc3RydWN0IGRjX2N1cnNvcl9wb3NpdGlv biBwb3NpdGlvbjsKIAogCWludCByZXQ7CiAKIAlzdHJ1Y3QgYW1kZ3B1X2NydGMgKmFtZGdwdV9j cnRjID0gdG9fYW1kZ3B1X2NydGMoY3J0Yyk7Ci0KIAlyZXQJCT0gRUlOVkFMOwotCW5ld19jdXJz b3JfYm8JPSBOVUxMOwogCiAJRFJNX0RFQlVHX0tNUygKLQkiJXM6IGNydGNfaWQ9JWQgd2l0aCBo YW5kbGUgJWQgYW5kIHNpemUgJWQgdG8gJWQsIGJvX29iamVjdCAlcFxuIiwKKwkJIiVzOiBjcnRj X2lkPSVkIHdpdGggc2l6ZSAlZCB0byAlZCBcbiIsCiAJCV9fZnVuY19fLAogCQlhbWRncHVfY3J0 Yy0+Y3J0Y19pZCwKLQkJaGFuZGxlLAogCQl3aWR0aCwKLQkJaGVpZ2h0LAotCQlhbWRncHVfY3J0 Yy0+Y3Vyc29yX2JvKTsKKwkJaGVpZ2h0KTsKIAotCWlmICghaGFuZGxlKSB7CisJaWYgKCFhZGRy ZXNzKSB7CiAJCS8qIHR1cm4gb2ZmIGN1cnNvciAqLwogCQlwb3NpdGlvbi5lbmFibGUgPSBmYWxz ZTsKIAkJcG9zaXRpb24ueCA9IDA7CkBAIC0yNjksOCArMTY5LDYgQEAgc3RhdGljIGludCBkbV9j cnRjX2N1cnNvcl9zZXQoCiAJCQkJYW1kZ3B1X2NydGMtPnN0cmVhbSwKIAkJCQkmcG9zaXRpb24p OwogCQl9Ci0JCS8qdW5waW4gb2xkIGN1cnNvciBidWZmZXIgYW5kIHVwZGF0ZSBjYWNoZSovCi0J CXJldCA9IGRtX2NydGNfdW5waW5fY3Vyc29yX2JvX29sZChhbWRncHVfY3J0Yyk7CiAJCWdvdG8g cmVsZWFzZTsKIAogCX0KQEAgLTI4NCwyMSArMTgyLDkgQEAgc3RhdGljIGludCBkbV9jcnRjX2N1 cnNvcl9zZXQoCiAJCQloZWlnaHQpOwogCQlnb3RvIHJlbGVhc2U7CiAJfQotCS8qdHJ5IHRvIHBp biBuZXcgY3Vyc29yIGJvKi8KLQlyZXQgPSBkbV9jcnRjX3Bpbl9jdXJzb3JfYm9fbmV3KGNydGMs IGZpbGVfcHJpdiwgaGFuZGxlLCAmbmV3X2N1cnNvcl9ibyk7Ci0JLyppZiBtYXAgbm90IHN1Y2Nl c3NmdWwgdGhlbiByZXR1cm4gYW4gZXJyb3IqLwotCWlmIChyZXQpCi0JCWdvdG8gcmVsZWFzZTsK IAogCS8qcHJvZ3JhbSBuZXcgY3Vyc29yIGJvIHRvIGhhcmR3YXJlKi8KLQlkbV9zZXRfY3Vyc29y KGFtZGdwdV9jcnRjLCBhbWRncHVfY3J0Yy0+Y3Vyc29yX2FkZHIsIHdpZHRoLCBoZWlnaHQpOwot Ci0JLyp1biBtYXAgb2xkLCBub3QgdXNlZCBhbnltb3JlIGN1cnNvciBibyAsCi0JICogcmV0dXJu IG1lbW9yeSBhbmQgbWFwcGluZyBiYWNrICovCi0JZG1fY3J0Y191bnBpbl9jdXJzb3JfYm9fb2xk KGFtZGdwdV9jcnRjKTsKLQotCS8qYXNzaWduIG5ldyBjdXJzb3IgYm8gdG8gb3VyIGludGVybmFs IGNhY2hlKi8KLQlhbWRncHVfY3J0Yy0+Y3Vyc29yX2JvID0gJm5ld19jdXJzb3JfYm8tPmdlbV9i YXNlOworCWRtX3NldF9jdXJzb3IoYW1kZ3B1X2NydGMsIGFkZHJlc3MsIHdpZHRoLCBoZWlnaHQp OwogCiByZWxlYXNlOgogCXJldHVybiByZXQ7CkBAIC0zNjAsMjMgKzI0Niw2IEBAIHN0YXRpYyBp bnQgZG1fY3J0Y19jdXJzb3JfbW92ZShzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAJcmV0dXJuIDA7 CiB9CiAKLXN0YXRpYyB2b2lkIGRtX2NydGNfY3Vyc29yX3Jlc2V0KHN0cnVjdCBkcm1fY3J0YyAq Y3J0YykKLXsKLQlzdHJ1Y3QgYW1kZ3B1X2NydGMgKmFtZGdwdV9jcnRjID0gdG9fYW1kZ3B1X2Ny dGMoY3J0Yyk7Ci0KLQlEUk1fREVCVUdfS01TKAotCQkiJXM6IHdpdGggY3Vyc29yX2JvICVwXG4i LAotCQlfX2Z1bmNfXywKLQkJYW1kZ3B1X2NydGMtPmN1cnNvcl9ibyk7Ci0KLQlpZiAoYW1kZ3B1 X2NydGMtPmN1cnNvcl9ibyAmJiBhbWRncHVfY3J0Yy0+c3RyZWFtKSB7Ci0JCWRtX3NldF9jdXJz b3IoCi0JCWFtZGdwdV9jcnRjLAotCQlhbWRncHVfY3J0Yy0+Y3Vyc29yX2FkZHIsCi0JCWFtZGdw dV9jcnRjLT5jdXJzb3Jfd2lkdGgsCi0JCWFtZGdwdV9jcnRjLT5jdXJzb3JfaGVpZ2h0KTsKLQl9 Ci19CiBzdGF0aWMgYm9vbCBmaWxsX3JlY3RzX2Zyb21fcGxhbmVfc3RhdGUoCiAJY29uc3Qgc3Ry dWN0IGRybV9wbGFuZV9zdGF0ZSAqc3RhdGUsCiAJc3RydWN0IGRjX3N1cmZhY2UgKnN1cmZhY2Up CkBAIC0xMTcyLDggKzEwNDEsNiBAQCBzdGF0aWMgaW50IGFtZGdwdV9hdG9taWNfaGVscGVyX3Bh Z2VfZmxpcChzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAvKiBJbXBsZW1lbnRlZCBvbmx5IHRoZSBv cHRpb25zIGN1cnJlbnRseSBhdmFpbGlibGUgZm9yIHRoZSBkcml2ZXIgKi8KIHN0YXRpYyBjb25z dCBzdHJ1Y3QgZHJtX2NydGNfZnVuY3MgYW1kZ3B1X2RtX2NydGNfZnVuY3MgPSB7CiAJLnJlc2V0 ID0gZHJtX2F0b21pY19oZWxwZXJfY3J0Y19yZXNldCwKLQkuY3Vyc29yX3NldCA9IGRtX2NydGNf Y3Vyc29yX3NldCwKLQkuY3Vyc29yX21vdmUgPSBkbV9jcnRjX2N1cnNvcl9tb3ZlLAogCS5kZXN0 cm95ID0gYW1kZ3B1X2RtX2NydGNfZGVzdHJveSwKIAkuZ2FtbWFfc2V0ID0gZHJtX2F0b21pY19o ZWxwZXJfbGVnYWN5X2dhbW1hX3NldCwKIAkuc2V0X2NvbmZpZyA9IGRybV9hdG9taWNfaGVscGVy X3NldF9jb25maWcsCkBAIC0xNzQyLDYgKzE2MDksMTggQEAgc3RhdGljIGludCBkbV9wbGFuZV9o ZWxwZXJfcHJlcGFyZV9mYigKIAl9CiAKIAlhbWRncHVfYm9fcmVmKHJibyk7CisKKwkvKiBJdCdz IGEgaGFjayBmb3IgczMgc2luY2UgaW4gNC45IGtlcm5lbCBmaWx0ZXIgb3V0IGN1cnNvciBidWZm ZXIKKwkgKiBwcmVwYXJlIGFuZCBjbGVhbnVwIGluIGRybV9hdG9taWNfaGVscGVyX3ByZXBhcmVf cGxhbmVzCisJICogYW5kIGRybV9hdG9taWNfaGVscGVyX2NsZWFudXBfcGxhbmVzIGJlY2F1c2Ug ZmIgZG9lbnMndCBpbiBzMy4KKwkgKiBJTiA0LjEwIGtlcm5lbCB0aGlzIGNvZGUgc2hvdWxkIGJl IHJlbW92ZWQgYW5kIGFtZGdwdV9kZXZpY2Vfc3VzcGVuZAorCSAqIGNvZGUgdG91Y2hpbmcgZnJh bSBidWZmZXJzIHNob3VsZCBiZSBhdm9pZGVkIGZvciBEQy4KKwkgKi8KKwlpZiAocGxhbmUtPnR5 cGUgPT0gRFJNX1BMQU5FX1RZUEVfQ1VSU09SKSB7CisJCXN0cnVjdCBhbWRncHVfY3J0YyAqYWNy dGMgPSB0b19hbWRncHVfY3J0YyhuZXdfc3RhdGUtPmNydGMpOworCisJCWFjcnRjLT5jdXJzb3Jf Ym8gPSBvYmo7CisJfQogCXJldHVybiAwOwogfQogCkBAIC0xODM5LDYgKzE3MTgsMTAgQEAgc3Rh dGljIHVpbnQzMl90IHl1dl9mb3JtYXRzW10gPSB7CiAJRFJNX0ZPUk1BVF9OVjIxLAogfTsKIAor c3RhdGljIGNvbnN0IHUzMiBjdXJzb3JfZm9ybWF0c1tdID0geworCURSTV9GT1JNQVRfQVJHQjg4 ODgKK307CisKIGludCBhbWRncHVfZG1fcGxhbmVfaW5pdChzdHJ1Y3QgYW1kZ3B1X2Rpc3BsYXlf bWFuYWdlciAqZG0sCiAJCQlzdHJ1Y3QgYW1kZ3B1X3BsYW5lICphcGxhbmUsCiAJCQl1bnNpZ25l ZCBsb25nIHBvc3NpYmxlX2NydGNzKQpAQCAtMTg2OSw3ICsxNzUyLDE0IEBAIGludCBhbWRncHVf ZG1fcGxhbmVfaW5pdChzdHJ1Y3QgYW1kZ3B1X2Rpc3BsYXlfbWFuYWdlciAqZG0sCiAJCQkJYXBs YW5lLT5wbGFuZV90eXBlLCBOVUxMKTsKIAkJYnJlYWs7CiAJY2FzZSBEUk1fUExBTkVfVFlQRV9D VVJTT1I6Ci0JCURSTV9FUlJPUigiS01TOiBDdXJzb3IgcGxhbmUgbm90IGltcGxlbWVudGVkLiIp OworCQlyZXMgPSBkcm1fdW5pdmVyc2FsX3BsYW5lX2luaXQoCisJCQkJZG0tPmFkZXYtPmRkZXYs CisJCQkJJmFwbGFuZS0+YmFzZSwKKwkJCQlwb3NzaWJsZV9jcnRjcywKKwkJCQkmZG1fcGxhbmVf ZnVuY3MsCisJCQkJY3Vyc29yX2Zvcm1hdHMsCisJCQkJQVJSQVlfU0laRShjdXJzb3JfZm9ybWF0 cyksCisJCQkJYXBsYW5lLT5wbGFuZV90eXBlLCBOVUxMKTsKIAkJYnJlYWs7CiAJfQogCkBAIC0x ODgyLDkgKzE3NzIsMTggQEAgaW50IGFtZGdwdV9kbV9jcnRjX2luaXQoc3RydWN0IGFtZGdwdV9k aXNwbGF5X21hbmFnZXIgKmRtLAogCQkJc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCiAJCQl1aW50 MzJfdCBjcnRjX2luZGV4KQogewotCXN0cnVjdCBhbWRncHVfY3J0YyAqYWNydGM7CisJc3RydWN0 IGFtZGdwdV9jcnRjICphY3J0YyA9IE5VTEw7CisJc3RydWN0IGFtZGdwdV9wbGFuZSAqY3Vyc29y X3BsYW5lOworCiAJaW50IHJlcyA9IC1FTk9NRU07CiAKKwljdXJzb3JfcGxhbmUgPSBremFsbG9j KHNpemVvZigqY3Vyc29yX3BsYW5lKSwgR0ZQX0tFUk5FTCk7CisJaWYgKCFjdXJzb3JfcGxhbmUp CisJCWdvdG8gZmFpbDsKKworCWN1cnNvcl9wbGFuZS0+YmFzZS50eXBlID0gRFJNX1BMQU5FX1RZ UEVfQ1VSU09SOworCXJlcyA9IGFtZGdwdV9kbV9wbGFuZV9pbml0KGRtLCBjdXJzb3JfcGxhbmUs IDApOworCiAJYWNydGMgPSBremFsbG9jKHNpemVvZihzdHJ1Y3QgYW1kZ3B1X2NydGMpLCBHRlBf S0VSTkVMKTsKIAlpZiAoIWFjcnRjKQogCQlnb3RvIGZhaWw7CkBAIC0xODkzLDcgKzE3OTIsNyBA QCBpbnQgYW1kZ3B1X2RtX2NydGNfaW5pdChzdHJ1Y3QgYW1kZ3B1X2Rpc3BsYXlfbWFuYWdlciAq ZG0sCiAJCQlkbS0+ZGRldiwKIAkJCSZhY3J0Yy0+YmFzZSwKIAkJCXBsYW5lLAotCQkJTlVMTCwK KwkJCSZjdXJzb3JfcGxhbmUtPmJhc2UsCiAJCQkmYW1kZ3B1X2RtX2NydGNfZnVuY3MsIE5VTEwp OwogCiAJaWYgKHJlcykKQEAgLTE5MTEsMTIgKzE4MTAsMTcgQEAgaW50IGFtZGdwdV9kbV9jcnRj X2luaXQoc3RydWN0IGFtZGdwdV9kaXNwbGF5X21hbmFnZXIgKmRtLAogCWRybV9tb2RlX2NydGNf c2V0X2dhbW1hX3NpemUoJmFjcnRjLT5iYXNlLCAyNTYpOwogCiAJcmV0dXJuIDA7CisKIGZhaWw6 Ci0Ja2ZyZWUoYWNydGMpOworCWlmIChhY3J0YykKKwkJa2ZyZWUoYWNydGMpOworCWlmIChjdXJz b3JfcGxhbmUpCisJCWtmcmVlKGN1cnNvcl9wbGFuZSk7CiAJYWNydGMtPmNydGNfaWQgPSAtMTsK IAlyZXR1cm4gcmVzOwogfQogCisKIHN0YXRpYyBpbnQgdG9fZHJtX2Nvbm5lY3Rvcl90eXBlKGVu dW0gc2lnbmFsX3R5cGUgc3QpCiB7CiAJc3dpdGNoIChzdCkgewpAQCAtMjQzMSw2ICsyMzM1LDM0 IEBAIHN0YXRpYyB2b2lkIHJlbW92ZV9zdHJlYW0oc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYs IHN0cnVjdCBhbWRncHVfY3J0YyAqYWNydGMpCiAJYWNydGMtPmVuYWJsZWQgPSBmYWxzZTsKIH0K IAorc3RhdGljIHZvaWQgaGFuZGxlX2N1cnNvcl91cGRhdGUoCisJCXN0cnVjdCBkcm1fcGxhbmUg KnBsYW5lLAorCQlzdHJ1Y3QgZHJtX3BsYW5lX3N0YXRlICpvbGRfcGxhbmVfc3RhdGUpCit7CisJ aWYgKCFwbGFuZS0+c3RhdGUtPmZiICYmICFvbGRfcGxhbmVfc3RhdGUtPmZiKQorCQlyZXR1cm47 CisKKwkvKiBDaGVjayBpZiBpdCdzIGEgY3Vyc29yIG9uL29mZiB1cGRhdGUgb3IganVzdCBjdXJz b3IgbW92ZSovCisJaWYgKHBsYW5lLT5zdGF0ZS0+ZmIgPT0gb2xkX3BsYW5lX3N0YXRlLT5mYikK KwkJZG1fY3J0Y19jdXJzb3JfbW92ZSgKKwkJCQlwbGFuZS0+c3RhdGUtPmNydGMsCisJCQkJcGxh bmUtPnN0YXRlLT5jcnRjX3gsCisJCQkJcGxhbmUtPnN0YXRlLT5jcnRjX3kpOworCWVsc2Ugewor CQlzdHJ1Y3QgYW1kZ3B1X2ZyYW1lYnVmZmVyICphZmIgPQorCQkJCXRvX2FtZGdwdV9mcmFtZWJ1 ZmZlcihwbGFuZS0+c3RhdGUtPmZiKTsKKwkJZG1fY3J0Y19jdXJzb3Jfc2V0KAorCQkJCSghIXBs YW5lLT5zdGF0ZS0+ZmIpID8KKwkJCQkJCXBsYW5lLT5zdGF0ZS0+Y3J0YyA6CisJCQkJCQlvbGRf cGxhbmVfc3RhdGUtPmNydGMsCisJCQkJKCEhcGxhbmUtPnN0YXRlLT5mYikgPworCQkJCQkJYWZi LT5hZGRyZXNzIDoKKwkJCQkJCTAsCisJCQkJcGxhbmUtPnN0YXRlLT5jcnRjX3csCisJCQkJcGxh bmUtPnN0YXRlLT5jcnRjX2gpOworCX0KK30KKwogCiAvKgogICogRXhlY3V0ZXMgZmxpcApAQCAt MjUyMiw2ICsyNDU0LDExIEBAIHN0YXRpYyB2b2lkIGFtZGdwdV9kbV9jb21taXRfc3VyZmFjZXMo c3RydWN0IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlLAogCQlzdHJ1Y3QgZG1fY29ubmVjdG9yX3N0 YXRlICpjb25fc3RhdGUgPSBOVUxMOwogCQlib29sIHBmbGlwX25lZWRlZDsKIAorCQlpZiAocGxh bmUtPnR5cGUgPT0gRFJNX1BMQU5FX1RZUEVfQ1VSU09SKSB7CisJCQloYW5kbGVfY3Vyc29yX3Vw ZGF0ZShwbGFuZSwgb2xkX3BsYW5lX3N0YXRlKTsKKwkJCWNvbnRpbnVlOworCQl9CisKIAkJaWYg KCFmYiB8fCAhY3J0YyB8fCAhY3J0Yy0+c3RhdGUtPmFjdGl2ZSkKIAkJCWNvbnRpbnVlOwogCkBA IC0yODA2LDcgKzI3NDMsNiBAQCB2b2lkIGFtZGdwdV9kbV9hdG9taWNfY29tbWl0X3RhaWwoCiAJ CQkJYWRldi0+ZG0uZnJlZXN5bmNfbW9kdWxlLCAmYWNydGMtPnN0cmVhbSwgMSk7CiAKIAkJbWFu YWdlX2RtX2ludGVycnVwdHMoYWRldiwgYWNydGMsIHRydWUpOwotCQlkbV9jcnRjX2N1cnNvcl9y ZXNldCgmYWNydGMtPmJhc2UpOwogCX0KIAogCkBAIC0zMTg2LDE4ICszMTIyLDE5IEBAIGludCBh bWRncHVfZG1fYXRvbWljX2NoZWNrKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJCQl9CiAJCX0K IAorCiAJCS8qCi0JCSAqIFRPRE8gcmV2aXNpdCB3aGVuIHJlbW92aW5nIGNvbW1pdCBhY3Rpb24K LQkJICogYW5kIGxvb2tpbmcgYXQgYXRvbWljIGZsYWdzIGRpcmVjdGx5CisJCSAqIEhhY2s6IENv bW1pdCBuZWVkcyBwbGFuZXMgcmlnaHQgbm93LCBzcGVjaWZpY2FsbHkgZm9yIGdhbW1hCisJCSAq IFRPRE8gcmV3b3JrIGNvbW1pdCB0byBjaGVjayBDUlRDIGZvciBnYW1tYSBjaGFuZ2UKIAkJICov CisJCWlmIChjcnRjX3N0YXRlLT5jb2xvcl9tZ210X2NoYW5nZWQpIHsKIAotCQkvKiBjb21taXQg bmVlZHMgcGxhbmVzIHJpZ2h0IG5vdyAoZm9yIGdhbW1hLCBlZy4pICovCi0JCS8qIFRPRE8gcmV3 b3JrIGNvbW1pdCB0byBjaGFjayBjcnRjIGZvciBnYW1tYSBjaGFuZ2UgKi8KLQkJcmV0ID0gZHJt X2F0b21pY19hZGRfYWZmZWN0ZWRfcGxhbmVzKHN0YXRlLCBjcnRjKTsKLQkJaWYgKHJldCkKLQkJ CXJldHVybiByZXQ7CisJCQlyZXQgPSBkcm1fYXRvbWljX2FkZF9hZmZlY3RlZF9wbGFuZXMoc3Rh dGUsIGNydGMpOworCQkJaWYgKHJldCkKKwkJCQlyZXR1cm4gcmV0OwogCi0JCXJldCA9IC1FSU5W QUw7CisJCQlyZXQgPSAtRUlOVkFMOworCQl9CiAJfQogCiAJLyogQ2hlY2sgc2NhbGluZyBhbmQg dW5kZXJzYWNuIGNoYW5nZXMqLwpAQCAtMzI1Miw2ICszMTg5LDkgQEAgaW50IGFtZGdwdV9kbV9h dG9taWNfY2hlY2soc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAkJCXN0cnVjdCBkcm1fY3J0Y19z dGF0ZSAqY3J0Y19zdGF0ZTsKIAkJCWJvb2wgcGZsaXBfbmVlZGVkOwogCisJCQkvKlRPRE8gSW1w bGVtZW50IGF0b21pYyBjaGVjayBmb3IgY3Vyc29yIHBsYW5lICovCisJCQlpZiAocGxhbmUtPnR5 cGUgPT0gRFJNX1BMQU5FX1RZUEVfQ1VSU09SKQorCQkJCWNvbnRpbnVlOwogCiAJCQlpZiAoIWZi IHx8ICFjcnRjIHx8IGNydGNfc2V0W2ldICE9IGNydGMgfHwKIAkJCQkhY3J0Yy0+c3RhdGUtPnBs YW5lc19jaGFuZ2VkIHx8ICFjcnRjLT5zdGF0ZS0+YWN0aXZlKQotLSAKMi4xMS4wCgpfX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwphbWQtZ2Z4IG1haWxpbmcg bGlzdAphbWQtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNr dG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2FtZC1nZngK