From: Subject: [PATCH 2/6] drm/amd/display: Use new DRM API where possible Date: Thu, 12 Oct 2017 17:15:07 -0400 Message-ID: <1507842911-16975-3-git-send-email-sunpeng.li@amd.com> References: <1507842911-16975-1-git-send-email-sunpeng.li@amd.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1507842911-16975-1-git-send-email-sunpeng.li-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: airlied-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org, amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Cc: "Leo (Sunpeng) Li" , harry.wentland-5C7GfCeVMHo@public.gmane.org, maarten.lankhorst-VuQAYsv1563Yd54FQh9/CA@public.gmane.org, dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org RnJvbTogIkxlbyAoU3VucGVuZykgTGkiIDxzdW5wZW5nLmxpQGFtZC5jb20+CgpUbyBjb25mb3Jt IHRvIERSTSdzIG5ldyBBUEksIHdlIHNob3VsZCBub3QgYmUgYWNjZXNzaW5nIGEgRFJNIG9iamVj dCdzCmludGVybmFsIHN0YXRlIGRpcmVjdGx5LiBSYXRoZXIsIHRoZSBEUk0gZm9yX2VhY2hfb2xk L25ld18qIGl0ZXJhdG9ycywKYW5kIGRybV9hdG9taWNfZ2V0X29sZC9uZXdfKiBpbnRlcmZhY2Ug c2hvdWxkIGJlIHVzZWQuCgpUaGlzIGlzIGFuIG9uZ29pbmcgcHJvY2Vzcy4gRm9yIG5vdywgdXBk YXRlIHRoZSBEUk0tZmFjaW5nIGF0b21pYwpmdW5jdGlvbnMsIHdoZXJlIHRoZSBhdG9taWMgc3Rh dGUgb2JqZWN0IGlzIGdpdmVuLgoKU2lnbmVkLW9mZi1ieTogTGVvIChTdW5wZW5nKSBMaSA8c3Vu cGVuZy5saUBhbWQuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9hbWRncHVf ZG0vYW1kZ3B1X2RtLmMgfCAxMzEgKysrKysrKysrKystLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5n ZWQsIDY2IGluc2VydGlvbnMoKyksIDY1IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZl cnMvZ3B1L2RybS9hbWQvZGlzcGxheS9hbWRncHVfZG0vYW1kZ3B1X2RtLmMgYi9kcml2ZXJzL2dw dS9kcm0vYW1kL2Rpc3BsYXkvYW1kZ3B1X2RtL2FtZGdwdV9kbS5jCmluZGV4IGNjMDI0YWIuLmQ0 NDI2YjMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9hbWRncHVfZG0v YW1kZ3B1X2RtLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2FtZGdwdV9kbS9h bWRncHVfZG0uYwpAQCAtMzg3MywyOCArMzg3MywzMSBAQCBzdGF0aWMgdm9pZCBhbWRncHVfZG1f Y29tbWl0X3BsYW5lcyhzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGUsCiB7CiAJdWludDMy X3QgaTsKIAlzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZTsKLQlzdHJ1Y3QgZHJtX3BsYW5lX3N0YXRl ICpvbGRfcGxhbmVfc3RhdGU7CisJc3RydWN0IGRybV9wbGFuZV9zdGF0ZSAqb2xkX3BsYW5lX3N0 YXRlLCAqbmV3X3BsYW5lX3N0YXRlOwogCXN0cnVjdCBkY19zdHJlYW1fc3RhdGUgKmRjX3N0cmVh bV9hdHRhY2g7CiAJc3RydWN0IGRjX3BsYW5lX3N0YXRlICpwbGFuZV9zdGF0ZXNfY29uc3RydWN0 ZWRbTUFYX1NVUkZBQ0VTXTsKIAlzdHJ1Y3QgYW1kZ3B1X2NydGMgKmFjcnRjX2F0dGFjaCA9IHRv X2FtZGdwdV9jcnRjKHBjcnRjKTsKLQlzdHJ1Y3QgZG1fY3J0Y19zdGF0ZSAqYWNydGNfc3RhdGUg PSB0b19kbV9jcnRjX3N0YXRlKHBjcnRjLT5zdGF0ZSk7CisJc3RydWN0IGRybV9jcnRjX3N0YXRl ICpuZXdfcGNydGNfc3RhdGUgPQorCQkJZHJtX2F0b21pY19nZXRfbmV3X2NydGNfc3RhdGUoc3Rh dGUsIHBjcnRjKTsKKwlzdHJ1Y3QgZG1fY3J0Y19zdGF0ZSAqYWNydGNfc3RhdGUgPSB0b19kbV9j cnRjX3N0YXRlKG5ld19wY3J0Y19zdGF0ZSk7CiAJaW50IHBsYW5lc19jb3VudCA9IDA7CiAJdW5z aWduZWQgbG9uZyBmbGFnczsKIAogCS8qIHVwZGF0ZSBwbGFuZXMgd2hlbiBuZWVkZWQgKi8KLQlm b3JfZWFjaF9vbGRfcGxhbmVfaW5fc3RhdGUoc3RhdGUsIHBsYW5lLCBvbGRfcGxhbmVfc3RhdGUs IGkpIHsKLQkJc3RydWN0IGRybV9wbGFuZV9zdGF0ZSAqcGxhbmVfc3RhdGUgPSBwbGFuZS0+c3Rh dGU7Ci0JCXN0cnVjdCBkcm1fY3J0YyAqY3J0YyA9IHBsYW5lX3N0YXRlLT5jcnRjOwotCQlzdHJ1 Y3QgZHJtX2ZyYW1lYnVmZmVyICpmYiA9IHBsYW5lX3N0YXRlLT5mYjsKKwlmb3JfZWFjaF9vbGRu ZXdfcGxhbmVfaW5fc3RhdGUoc3RhdGUsIHBsYW5lLCBvbGRfcGxhbmVfc3RhdGUsIG5ld19wbGFu ZV9zdGF0ZSwgaSkgeworCQlzdHJ1Y3QgZHJtX2NydGMgKmNydGMgPSBuZXdfcGxhbmVfc3RhdGUt PmNydGM7CisJCXN0cnVjdCBkcm1fY3J0Y19zdGF0ZSAqbmV3X2NydGNfc3RhdGUgPQorCQkJCWRy bV9hdG9taWNfZ2V0X25ld19jcnRjX3N0YXRlKHN0YXRlLCBjcnRjKTsKKwkJc3RydWN0IGRybV9m cmFtZWJ1ZmZlciAqZmIgPSBuZXdfcGxhbmVfc3RhdGUtPmZiOwogCQlib29sIHBmbGlwX25lZWRl ZDsKLQkJc3RydWN0IGRtX3BsYW5lX3N0YXRlICpkbV9wbGFuZV9zdGF0ZSA9IHRvX2RtX3BsYW5l X3N0YXRlKHBsYW5lX3N0YXRlKTsKKwkJc3RydWN0IGRtX3BsYW5lX3N0YXRlICpkbV9wbGFuZV9z dGF0ZSA9IHRvX2RtX3BsYW5lX3N0YXRlKG5ld19wbGFuZV9zdGF0ZSk7CiAKIAkJaWYgKHBsYW5l LT50eXBlID09IERSTV9QTEFORV9UWVBFX0NVUlNPUikgewogCQkJaGFuZGxlX2N1cnNvcl91cGRh dGUocGxhbmUsIG9sZF9wbGFuZV9zdGF0ZSk7CiAJCQljb250aW51ZTsKIAkJfQogCi0JCWlmICgh ZmIgfHwgIWNydGMgfHwgcGNydGMgIT0gY3J0YyB8fCAhY3J0Yy0+c3RhdGUtPmFjdGl2ZSkKKwkJ aWYgKCFmYiB8fCAhY3J0YyB8fCBwY3J0YyAhPSBjcnRjIHx8ICFuZXdfY3J0Y19zdGF0ZS0+YWN0 aXZlKQogCQkJY29udGludWU7CiAKIAkJcGZsaXBfbmVlZGVkID0gIXN0YXRlLT5hbGxvd19tb2Rl c2V0OwpAQCAtMzkxOCwxMyArMzkyMSwxMyBAQCBzdGF0aWMgdm9pZCBhbWRncHVfZG1fY29tbWl0 X3BsYW5lcyhzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGUsCiAJCQlkY19zdHJlYW1fYXR0 YWNoID0gYWNydGNfc3RhdGUtPnN0cmVhbTsKIAkJCXBsYW5lc19jb3VudCsrOwogCi0JCX0gZWxz ZSBpZiAoY3J0Yy0+c3RhdGUtPnBsYW5lc19jaGFuZ2VkKSB7CisJCX0gZWxzZSBpZiAobmV3X2Ny dGNfc3RhdGUtPnBsYW5lc19jaGFuZ2VkKSB7CiAJCQkvKiBBc3N1bWUgZXZlbiBPTkUgY3J0YyB3 aXRoIGltbWVkaWF0ZSBmbGlwIG1lYW5zCiAJCQkgKiBlbnRpcmUgY2FuJ3Qgd2FpdCBmb3IgVkJM QU5LCiAJCQkgKiBUT0RPIENoZWNrIGlmIGl0J3MgY29ycmVjdAogCQkJICovCiAJCQkqd2FpdF9m b3JfdmJsYW5rID0KLQkJCQkJcGNydGMtPnN0YXRlLT5wYWdlZmxpcF9mbGFncyAmIERSTV9NT0RF X1BBR0VfRkxJUF9BU1lOQyA/CisJCQkJCW5ld19wY3J0Y19zdGF0ZS0+cGFnZWZsaXBfZmxhZ3Mg JiBEUk1fTU9ERV9QQUdFX0ZMSVBfQVNZTkMgPwogCQkJCWZhbHNlIDogdHJ1ZTsKIAogCQkJLyog VE9ETzogTmVlZHMgcmV3b3JrIGZvciBtdWx0aXBsYW5lIGZsaXAgKi8KQEAgLTM5NDIsNyArMzk0 NSw3IEBAIHN0YXRpYyB2b2lkIGFtZGdwdV9kbV9jb21taXRfcGxhbmVzKHN0cnVjdCBkcm1fYXRv bWljX3N0YXRlICpzdGF0ZSwKIAlpZiAocGxhbmVzX2NvdW50KSB7CiAJCXVuc2lnbmVkIGxvbmcg ZmxhZ3M7CiAKLQkJaWYgKHBjcnRjLT5zdGF0ZS0+ZXZlbnQpIHsKKwkJaWYgKG5ld19wY3J0Y19z dGF0ZS0+ZXZlbnQpIHsKIAogCQkJZHJtX2NydGNfdmJsYW5rX2dldChwY3J0Yyk7CiAKQEAgLTM5 NjgsNyArMzk3MSw3IEBAIGludCBhbWRncHVfZG1fYXRvbWljX2NvbW1pdCgKIAkJYm9vbCBub25i bG9jaykKIHsKIAlzdHJ1Y3QgZHJtX2NydGMgKmNydGM7Ci0Jc3RydWN0IGRybV9jcnRjX3N0YXRl ICpuZXdfc3RhdGU7CisJc3RydWN0IGRybV9jcnRjX3N0YXRlICpvbGRfY3J0Y19zdGF0ZSwgKm5l d19zdGF0ZTsKIAlzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiA9IGRldi0+ZGV2X3ByaXZhdGU7 CiAJaW50IGk7CiAKQEAgLTM5NzksOCArMzk4Miw4IEBAIGludCBhbWRncHVfZG1fYXRvbWljX2Nv bW1pdCgKIAkgKiBpdCB3aWxsIHVwZGF0ZSBjcnRjLT5kbV9jcnRjX3N0YXRlLT5zdHJlYW0gcG9p bnRlciB3aGljaCBpcyB1c2VkIGluCiAJICogdGhlIElTUnMuCiAJICovCi0JZm9yX2VhY2hfbmV3 X2NydGNfaW5fc3RhdGUoc3RhdGUsIGNydGMsIG5ld19zdGF0ZSwgaSkgewotCQlzdHJ1Y3QgZG1f Y3J0Y19zdGF0ZSAqb2xkX2FjcnRjX3N0YXRlID0gdG9fZG1fY3J0Y19zdGF0ZShjcnRjLT5zdGF0 ZSk7CisJZm9yX2VhY2hfb2xkbmV3X2NydGNfaW5fc3RhdGUoc3RhdGUsIGNydGMsIG9sZF9jcnRj X3N0YXRlLCBuZXdfc3RhdGUsIGkpIHsKKwkJc3RydWN0IGRtX2NydGNfc3RhdGUgKm9sZF9hY3J0 Y19zdGF0ZSA9IHRvX2RtX2NydGNfc3RhdGUob2xkX2NydGNfc3RhdGUpOwogCQlzdHJ1Y3QgYW1k Z3B1X2NydGMgKmFjcnRjID0gdG9fYW1kZ3B1X2NydGMoY3J0Yyk7CiAKIAkJaWYgKGRybV9hdG9t aWNfY3J0Y19uZWVkc19tb2Rlc2V0KG5ld19zdGF0ZSkgJiYgb2xkX2FjcnRjX3N0YXRlLT5zdHJl YW0pCkBAIC00MDAyLDEzICs0MDA1LDEzIEBAIHZvaWQgYW1kZ3B1X2RtX2F0b21pY19jb21taXRf dGFpbCgKIAl1aW50MzJfdCBpLCBqOwogCXVpbnQzMl90IG5ld19jcnRjc19jb3VudCA9IDA7CiAJ c3RydWN0IGRybV9jcnRjICpjcnRjLCAqcGNydGM7Ci0Jc3RydWN0IGRybV9jcnRjX3N0YXRlICpv bGRfY3J0Y19zdGF0ZTsKKwlzdHJ1Y3QgZHJtX2NydGNfc3RhdGUgKm9sZF9jcnRjX3N0YXRlLCAq bmV3X2NydGNfc3RhdGU7CiAJc3RydWN0IGFtZGdwdV9jcnRjICpuZXdfY3J0Y3NbTUFYX1NUUkVB TVNdOwogCXN0cnVjdCBkY19zdHJlYW1fc3RhdGUgKm5ld19zdHJlYW0gPSBOVUxMOwogCXVuc2ln bmVkIGxvbmcgZmxhZ3M7CiAJYm9vbCB3YWl0X2Zvcl92YmxhbmsgPSB0cnVlOwogCXN0cnVjdCBk cm1fY29ubmVjdG9yICpjb25uZWN0b3I7Ci0Jc3RydWN0IGRybV9jb25uZWN0b3Jfc3RhdGUgKm9s ZF9jb25uX3N0YXRlOworCXN0cnVjdCBkcm1fY29ubmVjdG9yX3N0YXRlICpvbGRfY29ubl9zdGF0 ZSwgKm5ld19jb25fc3RhdGU7CiAJc3RydWN0IGRtX2NydGNfc3RhdGUgKm9sZF9hY3J0Y19zdGF0 ZSwgKm5ld19hY3J0Y19zdGF0ZTsKIAogCWRybV9hdG9taWNfaGVscGVyX3VwZGF0ZV9sZWdhY3lf bW9kZXNldF9zdGF0ZShkZXYsIHN0YXRlKTsKQEAgLTQwMTYsMTEgKzQwMTksMTAgQEAgdm9pZCBh bWRncHVfZG1fYXRvbWljX2NvbW1pdF90YWlsKAogCWRtX3N0YXRlID0gdG9fZG1fYXRvbWljX3N0 YXRlKHN0YXRlKTsKIAogCS8qIHVwZGF0ZSBjaGFuZ2VkIGl0ZW1zICovCi0JZm9yX2VhY2hfb2xk X2NydGNfaW5fc3RhdGUoc3RhdGUsIGNydGMsIG9sZF9jcnRjX3N0YXRlLCBpKSB7CisJZm9yX2Vh Y2hfb2xkbmV3X2NydGNfaW5fc3RhdGUoc3RhdGUsIGNydGMsIG9sZF9jcnRjX3N0YXRlLCBuZXdf Y3J0Y19zdGF0ZSwgaSkgewogCQlzdHJ1Y3QgYW1kZ3B1X2NydGMgKmFjcnRjID0gdG9fYW1kZ3B1 X2NydGMoY3J0Yyk7Ci0JCXN0cnVjdCBkcm1fY3J0Y19zdGF0ZSAqbmV3X3N0YXRlID0gY3J0Yy0+ c3RhdGU7CiAKLQkJbmV3X2FjcnRjX3N0YXRlID0gdG9fZG1fY3J0Y19zdGF0ZShuZXdfc3RhdGUp OworCQluZXdfYWNydGNfc3RhdGUgPSB0b19kbV9jcnRjX3N0YXRlKG5ld19jcnRjX3N0YXRlKTsK IAkJb2xkX2FjcnRjX3N0YXRlID0gdG9fZG1fY3J0Y19zdGF0ZShvbGRfY3J0Y19zdGF0ZSk7CiAK IAkJRFJNX0RFQlVHX0RSSVZFUigKQEAgLTQwMjgsMTggKzQwMzAsMTggQEAgdm9pZCBhbWRncHVf ZG1fYXRvbWljX2NvbW1pdF90YWlsKAogCQkJInBsYW5lc19jaGFuZ2VkOiVkLCBtb2RlX2NoYW5n ZWQ6JWQsYWN0aXZlX2NoYW5nZWQ6JWQsIgogCQkJImNvbm5lY3RvcnNfY2hhbmdlZDolZFxuIiwK IAkJCWFjcnRjLT5jcnRjX2lkLAotCQkJbmV3X3N0YXRlLT5lbmFibGUsCi0JCQluZXdfc3RhdGUt PmFjdGl2ZSwKLQkJCW5ld19zdGF0ZS0+cGxhbmVzX2NoYW5nZWQsCi0JCQluZXdfc3RhdGUtPm1v ZGVfY2hhbmdlZCwKLQkJCW5ld19zdGF0ZS0+YWN0aXZlX2NoYW5nZWQsCi0JCQluZXdfc3RhdGUt PmNvbm5lY3RvcnNfY2hhbmdlZCk7CisJCQluZXdfY3J0Y19zdGF0ZS0+ZW5hYmxlLAorCQkJbmV3 X2NydGNfc3RhdGUtPmFjdGl2ZSwKKwkJCW5ld19jcnRjX3N0YXRlLT5wbGFuZXNfY2hhbmdlZCwK KwkJCW5ld19jcnRjX3N0YXRlLT5tb2RlX2NoYW5nZWQsCisJCQluZXdfY3J0Y19zdGF0ZS0+YWN0 aXZlX2NoYW5nZWQsCisJCQluZXdfY3J0Y19zdGF0ZS0+Y29ubmVjdG9yc19jaGFuZ2VkKTsKIAog CQkvKiBoYW5kbGVzIGhlYWRsZXNzIGhvdHBsdWcgY2FzZSwgdXBkYXRpbmcgbmV3X3N0YXRlIGFu ZAogCQkgKiBhY29ubmVjdG9yIGFzIG5lZWRlZAogCQkgKi8KIAotCQlpZiAobW9kZXNldF9yZXF1 aXJlZChuZXdfc3RhdGUsIG5ld19hY3J0Y19zdGF0ZS0+c3RyZWFtLCBvbGRfYWNydGNfc3RhdGUt PnN0cmVhbSkpIHsKKwkJaWYgKG1vZGVzZXRfcmVxdWlyZWQobmV3X2NydGNfc3RhdGUsIG5ld19h Y3J0Y19zdGF0ZS0+c3RyZWFtLCBvbGRfYWNydGNfc3RhdGUtPnN0cmVhbSkpIHsKIAogCQkJRFJN X0RFQlVHX0RSSVZFUigiQXRvbWljIGNvbW1pdDogU0VUIGNydGMgaWQgJWQ6IFslcF1cbiIsIGFj cnRjLT5jcnRjX2lkLCBhY3J0Yyk7CiAKQEAgLTQwODIsMTAgKzQwODQsMTEgQEAgdm9pZCBhbWRn cHVfZG1fYXRvbWljX2NvbW1pdF90YWlsKAogCQkJbmV3X2NydGNzW25ld19jcnRjc19jb3VudF0g PSBhY3J0YzsKIAkJCW5ld19jcnRjc19jb3VudCsrOwogCisJCQluZXdfY3J0Y19zdGF0ZSA9IGRy bV9hdG9taWNfZ2V0X25ld19jcnRjX3N0YXRlKHN0YXRlLCBjcnRjKTsKIAkJCWFjcnRjLT5lbmFi bGVkID0gdHJ1ZTsKLQkJCWFjcnRjLT5od19tb2RlID0gY3J0Yy0+c3RhdGUtPm1vZGU7Ci0JCQlj cnRjLT5od21vZGUgPSBjcnRjLT5zdGF0ZS0+bW9kZTsKLQkJfSBlbHNlIGlmIChtb2RlcmVzZXRf cmVxdWlyZWQobmV3X3N0YXRlKSkgeworCQkJYWNydGMtPmh3X21vZGUgPSBuZXdfY3J0Y19zdGF0 ZS0+bW9kZTsKKwkJCWNydGMtPmh3bW9kZSA9IG5ld19jcnRjX3N0YXRlLT5tb2RlOworCQl9IGVs c2UgaWYgKG1vZGVyZXNldF9yZXF1aXJlZChuZXdfY3J0Y19zdGF0ZSkpIHsKIAkJCURSTV9ERUJV R19EUklWRVIoIkF0b21pYyBjb21taXQ6IFJFU0VULiBjcnRjIGlkICVkOlslcF1cbiIsIGFjcnRj LT5jcnRjX2lkLCBhY3J0Yyk7CiAKIAkJCS8qIGkuZS4gcmVzZXQgbW9kZSAqLwpAQCAtNDEwMiw3 ICs0MTA1LDkgQEAgdm9pZCBhbWRncHVfZG1fYXRvbWljX2NvbW1pdF90YWlsKAogCQlmb3IgKGkg PSAwOyBpIDwgbmV3X2NydGNzX2NvdW50OyBpKyspIHsKIAkJCXN0cnVjdCBhbWRncHVfZG1fY29u bmVjdG9yICphY29ubmVjdG9yID0gTlVMTDsKIAotCQkJbmV3X2FjcnRjX3N0YXRlID0gdG9fZG1f Y3J0Y19zdGF0ZShuZXdfY3J0Y3NbaV0tPmJhc2Uuc3RhdGUpOworCQkJbmV3X2NydGNfc3RhdGUg PSBkcm1fYXRvbWljX2dldF9uZXdfY3J0Y19zdGF0ZShzdGF0ZSwKKwkJCQkJJm5ld19jcnRjc1tp XS0+YmFzZSk7CisJCQluZXdfYWNydGNfc3RhdGUgPSB0b19kbV9jcnRjX3N0YXRlKG5ld19jcnRj X3N0YXRlKTsKIAogCQkJbmV3X3N0cmVhbSA9IG5ld19hY3J0Y19zdGF0ZS0+c3RyZWFtOwogCQkJ YWNvbm5lY3RvciA9IGFtZGdwdV9kbV9maW5kX2ZpcnN0X2NyY3RfbWF0Y2hpbmdfY29ubmVjdG9y KApAQCAtNDEyMywxMSArNDEyOCwxMCBAQCB2b2lkIGFtZGdwdV9kbV9hdG9taWNfY29tbWl0X3Rh aWwoCiAJaWYgKGRtX3N0YXRlLT5jb250ZXh0KQogCQlXQVJOX09OKCFkY19jb21taXRfc3RhdGUo ZG0tPmRjLCBkbV9zdGF0ZS0+Y29udGV4dCkpOwogCi0KLQlsaXN0X2Zvcl9lYWNoX2VudHJ5KGNy dGMsICZkZXYtPm1vZGVfY29uZmlnLmNydGNfbGlzdCwgaGVhZCkgeworCWZvcl9lYWNoX25ld19j cnRjX2luX3N0YXRlKHN0YXRlLCBjcnRjLCBuZXdfY3J0Y19zdGF0ZSwgaSkgewogCQlzdHJ1Y3Qg YW1kZ3B1X2NydGMgKmFjcnRjID0gdG9fYW1kZ3B1X2NydGMoY3J0Yyk7CiAKLQkJbmV3X2FjcnRj X3N0YXRlID0gdG9fZG1fY3J0Y19zdGF0ZShjcnRjLT5zdGF0ZSk7CisJCW5ld19hY3J0Y19zdGF0 ZSA9IHRvX2RtX2NydGNfc3RhdGUobmV3X2NydGNfc3RhdGUpOwogCiAJCWlmIChuZXdfYWNydGNf c3RhdGUtPnN0cmVhbSAhPSBOVUxMKSB7CiAJCQljb25zdCBzdHJ1Y3QgZGNfc3RyZWFtX3N0YXR1 cyAqc3RhdHVzID0KQEAgLTQxNDEsMjQgKzQxNDUsMjQgQEAgdm9pZCBhbWRncHVfZG1fYXRvbWlj X2NvbW1pdF90YWlsKAogCX0KIAogCS8qIEhhbmRsZSBzY2FsaW5nIGFuZCB1bmRlcnNhY24gY2hh bmdlcyovCi0JZm9yX2VhY2hfb2xkX2Nvbm5lY3Rvcl9pbl9zdGF0ZShzdGF0ZSwgY29ubmVjdG9y LCBvbGRfY29ubl9zdGF0ZSwgaSkgewotCQlzdHJ1Y3QgYW1kZ3B1X2RtX2Nvbm5lY3RvciAqYWNv bm5lY3RvciA9IHRvX2FtZGdwdV9kbV9jb25uZWN0b3IoY29ubmVjdG9yKTsKLQkJc3RydWN0IGRt X2Nvbm5lY3Rvcl9zdGF0ZSAqY29uX25ld19zdGF0ZSA9Ci0JCQkJdG9fZG1fY29ubmVjdG9yX3N0 YXRlKGFjb25uZWN0b3ItPmJhc2Uuc3RhdGUpOwotCQlzdHJ1Y3QgZG1fY29ubmVjdG9yX3N0YXRl ICpjb25fb2xkX3N0YXRlID0KLQkJCQl0b19kbV9jb25uZWN0b3Jfc3RhdGUob2xkX2Nvbm5fc3Rh dGUpOworCWZvcl9lYWNoX29sZG5ld19jb25uZWN0b3JfaW5fc3RhdGUoc3RhdGUsIGNvbm5lY3Rv ciwgb2xkX2Nvbm5fc3RhdGUsIG5ld19jb25fc3RhdGUsIGkpIHsKKwkJc3RydWN0IGRtX2Nvbm5l Y3Rvcl9zdGF0ZSAqY29uX25ld19zdGF0ZSA9IHRvX2RtX2Nvbm5lY3Rvcl9zdGF0ZShuZXdfY29u X3N0YXRlKTsKKwkJc3RydWN0IGRtX2Nvbm5lY3Rvcl9zdGF0ZSAqY29uX29sZF9zdGF0ZSA9IHRv X2RtX2Nvbm5lY3Rvcl9zdGF0ZShvbGRfY29ubl9zdGF0ZSk7CiAJCXN0cnVjdCBhbWRncHVfY3J0 YyAqYWNydGMgPSB0b19hbWRncHVfY3J0Yyhjb25fbmV3X3N0YXRlLT5iYXNlLmNydGMpOwogCQlz dHJ1Y3QgZGNfc3RyZWFtX3N0YXR1cyAqc3RhdHVzID0gTlVMTDsKIAorCQlpZiAoYWNydGMpCisJ CQluZXdfY3J0Y19zdGF0ZSA9IGRybV9hdG9taWNfZ2V0X25ld19jcnRjX3N0YXRlKHN0YXRlLCAm YWNydGMtPmJhc2UpOworCiAJCS8qIFNraXAgYW55IG1vZGVzZXRzL3Jlc2V0cyAqLwotCQlpZiAo IWFjcnRjIHx8IGRybV9hdG9taWNfY3J0Y19uZWVkc19tb2Rlc2V0KGFjcnRjLT5iYXNlLnN0YXRl KSkKKwkJaWYgKCFhY3J0YyB8fCBkcm1fYXRvbWljX2NydGNfbmVlZHNfbW9kZXNldChuZXdfY3J0 Y19zdGF0ZSkpCiAJCQljb250aW51ZTsKIAogCQkvKiBTa2lwIGFueSB0aGluZyBub3Qgc2NhbGUg b3IgdW5kZXJzY2FuIGNoYW5nZXMgKi8KIAkJaWYgKCFpc19zY2FsaW5nX3N0YXRlX2RpZmZlcmVu dChjb25fbmV3X3N0YXRlLCBjb25fb2xkX3N0YXRlKSkKIAkJCWNvbnRpbnVlOwogCi0JCW5ld19h Y3J0Y19zdGF0ZSA9IHRvX2RtX2NydGNfc3RhdGUoYWNydGMtPmJhc2Uuc3RhdGUpOworCQluZXdf YWNydGNfc3RhdGUgPSB0b19kbV9jcnRjX3N0YXRlKG5ld19jcnRjX3N0YXRlKTsKIAogCQl1cGRh dGVfc3RyZWFtX3NjYWxpbmdfc2V0dGluZ3MoJmNvbl9uZXdfc3RhdGUtPmJhc2UuY3J0Yy0+bW9k ZSwKIAkJCQljb25fbmV3X3N0YXRlLCAoc3RydWN0IGRjX3N0cmVhbV9zdGF0ZSAqKW5ld19hY3J0 Y19zdGF0ZS0+c3RyZWFtKTsKQEAgLTQxODUsNyArNDE4OSw4IEBAIHZvaWQgYW1kZ3B1X2RtX2F0 b21pY19jb21taXRfdGFpbCgKIAkJICovCiAJCXN0cnVjdCBhbWRncHVfY3J0YyAqYWNydGMgPSBu ZXdfY3J0Y3NbaV07CiAKLQkJbmV3X2FjcnRjX3N0YXRlID0gdG9fZG1fY3J0Y19zdGF0ZShhY3J0 Yy0+YmFzZS5zdGF0ZSk7CisJCW5ld19jcnRjX3N0YXRlID0gZHJtX2F0b21pY19nZXRfbmV3X2Ny dGNfc3RhdGUoc3RhdGUsICZhY3J0Yy0+YmFzZSk7CisJCW5ld19hY3J0Y19zdGF0ZSA9IHRvX2Rt X2NydGNfc3RhdGUobmV3X2NydGNfc3RhdGUpOwogCiAJCWlmIChhZGV2LT5kbS5mcmVlc3luY19t b2R1bGUpCiAJCQltb2RfZnJlZXN5bmNfbm90aWZ5X21vZGVfY2hhbmdlKApAQCAtNDE5NSw4ICs0 MjAwLDggQEAgdm9pZCBhbWRncHVfZG1fYXRvbWljX2NvbW1pdF90YWlsKAogCX0KIAogCS8qIHVw ZGF0ZSBwbGFuZXMgd2hlbiBuZWVkZWQgcGVyIGNydGMqLwotCWZvcl9lYWNoX29sZF9jcnRjX2lu X3N0YXRlKHN0YXRlLCBwY3J0Yywgb2xkX2NydGNfc3RhdGUsIGopIHsKLQkJbmV3X2FjcnRjX3N0 YXRlID0gdG9fZG1fY3J0Y19zdGF0ZShwY3J0Yy0+c3RhdGUpOworCWZvcl9lYWNoX25ld19jcnRj X2luX3N0YXRlKHN0YXRlLCBwY3J0YywgbmV3X2NydGNfc3RhdGUsIGopIHsKKwkJbmV3X2FjcnRj X3N0YXRlID0gdG9fZG1fY3J0Y19zdGF0ZShuZXdfY3J0Y19zdGF0ZSk7CiAKIAkJaWYgKG5ld19h Y3J0Y19zdGF0ZS0+c3RyZWFtKQogCQkJYW1kZ3B1X2RtX2NvbW1pdF9wbGFuZXMoc3RhdGUsIGRl diwgZG0sIHBjcnRjLCAmd2FpdF9mb3JfdmJsYW5rKTsKQEAgLTQyMDgsMTMgKzQyMTMsMTIgQEAg dm9pZCBhbWRncHVfZG1fYXRvbWljX2NvbW1pdF90YWlsKAogCSAqIG1hcmsgY29uc3VtZWQgZXZl bnQgZm9yIGRybV9hdG9taWNfaGVscGVyX2NvbW1pdF9od19kb25lCiAJICovCiAJc3Bpbl9sb2Nr X2lycXNhdmUoJmFkZXYtPmRkZXYtPmV2ZW50X2xvY2ssIGZsYWdzKTsKLQlmb3JfZWFjaF9vbGRf Y3J0Y19pbl9zdGF0ZShzdGF0ZSwgY3J0Yywgb2xkX2NydGNfc3RhdGUsIGkpIHsKLQkJc3RydWN0 IGFtZGdwdV9jcnRjICphY3J0YyA9IHRvX2FtZGdwdV9jcnRjKGNydGMpOworCWZvcl9lYWNoX25l d19jcnRjX2luX3N0YXRlKHN0YXRlLCBjcnRjLCBuZXdfY3J0Y19zdGF0ZSwgaSkgewogCi0JCWlm IChhY3J0Yy0+YmFzZS5zdGF0ZS0+ZXZlbnQpCi0JCQlkcm1fc2VuZF9ldmVudF9sb2NrZWQoZGV2 LCAmY3J0Yy0+c3RhdGUtPmV2ZW50LT5iYXNlKTsKKwkJaWYgKG5ld19jcnRjX3N0YXRlLT5ldmVu dCkKKwkJCWRybV9zZW5kX2V2ZW50X2xvY2tlZChkZXYsICZuZXdfY3J0Y19zdGF0ZS0+ZXZlbnQt PmJhc2UpOwogCi0JCWFjcnRjLT5iYXNlLnN0YXRlLT5ldmVudCA9IE5VTEw7CisJCW5ld19jcnRj X3N0YXRlLT5ldmVudCA9IE5VTEw7CiAJfQogCXNwaW5fdW5sb2NrX2lycXJlc3RvcmUoJmFkZXYt PmRkZXYtPmV2ZW50X2xvY2ssIGZsYWdzKTsKIApAQCAtNDM3MSw3ICs0Mzc1LDcgQEAgc3RhdGlj IGludCBkbV91cGRhdGVfY3J0Y3Nfc3RhdGUoCiAJCWJvb2wgKmxvY2tfYW5kX3ZhbGlkYXRpb25f bmVlZGVkKQogewogCXN0cnVjdCBkcm1fY3J0YyAqY3J0YzsKLQlzdHJ1Y3QgZHJtX2NydGNfc3Rh dGUgKmNydGNfc3RhdGU7CisJc3RydWN0IGRybV9jcnRjX3N0YXRlICpvbGRfY3J0Y19zdGF0ZSwg KmNydGNfc3RhdGU7CiAJaW50IGk7CiAJc3RydWN0IGRtX2NydGNfc3RhdGUgKm9sZF9hY3J0Y19z dGF0ZSwgKm5ld19hY3J0Y19zdGF0ZTsKIAlzdHJ1Y3QgZG1fYXRvbWljX3N0YXRlICpkbV9zdGF0 ZSA9IHRvX2RtX2F0b21pY19zdGF0ZShzdGF0ZSk7CkBAIC00MzgwLDcgKzQzODQsNyBAQCBzdGF0 aWMgaW50IGRtX3VwZGF0ZV9jcnRjc19zdGF0ZSgKIAogCS8qVE9ETyBNb3ZlIHRoaXMgY29kZSBp bnRvIGRtX2NydGNfYXRvbWljX2NoZWNrIG9uY2Ugd2UgZ2V0IHJpZCBvZiBkY192YWxpZGF0aW9u X3NldCAqLwogCS8qIHVwZGF0ZSBjaGFuZ2VkIGl0ZW1zICovCi0JZm9yX2VhY2hfbmV3X2NydGNf aW5fc3RhdGUoc3RhdGUsIGNydGMsIGNydGNfc3RhdGUsIGkpIHsKKwlmb3JfZWFjaF9vbGRuZXdf Y3J0Y19pbl9zdGF0ZShzdGF0ZSwgY3J0Yywgb2xkX2NydGNfc3RhdGUsIGNydGNfc3RhdGUsIGkp IHsKIAkJc3RydWN0IGFtZGdwdV9jcnRjICphY3J0YyA9IE5VTEw7CiAJCXN0cnVjdCBhbWRncHVf ZG1fY29ubmVjdG9yICphY29ubmVjdG9yID0gTlVMTDsKIAkJc3RydWN0IGRybV9jb25uZWN0b3Jf c3RhdGUgKmNvbm5fc3RhdGUgPSBOVUxMOwpAQCAtNDM4OCw3ICs0MzkyLDcgQEAgc3RhdGljIGlu dCBkbV91cGRhdGVfY3J0Y3Nfc3RhdGUoCiAKIAkJbmV3X3N0cmVhbSA9IE5VTEw7CiAKLQkJb2xk X2FjcnRjX3N0YXRlID0gdG9fZG1fY3J0Y19zdGF0ZShjcnRjLT5zdGF0ZSk7CisJCW9sZF9hY3J0 Y19zdGF0ZSA9IHRvX2RtX2NydGNfc3RhdGUob2xkX2NydGNfc3RhdGUpOwogCQluZXdfYWNydGNf c3RhdGUgPSB0b19kbV9jcnRjX3N0YXRlKGNydGNfc3RhdGUpOwogCQlhY3J0YyA9IHRvX2FtZGdw dV9jcnRjKGNydGMpOwogCkBAIC00NTIxLDcgKzQ1MjUsNyBAQCBzdGF0aWMgaW50IGRtX3VwZGF0 ZV9wbGFuZXNfc3RhdGUoCiAJCWJvb2wgKmxvY2tfYW5kX3ZhbGlkYXRpb25fbmVlZGVkKQogewog CXN0cnVjdCBkcm1fY3J0YyAqbmV3X3BsYW5lX2NydGMsICpvbGRfcGxhbmVfY3J0YzsKLQlzdHJ1 Y3QgZHJtX2NydGNfc3RhdGUgKm5ld19jcnRjX3N0YXRlOworCXN0cnVjdCBkcm1fY3J0Y19zdGF0 ZSAqb2xkX2NydGNfc3RhdGUsICpuZXdfY3J0Y19zdGF0ZTsKIAlzdHJ1Y3QgZHJtX3BsYW5lICpw bGFuZTsKIAlzdHJ1Y3QgZHJtX3BsYW5lX3N0YXRlICpvbGRfcGxhbmVfc3RhdGUsICpuZXdfcGxh bmVfc3RhdGU7CiAJc3RydWN0IGRtX2NydGNfc3RhdGUgKm5ld19hY3J0Y19zdGF0ZSwgKm9sZF9h Y3J0Y19zdGF0ZTsKQEAgLTQ1NTIsMTAgKzQ1NTYsOSBAQCBzdGF0aWMgaW50IGRtX3VwZGF0ZV9w bGFuZXNfc3RhdGUoCiAJCQlpZiAoIW9sZF9wbGFuZV9jcnRjKQogCQkJCWNvbnRpbnVlOwogCi0J CQlvbGRfYWNydGNfc3RhdGUgPSB0b19kbV9jcnRjX3N0YXRlKAotCQkJCQlkcm1fYXRvbWljX2dl dF9vbGRfY3J0Y19zdGF0ZSgKLQkJCQkJCQlzdGF0ZSwKLQkJCQkJCQlvbGRfcGxhbmVfY3J0Yykp OworCQkJb2xkX2NydGNfc3RhdGUgPSBkcm1fYXRvbWljX2dldF9vbGRfY3J0Y19zdGF0ZSgKKwkJ CQkJc3RhdGUsIG9sZF9wbGFuZV9jcnRjKTsKKwkJCW9sZF9hY3J0Y19zdGF0ZSA9IHRvX2RtX2Ny dGNfc3RhdGUob2xkX2NydGNfc3RhdGUpOwogCiAJCQlpZiAoIW9sZF9hY3J0Y19zdGF0ZS0+c3Ry ZWFtKQogCQkJCWNvbnRpbnVlOwpAQCAtNDY0Myw3ICs0NjQ2LDcgQEAgaW50IGFtZGdwdV9kbV9h dG9taWNfY2hlY2soc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAlzdHJ1Y3QgZGMgKmRjID0gYWRl di0+ZG0uZGM7CiAJc3RydWN0IGRtX2F0b21pY19zdGF0ZSAqZG1fc3RhdGUgPSB0b19kbV9hdG9t aWNfc3RhdGUoc3RhdGUpOwogCXN0cnVjdCBkcm1fY29ubmVjdG9yICpjb25uZWN0b3I7Ci0Jc3Ry dWN0IGRybV9jb25uZWN0b3Jfc3RhdGUgKmNvbm5fc3RhdGU7CisJc3RydWN0IGRybV9jb25uZWN0 b3Jfc3RhdGUgKm9sZF9jb25fc3RhdGUsICpjb25uX3N0YXRlOwogCXN0cnVjdCBkcm1fY3J0YyAq Y3J0YzsKIAlzdHJ1Y3QgZHJtX2NydGNfc3RhdGUgKmNydGNfc3RhdGU7CiAKQEAgLTQ3MTAsMTYg KzQ3MTMsMTQgQEAgaW50IGFtZGdwdV9kbV9hdG9taWNfY2hlY2soc3RydWN0IGRybV9kZXZpY2Ug KmRldiwKIAkgKiBuZXcgc3RyZWFtIGludG8gY29udGV4dCB3XG8gY2F1c2luZyBmdWxsIHJlc2V0 LiBOZWVkIHRvCiAJICogZGVjaWRlIGhvdyB0byBoYW5kbGUuCiAJICovCi0JZm9yX2VhY2hfbmV3 X2Nvbm5lY3Rvcl9pbl9zdGF0ZShzdGF0ZSwgY29ubmVjdG9yLCBjb25uX3N0YXRlLCBpKSB7Ci0J CXN0cnVjdCBhbWRncHVfZG1fY29ubmVjdG9yICphY29ubmVjdG9yID0gdG9fYW1kZ3B1X2RtX2Nv bm5lY3Rvcihjb25uZWN0b3IpOwotCQlzdHJ1Y3QgZG1fY29ubmVjdG9yX3N0YXRlICpjb25fb2xk X3N0YXRlID0KLQkJCQl0b19kbV9jb25uZWN0b3Jfc3RhdGUoYWNvbm5lY3Rvci0+YmFzZS5zdGF0 ZSk7Ci0JCXN0cnVjdCBkbV9jb25uZWN0b3Jfc3RhdGUgKmNvbl9uZXdfc3RhdGUgPQotCQkJCQkJ dG9fZG1fY29ubmVjdG9yX3N0YXRlKGNvbm5fc3RhdGUpOworCWZvcl9lYWNoX29sZG5ld19jb25u ZWN0b3JfaW5fc3RhdGUoc3RhdGUsIGNvbm5lY3Rvciwgb2xkX2Nvbl9zdGF0ZSwgY29ubl9zdGF0 ZSwgaSkgeworCQlzdHJ1Y3QgZG1fY29ubmVjdG9yX3N0YXRlICpjb25fb2xkX3N0YXRlID0gdG9f ZG1fY29ubmVjdG9yX3N0YXRlKG9sZF9jb25fc3RhdGUpOworCQlzdHJ1Y3QgZG1fY29ubmVjdG9y X3N0YXRlICpjb25fbmV3X3N0YXRlID0gdG9fZG1fY29ubmVjdG9yX3N0YXRlKGNvbm5fc3RhdGUp OwogCQlzdHJ1Y3QgYW1kZ3B1X2NydGMgKmFjcnRjID0gdG9fYW1kZ3B1X2NydGMoY29uX25ld19z dGF0ZS0+YmFzZS5jcnRjKTsKIAogCQkvKiBTa2lwIGFueSBtb2Rlc2V0cy9yZXNldHMgKi8KLQkJ aWYgKCFhY3J0YyB8fCBkcm1fYXRvbWljX2NydGNfbmVlZHNfbW9kZXNldChhY3J0Yy0+YmFzZS5z dGF0ZSkpCisJCWlmICghYWNydGMgfHwgZHJtX2F0b21pY19jcnRjX25lZWRzX21vZGVzZXQoCisJ CQkJZHJtX2F0b21pY19nZXRfbmV3X2NydGNfc3RhdGUoc3RhdGUsICZhY3J0Yy0+YmFzZSkpKQog CQkJY29udGludWU7CiAKIAkJLyogU2tpcCBhbnkgdGhpbmcgbm90IHNjYWxlIG9yIHVuZGVyc2Nh biBjaGFuZ2VzICovCi0tIAoyLjcuNAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX18KYW1kLWdmeCBtYWlsaW5nIGxpc3QKYW1kLWdmeEBsaXN0cy5mcmVlZGVz a3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9h bWQtZ2Z4Cg==