From mboxrd@z Thu Jan 1 00:00:00 1970 From: Kieran Bingham Subject: [PATCH v2 1/6] drm: rcar-du: Link CRTCs to the DU device Date: Fri, 15 Mar 2019 17:01:05 +0000 Message-ID: <20190315170110.23280-2-kieran.bingham+renesas@ideasonboard.com> References: <20190315170110.23280-1-kieran.bingham+renesas@ideasonboard.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by gabe.freedesktop.org (Postfix) with ESMTPS id AC79F6E183 for ; Fri, 15 Mar 2019 17:01:17 +0000 (UTC) In-Reply-To: <20190315170110.23280-1-kieran.bingham+renesas@ideasonboard.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: linux-renesas-soc@vger.kernel.org, dri-devel@lists.freedesktop.org, Laurent Pinchart Cc: David Airlie , Kieran Bingham , open list List-Id: dri-devel@lists.freedesktop.org VGhlIHJjYXJfZHVfY3J0YyBmdW5jdGlvbnMgaGF2ZSBhIGhlYXZ5IHJlbGlhbmNlIG9uIHRoZSBy Y2FyX2R1X2dyb3VwCnN0cnVjdHVyZSwgaW4gbWFueSBjYXNlcyBqdXN0IHRvIGFjY2VzcyB0aGUg RFUgZGV2aWNlIGNvbnRleHQuCgpUbyBiZXR0ZXIgc2VwYXJhdGUgdGhlIGdyb3VwcyBvdXQgb2Yg dGhlIENSVEMgaGFuZGxpbmcgY29kZSwgZ2l2ZSB0aGUKcmNhcl9kdV9jcnRjIGl0cyBvd24gcG9p bnRlciB0byB0aGUgZGV2aWNlIGFuZCByZW1vdmUgdGhlIGluZGlyZWN0aW9uCnRocm91Z2ggdGhl IGdyb3VwIHBvaW50ZXJzLgoKU2lnbmVkLW9mZi1ieTogS2llcmFuIEJpbmdoYW0gPGtpZXJhbi5i aW5naGFtK3JlbmVzYXNAaWRlYXNvbmJvYXJkLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vcmNh ci1kdS9yY2FyX2R1X2NydGMuYyB8IDQ4ICsrKysrKysrKysrKystLS0tLS0tLS0tLS0tCiBkcml2 ZXJzL2dwdS9kcm0vcmNhci1kdS9yY2FyX2R1X2NydGMuaCB8ICAyICsrCiBkcml2ZXJzL2dwdS9k cm0vcmNhci1kdS9yY2FyX2R1X3ZzcC5jICB8ICAyICstCiAzIGZpbGVzIGNoYW5nZWQsIDI3IGlu c2VydGlvbnMoKyksIDI1IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS9yY2FyLWR1L3JjYXJfZHVfY3J0Yy5jIGIvZHJpdmVycy9ncHUvZHJtL3JjYXItZHUvcmNhcl9k dV9jcnRjLmMKaW5kZXggNTdmZDVjMDA0OTRiLi40NzFjZTQ2NDY1NGEgMTAwNjQ0Ci0tLSBhL2Ry aXZlcnMvZ3B1L2RybS9yY2FyLWR1L3JjYXJfZHVfY3J0Yy5jCisrKyBiL2RyaXZlcnMvZ3B1L2Ry bS9yY2FyLWR1L3JjYXJfZHVfY3J0Yy5jCkBAIC0zMiwyMSArMzIsMjEgQEAKIAogc3RhdGljIHUz MiByY2FyX2R1X2NydGNfcmVhZChzdHJ1Y3QgcmNhcl9kdV9jcnRjICpyY3J0YywgdTMyIHJlZykK IHsKLQlzdHJ1Y3QgcmNhcl9kdV9kZXZpY2UgKnJjZHUgPSByY3J0Yy0+Z3JvdXAtPmRldjsKKwlz dHJ1Y3QgcmNhcl9kdV9kZXZpY2UgKnJjZHUgPSByY3J0Yy0+ZGV2OwogCiAJcmV0dXJuIHJjYXJf ZHVfcmVhZChyY2R1LCByY3J0Yy0+bW1pb19vZmZzZXQgKyByZWcpOwogfQogCiBzdGF0aWMgdm9p ZCByY2FyX2R1X2NydGNfd3JpdGUoc3RydWN0IHJjYXJfZHVfY3J0YyAqcmNydGMsIHUzMiByZWcs IHUzMiBkYXRhKQogewotCXN0cnVjdCByY2FyX2R1X2RldmljZSAqcmNkdSA9IHJjcnRjLT5ncm91 cC0+ZGV2OworCXN0cnVjdCByY2FyX2R1X2RldmljZSAqcmNkdSA9IHJjcnRjLT5kZXY7CiAKIAly Y2FyX2R1X3dyaXRlKHJjZHUsIHJjcnRjLT5tbWlvX29mZnNldCArIHJlZywgZGF0YSk7CiB9CiAK IHN0YXRpYyB2b2lkIHJjYXJfZHVfY3J0Y19jbHIoc3RydWN0IHJjYXJfZHVfY3J0YyAqcmNydGMs IHUzMiByZWcsIHUzMiBjbHIpCiB7Ci0Jc3RydWN0IHJjYXJfZHVfZGV2aWNlICpyY2R1ID0gcmNy dGMtPmdyb3VwLT5kZXY7CisJc3RydWN0IHJjYXJfZHVfZGV2aWNlICpyY2R1ID0gcmNydGMtPmRl djsKIAogCXJjYXJfZHVfd3JpdGUocmNkdSwgcmNydGMtPm1taW9fb2Zmc2V0ICsgcmVnLAogCQkg ICAgICByY2FyX2R1X3JlYWQocmNkdSwgcmNydGMtPm1taW9fb2Zmc2V0ICsgcmVnKSAmIH5jbHIp OwpAQCAtNTQsNyArNTQsNyBAQCBzdGF0aWMgdm9pZCByY2FyX2R1X2NydGNfY2xyKHN0cnVjdCBy Y2FyX2R1X2NydGMgKnJjcnRjLCB1MzIgcmVnLCB1MzIgY2xyKQogCiBzdGF0aWMgdm9pZCByY2Fy X2R1X2NydGNfc2V0KHN0cnVjdCByY2FyX2R1X2NydGMgKnJjcnRjLCB1MzIgcmVnLCB1MzIgc2V0 KQogewotCXN0cnVjdCByY2FyX2R1X2RldmljZSAqcmNkdSA9IHJjcnRjLT5ncm91cC0+ZGV2Owor CXN0cnVjdCByY2FyX2R1X2RldmljZSAqcmNkdSA9IHJjcnRjLT5kZXY7CiAKIAlyY2FyX2R1X3dy aXRlKHJjZHUsIHJjcnRjLT5tbWlvX29mZnNldCArIHJlZywKIAkJICAgICAgcmNhcl9kdV9yZWFk KHJjZHUsIHJjcnRjLT5tbWlvX29mZnNldCArIHJlZykgfCBzZXQpOwpAQCAtNjIsNyArNjIsNyBA QCBzdGF0aWMgdm9pZCByY2FyX2R1X2NydGNfc2V0KHN0cnVjdCByY2FyX2R1X2NydGMgKnJjcnRj LCB1MzIgcmVnLCB1MzIgc2V0KQogCiB2b2lkIHJjYXJfZHVfY3J0Y19kc3lzcl9jbHJfc2V0KHN0 cnVjdCByY2FyX2R1X2NydGMgKnJjcnRjLCB1MzIgY2xyLCB1MzIgc2V0KQogewotCXN0cnVjdCBy Y2FyX2R1X2RldmljZSAqcmNkdSA9IHJjcnRjLT5ncm91cC0+ZGV2OworCXN0cnVjdCByY2FyX2R1 X2RldmljZSAqcmNkdSA9IHJjcnRjLT5kZXY7CiAKIAlyY3J0Yy0+ZHN5c3IgPSAocmNydGMtPmRz eXNyICYgfmNscikgfCBzZXQ7CiAJcmNhcl9kdV93cml0ZShyY2R1LCByY3J0Yy0+bW1pb19vZmZz ZXQgKyBEU1lTUiwgcmNydGMtPmRzeXNyKTsKQEAgLTE1NywxMCArMTU3LDkgQEAgc3RhdGljIHZv aWQgcmNhcl9kdV9kcGxsX2RpdmlkZXIoc3RydWN0IHJjYXJfZHVfY3J0YyAqcmNydGMsCiAJfQog CiBkb25lOgotCWRldl9kYmcocmNydGMtPmdyb3VwLT5kZXYtPmRldiwKKwlkZXZfZGJnKHJjcnRj LT5kZXYtPmRldiwKIAkJIm91dHB1dDoldSwgZmRwbGw6JXUsIG46JXUsIG06JXUsIGRpZmY6JWx1 XG4iLAotCQkgZHBsbC0+b3V0cHV0LCBkcGxsLT5mZHBsbCwgZHBsbC0+biwgZHBsbC0+bSwKLQkJ IGJlc3RfZGlmZik7CisJCSBkcGxsLT5vdXRwdXQsIGRwbGwtPmZkcGxsLCBkcGxsLT5uLCBkcGxs LT5tLCBiZXN0X2RpZmYpOwogfQogCiBzdHJ1Y3QgZHVfY2xrX3BhcmFtcyB7CkBAIC0yMTIsNyAr MjExLDcgQEAgc3RhdGljIGNvbnN0IHN0cnVjdCBzb2NfZGV2aWNlX2F0dHJpYnV0ZSByY2FyX2R1 X3I4YTc3OTVfZXMxW10gPSB7CiBzdGF0aWMgdm9pZCByY2FyX2R1X2NydGNfc2V0X2Rpc3BsYXlf dGltaW5nKHN0cnVjdCByY2FyX2R1X2NydGMgKnJjcnRjKQogewogCWNvbnN0IHN0cnVjdCBkcm1f ZGlzcGxheV9tb2RlICptb2RlID0gJnJjcnRjLT5jcnRjLnN0YXRlLT5hZGp1c3RlZF9tb2RlOwot CXN0cnVjdCByY2FyX2R1X2RldmljZSAqcmNkdSA9IHJjcnRjLT5ncm91cC0+ZGV2OworCXN0cnVj dCByY2FyX2R1X2RldmljZSAqcmNkdSA9IHJjcnRjLT5kZXY7CiAJdW5zaWduZWQgbG9uZyBtb2Rl X2Nsb2NrID0gbW9kZS0+Y2xvY2sgKiAxMDAwOwogCXUzMiBkc21yOwogCXUzMiBlc2NyOwpAQCAt Mjc3LDcgKzI3Niw3IEBAIHN0YXRpYyB2b2lkIHJjYXJfZHVfY3J0Y19zZXRfZGlzcGxheV90aW1p bmcoc3RydWN0IHJjYXJfZHVfY3J0YyAqcmNydGMpCiAJCQlyY2FyX2R1X2VzY3JfZGl2aWRlcihy Y3J0Yy0+ZXh0Y2xvY2ssIG1vZGVfY2xvY2ssCiAJCQkJCSAgICAgRVNDUl9EQ0xLU0VMX0RDTEtJ TiwgJnBhcmFtcyk7CiAKLQkJZGV2X2RiZyhyY3J0Yy0+Z3JvdXAtPmRldi0+ZGV2LAkibW9kZSBj bG9jayAlbHUgJXMgcmF0ZSAlbHVcbiIsCisJCWRldl9kYmcocmNydGMtPmRldi0+ZGV2LCAibW9k ZSBjbG9jayAlbHUgJXMgcmF0ZSAlbHVcbiIsCiAJCQltb2RlX2Nsb2NrLCBwYXJhbXMuY2xrID09 IHJjcnRjLT5jbG9jayA/ICJjcGciIDogImV4dCIsCiAJCQlwYXJhbXMucmF0ZSk7CiAKQEAgLTI4 NSw3ICsyODQsNyBAQCBzdGF0aWMgdm9pZCByY2FyX2R1X2NydGNfc2V0X2Rpc3BsYXlfdGltaW5n KHN0cnVjdCByY2FyX2R1X2NydGMgKnJjcnRjKQogCQllc2NyID0gcGFyYW1zLmVzY3I7CiAJfQog Ci0JZGV2X2RiZyhyY3J0Yy0+Z3JvdXAtPmRldi0+ZGV2LCAiJXM6IEVTQ1IgMHglMDh4XG4iLCBf X2Z1bmNfXywgZXNjcik7CisJZGV2X2RiZyhyY3J0Yy0+ZGV2LT5kZXYsICIlczogRVNDUiAweCUw OHhcbiIsIF9fZnVuY19fLCBlc2NyKTsKIAogCXJjYXJfZHVfY3J0Y193cml0ZShyY3J0YywgcmNy dGMtPmluZGV4ICUgMiA/IEVTQ1IxMyA6IEVTQ1IwMiwgZXNjcik7CiAJcmNhcl9kdV9jcnRjX3dy aXRlKHJjcnRjLCByY3J0Yy0+aW5kZXggJSAyID8gT1RBUjEzIDogT1RBUjAyLCAwKTsKQEAgLTMz Myw3ICszMzIsNyBAQCBwbGFuZV9mb3JtYXQoc3RydWN0IHJjYXJfZHVfcGxhbmUgKnBsYW5lKQog c3RhdGljIHZvaWQgcmNhcl9kdV9jcnRjX3VwZGF0ZV9wbGFuZXMoc3RydWN0IHJjYXJfZHVfY3J0 YyAqcmNydGMpCiB7CiAJc3RydWN0IHJjYXJfZHVfcGxhbmUgKnBsYW5lc1tSQ0FSX0RVX05VTV9I V19QTEFORVNdOwotCXN0cnVjdCByY2FyX2R1X2RldmljZSAqcmNkdSA9IHJjcnRjLT5ncm91cC0+ ZGV2OworCXN0cnVjdCByY2FyX2R1X2RldmljZSAqcmNkdSA9IHJjcnRjLT5kZXY7CiAJdW5zaWdu ZWQgaW50IG51bV9wbGFuZXMgPSAwOwogCXVuc2lnbmVkIGludCBkcHRzcl9wbGFuZXM7CiAJdW5z aWduZWQgaW50IGh3cGxhbmVzID0gMDsKQEAgLTQ2Myw3ICs0NjIsNyBAQCBzdGF0aWMgYm9vbCBy Y2FyX2R1X2NydGNfcGFnZV9mbGlwX3BlbmRpbmcoc3RydWN0IHJjYXJfZHVfY3J0YyAqcmNydGMp CiAKIHN0YXRpYyB2b2lkIHJjYXJfZHVfY3J0Y193YWl0X3BhZ2VfZmxpcChzdHJ1Y3QgcmNhcl9k dV9jcnRjICpyY3J0YykKIHsKLQlzdHJ1Y3QgcmNhcl9kdV9kZXZpY2UgKnJjZHUgPSByY3J0Yy0+ Z3JvdXAtPmRldjsKKwlzdHJ1Y3QgcmNhcl9kdV9kZXZpY2UgKnJjZHUgPSByY3J0Yy0+ZGV2Owog CiAJaWYgKHdhaXRfZXZlbnRfdGltZW91dChyY3J0Yy0+ZmxpcF93YWl0LAogCQkJICAgICAgICFy Y2FyX2R1X2NydGNfcGFnZV9mbGlwX3BlbmRpbmcocmNydGMpLApAQCAtNDkzLDcgKzQ5Miw3IEBA IHN0YXRpYyB2b2lkIHJjYXJfZHVfY3J0Y19zZXR1cChzdHJ1Y3QgcmNhcl9kdV9jcnRjICpyY3J0 YykKIAlyY2FyX2R1X2dyb3VwX3dyaXRlKHJjcnRjLT5ncm91cCwgcmNydGMtPmluZGV4ICUgMiA/ IERTMlBSIDogRFMxUFIsIDApOwogCiAJLyogRW5hYmxlIHRoZSBWU1AgY29tcG9zaXRvci4gKi8K LQlpZiAocmNhcl9kdV9oYXMocmNydGMtPmdyb3VwLT5kZXYsIFJDQVJfRFVfRkVBVFVSRV9WU1Ax X1NPVVJDRSkpCisJaWYgKHJjYXJfZHVfaGFzKHJjcnRjLT5kZXYsIFJDQVJfRFVfRkVBVFVSRV9W U1AxX1NPVVJDRSkpCiAJCXJjYXJfZHVfdnNwX2VuYWJsZShyY3J0Yyk7CiAKIAkvKiBUdXJuIHZl cnRpY2FsIGJsYW5raW5nIGludGVycnVwdCByZXBvcnRpbmcgb24uICovCkBAIC01NjQsNyArNTYz LDcgQEAgc3RhdGljIHZvaWQgcmNhcl9kdV9jcnRjX3N0YXJ0KHN0cnVjdCByY2FyX2R1X2NydGMg KnJjcnRjKQogCiBzdGF0aWMgdm9pZCByY2FyX2R1X2NydGNfZGlzYWJsZV9wbGFuZXMoc3RydWN0 IHJjYXJfZHVfY3J0YyAqcmNydGMpCiB7Ci0Jc3RydWN0IHJjYXJfZHVfZGV2aWNlICpyY2R1ID0g cmNydGMtPmdyb3VwLT5kZXY7CisJc3RydWN0IHJjYXJfZHVfZGV2aWNlICpyY2R1ID0gcmNydGMt PmRldjsKIAlzdHJ1Y3QgZHJtX2NydGMgKmNydGMgPSAmcmNydGMtPmNydGM7CiAJdTMyIHN0YXR1 czsKIApAQCAtNjE3LDcgKzYxNiw3IEBAIHN0YXRpYyB2b2lkIHJjYXJfZHVfY3J0Y19zdG9wKHN0 cnVjdCByY2FyX2R1X2NydGMgKnJjcnRjKQogCWRybV9jcnRjX3ZibGFua19vZmYoY3J0Yyk7CiAK IAkvKiBEaXNhYmxlIHRoZSBWU1AgY29tcG9zaXRvci4gKi8KLQlpZiAocmNhcl9kdV9oYXMocmNy dGMtPmdyb3VwLT5kZXYsIFJDQVJfRFVfRkVBVFVSRV9WU1AxX1NPVVJDRSkpCisJaWYgKHJjYXJf ZHVfaGFzKHJjcnRjLT5kZXYsIFJDQVJfRFVfRkVBVFVSRV9WU1AxX1NPVVJDRSkpCiAJCXJjYXJf ZHVfdnNwX2Rpc2FibGUocmNydGMpOwogCiAJLyoKQEAgLTYyNyw3ICs2MjYsNyBAQCBzdGF0aWMg dm9pZCByY2FyX2R1X2NydGNfc3RvcChzdHJ1Y3QgcmNhcl9kdV9jcnRjICpyY3J0YykKIAkgKiBU T0RPOiBGaW5kIGFub3RoZXIgd2F5IHRvIHN0b3AgdGhlIGRpc3BsYXkgZm9yIERVcyB0aGF0IGRv bid0IHN1cHBvcnQKIAkgKiBUVk0gc3luYy4KIAkgKi8KLQlpZiAocmNhcl9kdV9oYXMocmNydGMt Pmdyb3VwLT5kZXYsIFJDQVJfRFVfRkVBVFVSRV9UVk1fU1lOQykpCisJaWYgKHJjYXJfZHVfaGFz KHJjcnRjLT5kZXYsIFJDQVJfRFVfRkVBVFVSRV9UVk1fU1lOQykpCiAJCXJjYXJfZHVfY3J0Y19k c3lzcl9jbHJfc2V0KHJjcnRjLCBEU1lTUl9UVk1fTUFTSywKIAkJCQkJICAgRFNZU1JfVFZNX1NX SVRDSCk7CiAKQEAgLTY2MSw3ICs2NjAsNyBAQCBzdGF0aWMgdm9pZCByY2FyX2R1X2NydGNfYXRv bWljX2VuYWJsZShzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiB7CiAJc3RydWN0IHJjYXJfZHVfY3J0 YyAqcmNydGMgPSB0b19yY2FyX2NydGMoY3J0Yyk7CiAJc3RydWN0IHJjYXJfZHVfY3J0Y19zdGF0 ZSAqcnN0YXRlID0gdG9fcmNhcl9jcnRjX3N0YXRlKGNydGMtPnN0YXRlKTsKLQlzdHJ1Y3QgcmNh cl9kdV9kZXZpY2UgKnJjZHUgPSByY3J0Yy0+Z3JvdXAtPmRldjsKKwlzdHJ1Y3QgcmNhcl9kdV9k ZXZpY2UgKnJjZHUgPSByY3J0Yy0+ZGV2OwogCiAJcmNhcl9kdV9jcnRjX2dldChyY3J0Yyk7CiAK QEAgLTY4OSw3ICs2ODgsNyBAQCBzdGF0aWMgdm9pZCByY2FyX2R1X2NydGNfYXRvbWljX2Rpc2Fi bGUoc3RydWN0IGRybV9jcnRjICpjcnRjLAogewogCXN0cnVjdCByY2FyX2R1X2NydGMgKnJjcnRj ID0gdG9fcmNhcl9jcnRjKGNydGMpOwogCXN0cnVjdCByY2FyX2R1X2NydGNfc3RhdGUgKnJzdGF0 ZSA9IHRvX3JjYXJfY3J0Y19zdGF0ZShvbGRfc3RhdGUpOwotCXN0cnVjdCByY2FyX2R1X2Rldmlj ZSAqcmNkdSA9IHJjcnRjLT5ncm91cC0+ZGV2OworCXN0cnVjdCByY2FyX2R1X2RldmljZSAqcmNk dSA9IHJjcnRjLT5kZXY7CiAKIAlyY2FyX2R1X2NydGNfc3RvcChyY3J0Yyk7CiAJcmNhcl9kdV9j cnRjX3B1dChyY3J0Yyk7CkBAIC03MzUsNyArNzM0LDcgQEAgc3RhdGljIHZvaWQgcmNhcl9kdV9j cnRjX2F0b21pY19iZWdpbihzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAJICovCiAJcmNhcl9kdV9j cnRjX2dldChyY3J0Yyk7CiAKLQlpZiAocmNhcl9kdV9oYXMocmNydGMtPmdyb3VwLT5kZXYsIFJD QVJfRFVfRkVBVFVSRV9WU1AxX1NPVVJDRSkpCisJaWYgKHJjYXJfZHVfaGFzKHJjcnRjLT5kZXYs IFJDQVJfRFVfRkVBVFVSRV9WU1AxX1NPVVJDRSkpCiAJCXJjYXJfZHVfdnNwX2F0b21pY19iZWdp bihyY3J0Yyk7CiB9CiAKQEAgLTc1Nyw3ICs3NTYsNyBAQCBzdGF0aWMgdm9pZCByY2FyX2R1X2Ny dGNfYXRvbWljX2ZsdXNoKHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKIAkJc3Bpbl91bmxvY2tfaXJx cmVzdG9yZSgmZGV2LT5ldmVudF9sb2NrLCBmbGFncyk7CiAJfQogCi0JaWYgKHJjYXJfZHVfaGFz KHJjcnRjLT5ncm91cC0+ZGV2LCBSQ0FSX0RVX0ZFQVRVUkVfVlNQMV9TT1VSQ0UpKQorCWlmIChy Y2FyX2R1X2hhcyhyY3J0Yy0+ZGV2LCBSQ0FSX0RVX0ZFQVRVUkVfVlNQMV9TT1VSQ0UpKQogCQly Y2FyX2R1X3ZzcF9hdG9taWNfZmx1c2gocmNydGMpOwogfQogCkBAIC03NjYsNyArNzY1LDcgQEAg cmNhcl9kdV9jcnRjX21vZGVfdmFsaWQoc3RydWN0IGRybV9jcnRjICpjcnRjLAogCQkJY29uc3Qg c3RydWN0IGRybV9kaXNwbGF5X21vZGUgKm1vZGUpCiB7CiAJc3RydWN0IHJjYXJfZHVfY3J0YyAq cmNydGMgPSB0b19yY2FyX2NydGMoY3J0Yyk7Ci0Jc3RydWN0IHJjYXJfZHVfZGV2aWNlICpyY2R1 ID0gcmNydGMtPmdyb3VwLT5kZXY7CisJc3RydWN0IHJjYXJfZHVfZGV2aWNlICpyY2R1ID0gcmNy dGMtPmRldjsKIAlib29sIGludGVybGFjZWQgPSBtb2RlLT5mbGFncyAmIERSTV9NT0RFX0ZMQUdf SU5URVJMQUNFOwogCXVuc2lnbmVkIGludCB2YnA7CiAKQEAgLTc5OCw3ICs3OTcsNyBAQCBzdGF0 aWMgY29uc3Qgc3RydWN0IGRybV9jcnRjX2hlbHBlcl9mdW5jcyBjcnRjX2hlbHBlcl9mdW5jcyA9 IHsKIAogc3RhdGljIHZvaWQgcmNhcl9kdV9jcnRjX2NyY19pbml0KHN0cnVjdCByY2FyX2R1X2Ny dGMgKnJjcnRjKQogewotCXN0cnVjdCByY2FyX2R1X2RldmljZSAqcmNkdSA9IHJjcnRjLT5ncm91 cC0+ZGV2OworCXN0cnVjdCByY2FyX2R1X2RldmljZSAqcmNkdSA9IHJjcnRjLT5kZXY7CiAJY29u c3QgY2hhciAqKnNvdXJjZXM7CiAJdW5zaWduZWQgaW50IGNvdW50OwogCWludCBpID0gLTE7CkBA IC0xMDgwLDcgKzEwNzksNyBAQCBzdGF0aWMgY29uc3Qgc3RydWN0IGRybV9jcnRjX2Z1bmNzIGNy dGNfZnVuY3NfZ2VuMyA9IHsKIHN0YXRpYyBpcnFyZXR1cm5fdCByY2FyX2R1X2NydGNfaXJxKGlu dCBpcnEsIHZvaWQgKmFyZykKIHsKIAlzdHJ1Y3QgcmNhcl9kdV9jcnRjICpyY3J0YyA9IGFyZzsK LQlzdHJ1Y3QgcmNhcl9kdV9kZXZpY2UgKnJjZHUgPSByY3J0Yy0+Z3JvdXAtPmRldjsKKwlzdHJ1 Y3QgcmNhcl9kdV9kZXZpY2UgKnJjZHUgPSByY3J0Yy0+ZGV2OwogCWlycXJldHVybl90IHJldCA9 IElSUV9OT05FOwogCXUzMiBzdGF0dXM7CiAKQEAgLTExNzIsNiArMTE3MSw3IEBAIGludCByY2Fy X2R1X2NydGNfY3JlYXRlKHN0cnVjdCByY2FyX2R1X2dyb3VwICpyZ3JwLCB1bnNpZ25lZCBpbnQg c3dpbmRleCwKIAlpbml0X3dhaXRxdWV1ZV9oZWFkKCZyY3J0Yy0+dmJsYW5rX3dhaXQpOwogCXNw aW5fbG9ja19pbml0KCZyY3J0Yy0+dmJsYW5rX2xvY2spOwogCisJcmNydGMtPmRldiA9IHJjZHU7 CiAJcmNydGMtPmdyb3VwID0gcmdycDsKIAlyY3J0Yy0+bW1pb19vZmZzZXQgPSBtbWlvX29mZnNl dHNbaHdpbmRleF07CiAJcmNydGMtPmluZGV4ID0gaHdpbmRleDsKZGlmZiAtLWdpdCBhL2RyaXZl cnMvZ3B1L2RybS9yY2FyLWR1L3JjYXJfZHVfY3J0Yy5oIGIvZHJpdmVycy9ncHUvZHJtL3JjYXIt ZHUvcmNhcl9kdV9jcnRjLmgKaW5kZXggM2YzMzlhN2U4ZDE0Li4xMTgxNGVhZmVmNzcgMTAwNjQ0 Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9yY2FyLWR1L3JjYXJfZHVfY3J0Yy5oCisrKyBiL2RyaXZl cnMvZ3B1L2RybS9yY2FyLWR1L3JjYXJfZHVfY3J0Yy5oCkBAIC0yNCw2ICsyNCw3IEBAIHN0cnVj dCByY2FyX2R1X3ZzcDsKIC8qKgogICogc3RydWN0IHJjYXJfZHVfY3J0YyAtIHRoZSBDUlRDLCBy ZXByZXNlbnRpbmcgYSBEVSBzdXBlcnBvc2l0aW9uIHByb2Nlc3NvcgogICogQGNydGM6IGJhc2Ug RFJNIENSVEMKKyAqIEBkZXY6IHRoZSBEVSBkZXZpY2UKICAqIEBjbG9jazogdGhlIENSVEMgZnVu Y3Rpb25hbCBjbG9jawogICogQGV4dGNsb2NrOiBleHRlcm5hbCBwaXhlbCBkb3QgY2xvY2sgKG9w dGlvbmFsKQogICogQG1taW9fb2Zmc2V0OiBvZmZzZXQgb2YgdGhlIENSVEMgcmVnaXN0ZXJzIGlu IHRoZSBEVSBNTUlPIGJsb2NrCkBAIC00Myw2ICs0NCw3IEBAIHN0cnVjdCByY2FyX2R1X3ZzcDsK IHN0cnVjdCByY2FyX2R1X2NydGMgewogCXN0cnVjdCBkcm1fY3J0YyBjcnRjOwogCisJc3RydWN0 IHJjYXJfZHVfZGV2aWNlICpkZXY7CiAJc3RydWN0IGNsayAqY2xvY2s7CiAJc3RydWN0IGNsayAq ZXh0Y2xvY2s7CiAJdW5zaWduZWQgaW50IG1taW9fb2Zmc2V0OwpkaWZmIC0tZ2l0IGEvZHJpdmVy cy9ncHUvZHJtL3JjYXItZHUvcmNhcl9kdV92c3AuYyBiL2RyaXZlcnMvZ3B1L2RybS9yY2FyLWR1 L3JjYXJfZHVfdnNwLmMKaW5kZXggMDg3OGFjY2JkMTM0Li5mNmRlZWE5MGRjY2UgMTAwNjQ0Ci0t LSBhL2RyaXZlcnMvZ3B1L2RybS9yY2FyLWR1L3JjYXJfZHVfdnNwLmMKKysrIGIvZHJpdmVycy9n cHUvZHJtL3JjYXItZHUvcmNhcl9kdV92c3AuYwpAQCAtNDMsNyArNDMsNyBAQCBzdGF0aWMgdm9p ZCByY2FyX2R1X3ZzcF9jb21wbGV0ZSh2b2lkICpwcml2YXRlLCBib29sIGNvbXBsZXRlZCwgdTMy IGNyYykKIHZvaWQgcmNhcl9kdV92c3BfZW5hYmxlKHN0cnVjdCByY2FyX2R1X2NydGMgKmNydGMp CiB7CiAJY29uc3Qgc3RydWN0IGRybV9kaXNwbGF5X21vZGUgKm1vZGUgPSAmY3J0Yy0+Y3J0Yy5z dGF0ZS0+YWRqdXN0ZWRfbW9kZTsKLQlzdHJ1Y3QgcmNhcl9kdV9kZXZpY2UgKnJjZHUgPSBjcnRj LT5ncm91cC0+ZGV2OworCXN0cnVjdCByY2FyX2R1X2RldmljZSAqcmNkdSA9IGNydGMtPmRldjsK IAlzdHJ1Y3QgdnNwMV9kdV9saWZfY29uZmlnIGNmZyA9IHsKIAkJLndpZHRoID0gbW9kZS0+aGRp c3BsYXksCiAJCS5oZWlnaHQgPSBtb2RlLT52ZGlzcGxheSwKLS0gCjIuMTkuMQoKX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcg bGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRl c2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVs