From: Ander Conselvan de Oliveira Subject: [PATCH v3 1/7] drm/i915: Pass intel_crtc to fdi_link_train() hooks Date: Thu, 2 Mar 2017 14:58:51 +0200 Message-ID: <20170302125857.14665-2-ander.conselvan.de.oliveira@intel.com> References: <20170302125857.14665-1-ander.conselvan.de.oliveira@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTPS id D87616EB1C for ; Thu, 2 Mar 2017 12:59:06 +0000 (UTC) In-Reply-To: <20170302125857.14665-1-ander.conselvan.de.oliveira@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 Cc: Ander Conselvan de Oliveira List-Id: intel-gfx@lists.freedesktop.org VGhlIGltcGxlbWVudGF0aW9uIG9mIHRoZSBmZGlfbGlua190cmFpbigpIGhvb2tzIG5lZWQgYW4g aW50ZWxfY3J0YyBzbwpqdXN0IHBhc3MgdGhhdCBpbnN0ZWFkIG9mIHRoZSBnZW5lcmljIGNydGMg dHlwZS4KClNpZ25lZC1vZmYtYnk6IEFuZGVyIENvbnNlbHZhbiBkZSBPbGl2ZWlyYSA8YW5kZXIu Y29uc2VsdmFuLmRlLm9saXZlaXJhQGludGVsLmNvbT4KUmV2aWV3ZWQtYnk6IFZpbGxlIFN5cmrD pGzDpCA8dmlsbGUuc3lyamFsYUBsaW51eC5pbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9kcnYuaCAgICAgIHwgIDIgKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X2RkaS5jICAgICB8IDEzICsrKystLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNw bGF5LmMgfCA2MyArKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0KIGRyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX2Rydi5oICAgICB8ICAyICstCiA0IGZpbGVzIGNoYW5nZWQsIDM3 IGluc2VydGlvbnMoKyksIDQzIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCmlu ZGV4IDI2ZjM2YjAuLmIyYmUxYTQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaApAQCAtNjY5LDcg KzY2OSw3IEBAIHN0cnVjdCBkcm1faTkxNV9kaXNwbGF5X2Z1bmNzIHsKIAkJCQkgICBzdHJ1Y3Qg aW50ZWxfZW5jb2RlciAqZW5jb2RlciwKIAkJCQkgICBjb25zdCBzdHJ1Y3QgZHJtX2Rpc3BsYXlf bW9kZSAqYWRqdXN0ZWRfbW9kZSk7CiAJdm9pZCAoKmF1ZGlvX2NvZGVjX2Rpc2FibGUpKHN0cnVj dCBpbnRlbF9lbmNvZGVyICplbmNvZGVyKTsKLQl2b2lkICgqZmRpX2xpbmtfdHJhaW4pKHN0cnVj dCBkcm1fY3J0YyAqY3J0Yyk7CisJdm9pZCAoKmZkaV9saW5rX3RyYWluKShzdHJ1Y3QgaW50ZWxf Y3J0YyAqY3J0Yyk7CiAJdm9pZCAoKmluaXRfY2xvY2tfZ2F0aW5nKShzdHJ1Y3QgZHJtX2k5MTVf cHJpdmF0ZSAqZGV2X3ByaXYpOwogCWludCAoKnF1ZXVlX2ZsaXApKHN0cnVjdCBkcm1fZGV2aWNl ICpkZXYsIHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKIAkJCSAgc3RydWN0IGRybV9mcmFtZWJ1ZmZl ciAqZmIsCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kZGkuYyBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RkaS5jCmluZGV4IGE3YzA4ZDcuLjExMWY2NjAgMTAw NjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RkaS5jCisrKyBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX2RkaS5jCkBAIC02NzQsMTUgKzY3NCwxNCBAQCBzdGF0aWMgdWlu dDMyX3QgaHN3X3BsbF90b19kZGlfcGxsX3NlbChzdHJ1Y3QgaW50ZWxfc2hhcmVkX2RwbGwgKnBs bCkKICAqIERESSBBICh3aGljaCBpcyB1c2VkIGZvciBlRFApCiAgKi8KIAotdm9pZCBoc3dfZmRp X2xpbmtfdHJhaW4oc3RydWN0IGRybV9jcnRjICpjcnRjKQordm9pZCBoc3dfZmRpX2xpbmtfdHJh aW4oc3RydWN0IGludGVsX2NydGMgKmNydGMpCiB7Ci0Jc3RydWN0IGRybV9kZXZpY2UgKmRldiA9 IGNydGMtPmRldjsKKwlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gY3J0Yy0+YmFzZS5kZXY7CiAJ c3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShkZXYpOwotCXN0cnVj dCBpbnRlbF9jcnRjICppbnRlbF9jcnRjID0gdG9faW50ZWxfY3J0YyhjcnRjKTsKIAlzdHJ1Y3Qg aW50ZWxfZW5jb2RlciAqZW5jb2RlcjsKIAl1MzIgdGVtcCwgaSwgcnhfY3RsX3ZhbCwgZGRpX3Bs bF9zZWw7CiAKLQlmb3JfZWFjaF9lbmNvZGVyX29uX2NydGMoZGV2LCBjcnRjLCBlbmNvZGVyKSB7 CisJZm9yX2VhY2hfZW5jb2Rlcl9vbl9jcnRjKGRldiwgJmNydGMtPmJhc2UsIGVuY29kZXIpIHsK IAkJV0FSTl9PTihlbmNvZGVyLT50eXBlICE9IElOVEVMX09VVFBVVF9BTkFMT0cpOwogCQlpbnRl bF9wcmVwYXJlX2RwX2RkaV9idWZmZXJzKGVuY29kZXIpOwogCX0KQEAgLTcwMSw3ICs3MDAsNyBA QCB2b2lkIGhzd19mZGlfbGlua190cmFpbihzdHJ1Y3QgZHJtX2NydGMgKmNydGMpCiAJLyogRW5h YmxlIHRoZSBQQ0ggUmVjZWl2ZXIgRkRJIFBMTCAqLwogCXJ4X2N0bF92YWwgPSBkZXZfcHJpdi0+ ZmRpX3J4X2NvbmZpZyB8IEZESV9SWF9FTkhBTkNFX0ZSQU1FX0VOQUJMRSB8CiAJCSAgICAgRkRJ X1JYX1BMTF9FTkFCTEUgfAotCQkgICAgIEZESV9EUF9QT1JUX1dJRFRIKGludGVsX2NydGMtPmNv bmZpZy0+ZmRpX2xhbmVzKTsKKwkJICAgICBGRElfRFBfUE9SVF9XSURUSChjcnRjLT5jb25maWct PmZkaV9sYW5lcyk7CiAJSTkxNV9XUklURShGRElfUlhfQ1RMKFBJUEVfQSksIHJ4X2N0bF92YWwp OwogCVBPU1RJTkdfUkVBRChGRElfUlhfQ1RMKFBJUEVfQSkpOwogCXVkZWxheSgyMjApOwpAQCAt NzExLDcgKzcxMCw3IEBAIHZvaWQgaHN3X2ZkaV9saW5rX3RyYWluKHN0cnVjdCBkcm1fY3J0YyAq Y3J0YykKIAlJOTE1X1dSSVRFKEZESV9SWF9DVEwoUElQRV9BKSwgcnhfY3RsX3ZhbCk7CiAKIAkv KiBDb25maWd1cmUgUG9ydCBDbG9jayBTZWxlY3QgKi8KLQlkZGlfcGxsX3NlbCA9IGhzd19wbGxf dG9fZGRpX3BsbF9zZWwoaW50ZWxfY3J0Yy0+Y29uZmlnLT5zaGFyZWRfZHBsbCk7CisJZGRpX3Bs bF9zZWwgPSBoc3dfcGxsX3RvX2RkaV9wbGxfc2VsKGNydGMtPmNvbmZpZy0+c2hhcmVkX2RwbGwp OwogCUk5MTVfV1JJVEUoUE9SVF9DTEtfU0VMKFBPUlRfRSksIGRkaV9wbGxfc2VsKTsKIAlXQVJO X09OKGRkaV9wbGxfc2VsICE9IFBPUlRfQ0xLX1NFTF9TUExMKTsKIApAQCAtNzMxLDcgKzczMCw3 IEBAIHZvaWQgaHN3X2ZkaV9saW5rX3RyYWluKHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKIAkJICog cG9ydCByZXZlcnNhbCBiaXQgKi8KIAkJSTkxNV9XUklURShERElfQlVGX0NUTChQT1JUX0UpLAog CQkJICAgRERJX0JVRl9DVExfRU5BQkxFIHwKLQkJCSAgICgoaW50ZWxfY3J0Yy0+Y29uZmlnLT5m ZGlfbGFuZXMgLSAxKSA8PCAxKSB8CisJCQkgICAoKGNydGMtPmNvbmZpZy0+ZmRpX2xhbmVzIC0g MSkgPDwgMSkgfAogCQkJICAgRERJX0JVRl9UUkFOU19TRUxFQ1QoaSAvIDIpKTsKIAkJUE9TVElO R19SRUFEKERESV9CVUZfQ1RMKFBPUlRfRSkpOwogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNw bGF5LmMKaW5kZXggOTllOGQ5Yy4uNWVkN2ZiMSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfZGlzcGxheS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rp c3BsYXkuYwpAQCAtMzY0NywxMiArMzY0NywxMSBAQCBzdGF0aWMgdm9pZCBpbnRlbF91cGRhdGVf cGlwZV9jb25maWcoc3RydWN0IGludGVsX2NydGMgKmNydGMsCiAJfQogfQogCi1zdGF0aWMgdm9p ZCBpbnRlbF9mZGlfbm9ybWFsX3RyYWluKHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKK3N0YXRpYyB2 b2lkIGludGVsX2ZkaV9ub3JtYWxfdHJhaW4oc3RydWN0IGludGVsX2NydGMgKmNydGMpCiB7Ci0J c3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGNydGMtPmRldjsKKwlzdHJ1Y3QgZHJtX2RldmljZSAq ZGV2ID0gY3J0Yy0+YmFzZS5kZXY7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2 ID0gdG9faTkxNShkZXYpOwotCXN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjID0gdG9faW50 ZWxfY3J0YyhjcnRjKTsKLQlpbnQgcGlwZSA9IGludGVsX2NydGMtPnBpcGU7CisJaW50IHBpcGUg PSBjcnRjLT5waXBlOwogCWk5MTVfcmVnX3QgcmVnOwogCXUzMiB0ZW1wOwogCkBAIC0zNjkwLDEy ICszNjg5LDExIEBAIHN0YXRpYyB2b2lkIGludGVsX2ZkaV9ub3JtYWxfdHJhaW4oc3RydWN0IGRy bV9jcnRjICpjcnRjKQogfQogCiAvKiBUaGUgRkRJIGxpbmsgdHJhaW5pbmcgZnVuY3Rpb25zIGZv ciBJTEsvSWJleHBlYWsuICovCi1zdGF0aWMgdm9pZCBpcm9ubGFrZV9mZGlfbGlua190cmFpbihz dHJ1Y3QgZHJtX2NydGMgKmNydGMpCitzdGF0aWMgdm9pZCBpcm9ubGFrZV9mZGlfbGlua190cmFp bihzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YykKIHsKLQlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0g Y3J0Yy0+ZGV2OworCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBjcnRjLT5iYXNlLmRldjsKIAlz dHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGRldik7Ci0Jc3RydWN0 IGludGVsX2NydGMgKmludGVsX2NydGMgPSB0b19pbnRlbF9jcnRjKGNydGMpOwotCWludCBwaXBl ID0gaW50ZWxfY3J0Yy0+cGlwZTsKKwlpbnQgcGlwZSA9IGNydGMtPnBpcGU7CiAJaTkxNV9yZWdf dCByZWc7CiAJdTMyIHRlbXAsIHRyaWVzOwogCkBAIC0zNzE2LDcgKzM3MTQsNyBAQCBzdGF0aWMg dm9pZCBpcm9ubGFrZV9mZGlfbGlua190cmFpbihzdHJ1Y3QgZHJtX2NydGMgKmNydGMpCiAJcmVn ID0gRkRJX1RYX0NUTChwaXBlKTsKIAl0ZW1wID0gSTkxNV9SRUFEKHJlZyk7CiAJdGVtcCAmPSB+ RkRJX0RQX1BPUlRfV0lEVEhfTUFTSzsKLQl0ZW1wIHw9IEZESV9EUF9QT1JUX1dJRFRIKGludGVs X2NydGMtPmNvbmZpZy0+ZmRpX2xhbmVzKTsKKwl0ZW1wIHw9IEZESV9EUF9QT1JUX1dJRFRIKGNy dGMtPmNvbmZpZy0+ZmRpX2xhbmVzKTsKIAl0ZW1wICY9IH5GRElfTElOS19UUkFJTl9OT05FOwog CXRlbXAgfD0gRkRJX0xJTktfVFJBSU5fUEFUVEVSTl8xOwogCUk5MTVfV1JJVEUocmVnLCB0ZW1w IHwgRkRJX1RYX0VOQUJMRSk7CkBAIC0zNzkxLDEyICszNzg5LDExIEBAIHN0YXRpYyBjb25zdCBp bnQgc25iX2JfZmRpX3RyYWluX3BhcmFtW10gPSB7CiB9OwogCiAvKiBUaGUgRkRJIGxpbmsgdHJh aW5pbmcgZnVuY3Rpb25zIGZvciBTTkIvQ291Z2FycG9pbnQuICovCi1zdGF0aWMgdm9pZCBnZW42 X2ZkaV9saW5rX3RyYWluKHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKK3N0YXRpYyB2b2lkIGdlbjZf ZmRpX2xpbmtfdHJhaW4oc3RydWN0IGludGVsX2NydGMgKmNydGMpCiB7Ci0Jc3RydWN0IGRybV9k ZXZpY2UgKmRldiA9IGNydGMtPmRldjsKKwlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gY3J0Yy0+ YmFzZS5kZXY7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShk ZXYpOwotCXN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjID0gdG9faW50ZWxfY3J0YyhjcnRj KTsKLQlpbnQgcGlwZSA9IGludGVsX2NydGMtPnBpcGU7CisJaW50IHBpcGUgPSBjcnRjLT5waXBl OwogCWk5MTVfcmVnX3QgcmVnOwogCXUzMiB0ZW1wLCBpLCByZXRyeTsKIApAQCAtMzgxNSw3ICsz ODEyLDcgQEAgc3RhdGljIHZvaWQgZ2VuNl9mZGlfbGlua190cmFpbihzdHJ1Y3QgZHJtX2NydGMg KmNydGMpCiAJcmVnID0gRkRJX1RYX0NUTChwaXBlKTsKIAl0ZW1wID0gSTkxNV9SRUFEKHJlZyk7 CiAJdGVtcCAmPSB+RkRJX0RQX1BPUlRfV0lEVEhfTUFTSzsKLQl0ZW1wIHw9IEZESV9EUF9QT1JU X1dJRFRIKGludGVsX2NydGMtPmNvbmZpZy0+ZmRpX2xhbmVzKTsKKwl0ZW1wIHw9IEZESV9EUF9Q T1JUX1dJRFRIKGNydGMtPmNvbmZpZy0+ZmRpX2xhbmVzKTsKIAl0ZW1wICY9IH5GRElfTElOS19U UkFJTl9OT05FOwogCXRlbXAgfD0gRkRJX0xJTktfVFJBSU5fUEFUVEVSTl8xOwogCXRlbXAgJj0g fkZESV9MSU5LX1RSQUlOX1ZPTF9FTVBfTUFTSzsKQEAgLTM5MjQsMTIgKzM5MjEsMTEgQEAgc3Rh dGljIHZvaWQgZ2VuNl9mZGlfbGlua190cmFpbihzdHJ1Y3QgZHJtX2NydGMgKmNydGMpCiB9CiAK IC8qIE1hbnVhbCBsaW5rIHRyYWluaW5nIGZvciBJdnkgQnJpZGdlIEEwIHBhcnRzICovCi1zdGF0 aWMgdm9pZCBpdmJfbWFudWFsX2ZkaV9saW5rX3RyYWluKHN0cnVjdCBkcm1fY3J0YyAqY3J0YykK K3N0YXRpYyB2b2lkIGl2Yl9tYW51YWxfZmRpX2xpbmtfdHJhaW4oc3RydWN0IGludGVsX2NydGMg KmNydGMpCiB7Ci0Jc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGNydGMtPmRldjsKKwlzdHJ1Y3Qg ZHJtX2RldmljZSAqZGV2ID0gY3J0Yy0+YmFzZS5kZXY7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZh dGUgKmRldl9wcml2ID0gdG9faTkxNShkZXYpOwotCXN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9j cnRjID0gdG9faW50ZWxfY3J0YyhjcnRjKTsKLQlpbnQgcGlwZSA9IGludGVsX2NydGMtPnBpcGU7 CisJaW50IHBpcGUgPSBjcnRjLT5waXBlOwogCWk5MTVfcmVnX3QgcmVnOwogCXUzMiB0ZW1wLCBp LCBqOwogCkBAIC0zOTY3LDcgKzM5NjMsNyBAQCBzdGF0aWMgdm9pZCBpdmJfbWFudWFsX2ZkaV9s aW5rX3RyYWluKHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKIAkJcmVnID0gRkRJX1RYX0NUTChwaXBl KTsKIAkJdGVtcCA9IEk5MTVfUkVBRChyZWcpOwogCQl0ZW1wICY9IH5GRElfRFBfUE9SVF9XSURU SF9NQVNLOwotCQl0ZW1wIHw9IEZESV9EUF9QT1JUX1dJRFRIKGludGVsX2NydGMtPmNvbmZpZy0+ ZmRpX2xhbmVzKTsKKwkJdGVtcCB8PSBGRElfRFBfUE9SVF9XSURUSChjcnRjLT5jb25maWctPmZk aV9sYW5lcyk7CiAJCXRlbXAgfD0gRkRJX0xJTktfVFJBSU5fUEFUVEVSTl8xX0lWQjsKIAkJdGVt cCAmPSB+RkRJX0xJTktfVFJBSU5fVk9MX0VNUF9NQVNLOwogCQl0ZW1wIHw9IHNuYl9iX2ZkaV90 cmFpbl9wYXJhbVtqLzJdOwpAQCAtNDQzOCwxMiArNDQzNCwxMiBAQCBzdGF0aWMgdm9pZCBpdnli cmlkZ2VfdXBkYXRlX2ZkaV9iY19iaWZ1cmNhdGlvbihzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxf Y3J0YykKIAogLyogUmV0dXJuIHdoaWNoIERQIFBvcnQgc2hvdWxkIGJlIHNlbGVjdGVkIGZvciBU cmFuc2NvZGVyIERQIGNvbnRyb2wgKi8KIHN0YXRpYyBlbnVtIHBvcnQKLWludGVsX3RyYW5zX2Rw X3BvcnRfc2VsKHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKK2ludGVsX3RyYW5zX2RwX3BvcnRfc2Vs KHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjKQogewotCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBj cnRjLT5kZXY7CisJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGNydGMtPmJhc2UuZGV2OwogCXN0 cnVjdCBpbnRlbF9lbmNvZGVyICplbmNvZGVyOwogCi0JZm9yX2VhY2hfZW5jb2Rlcl9vbl9jcnRj KGRldiwgY3J0YywgZW5jb2RlcikgeworCWZvcl9lYWNoX2VuY29kZXJfb25fY3J0YyhkZXYsICZj cnRjLT5iYXNlLCBlbmNvZGVyKSB7CiAJCWlmIChlbmNvZGVyLT50eXBlID09IElOVEVMX09VVFBV VF9EUCB8fAogCQkgICAgZW5jb2Rlci0+dHlwZSA9PSBJTlRFTF9PVVRQVVRfRURQKQogCQkJcmV0 dXJuIGVuY190b19kaWdfcG9ydCgmZW5jb2Rlci0+YmFzZSktPnBvcnQ7CkBAIC00NDYwLDE4ICs0 NDU2LDE3IEBAIGludGVsX3RyYW5zX2RwX3BvcnRfc2VsKHN0cnVjdCBkcm1fY3J0YyAqY3J0YykK ICAqICAgLSBEUCB0cmFuc2NvZGluZyBiaXRzCiAgKiAgIC0gdHJhbnNjb2RlcgogICovCi1zdGF0 aWMgdm9pZCBpcm9ubGFrZV9wY2hfZW5hYmxlKHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKK3N0YXRp YyB2b2lkIGlyb25sYWtlX3BjaF9lbmFibGUoc3RydWN0IGludGVsX2NydGMgKmNydGMpCiB7Ci0J c3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGNydGMtPmRldjsKKwlzdHJ1Y3QgZHJtX2RldmljZSAq ZGV2ID0gY3J0Yy0+YmFzZS5kZXY7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2 ID0gdG9faTkxNShkZXYpOwotCXN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjID0gdG9faW50 ZWxfY3J0YyhjcnRjKTsKLQlpbnQgcGlwZSA9IGludGVsX2NydGMtPnBpcGU7CisJaW50IHBpcGUg PSBjcnRjLT5waXBlOwogCXUzMiB0ZW1wOwogCiAJYXNzZXJ0X3BjaF90cmFuc2NvZGVyX2Rpc2Fi bGVkKGRldl9wcml2LCBwaXBlKTsKIAogCWlmIChJU19JVllCUklER0UoZGV2X3ByaXYpKQotCQlp dnlicmlkZ2VfdXBkYXRlX2ZkaV9iY19iaWZ1cmNhdGlvbihpbnRlbF9jcnRjKTsKKwkJaXZ5YnJp ZGdlX3VwZGF0ZV9mZGlfYmNfYmlmdXJjYXRpb24oY3J0Yyk7CiAKIAkvKiBXcml0ZSB0aGUgVFUg c2l6ZSBiaXRzIGJlZm9yZSBmZGkgbGluayB0cmFpbmluZywgc28gdGhhdCBlcnJvcgogCSAqIGRl dGVjdGlvbiB3b3Jrcy4gKi8KQEAgLTQ0ODksNyArNDQ4NCw3IEBAIHN0YXRpYyB2b2lkIGlyb25s YWtlX3BjaF9lbmFibGUoc3RydWN0IGRybV9jcnRjICpjcnRjKQogCQl0ZW1wID0gSTkxNV9SRUFE KFBDSF9EUExMX1NFTCk7CiAJCXRlbXAgfD0gVFJBTlNfRFBMTF9FTkFCTEUocGlwZSk7CiAJCXNl bCA9IFRSQU5TX0RQTExCX1NFTChwaXBlKTsKLQkJaWYgKGludGVsX2NydGMtPmNvbmZpZy0+c2hh cmVkX2RwbGwgPT0KKwkJaWYgKGNydGMtPmNvbmZpZy0+c2hhcmVkX2RwbGwgPT0KIAkJICAgIGlu dGVsX2dldF9zaGFyZWRfZHBsbF9ieV9pZChkZXZfcHJpdiwgRFBMTF9JRF9QQ0hfUExMX0IpKQog CQkJdGVtcCB8PSBzZWw7CiAJCWVsc2UKQEAgLTQ1MDQsMTkgKzQ0OTksMTkgQEAgc3RhdGljIHZv aWQgaXJvbmxha2VfcGNoX2VuYWJsZShzdHJ1Y3QgZHJtX2NydGMgKmNydGMpCiAJICogTm90ZSB0 aGF0IGVuYWJsZV9zaGFyZWRfZHBsbCB0cmllcyB0byBkbyB0aGUgcmlnaHQgdGhpbmcsIGJ1dAog CSAqIGdldF9zaGFyZWRfZHBsbCB1bmNvbmRpdGlvbmFsbHkgcmVzZXRzIHRoZSBwbGwgLSB3ZSBu ZWVkIHRoYXQgdG8gaGF2ZQogCSAqIHRoZSByaWdodCBMVkRTIGVuYWJsZSBzZXF1ZW5jZS4gKi8K LQlpbnRlbF9lbmFibGVfc2hhcmVkX2RwbGwoaW50ZWxfY3J0Yyk7CisJaW50ZWxfZW5hYmxlX3No YXJlZF9kcGxsKGNydGMpOwogCiAJLyogc2V0IHRyYW5zY29kZXIgdGltaW5nLCBwYW5lbCBtdXN0 IGFsbG93IGl0ICovCiAJYXNzZXJ0X3BhbmVsX3VubG9ja2VkKGRldl9wcml2LCBwaXBlKTsKLQlp cm9ubGFrZV9wY2hfdHJhbnNjb2Rlcl9zZXRfdGltaW5ncyhpbnRlbF9jcnRjLCBwaXBlKTsKKwlp cm9ubGFrZV9wY2hfdHJhbnNjb2Rlcl9zZXRfdGltaW5ncyhjcnRjLCBwaXBlKTsKIAogCWludGVs X2ZkaV9ub3JtYWxfdHJhaW4oY3J0Yyk7CiAKIAkvKiBGb3IgUENIIERQLCBlbmFibGUgVFJBTlNf RFBfQ1RMICovCiAJaWYgKEhBU19QQ0hfQ1BUKGRldl9wcml2KSAmJgotCSAgICBpbnRlbF9jcnRj X2hhc19kcF9lbmNvZGVyKGludGVsX2NydGMtPmNvbmZpZykpIHsKKwkgICAgaW50ZWxfY3J0Y19o YXNfZHBfZW5jb2RlcihjcnRjLT5jb25maWcpKSB7CiAJCWNvbnN0IHN0cnVjdCBkcm1fZGlzcGxh eV9tb2RlICphZGp1c3RlZF9tb2RlID0KLQkJCSZpbnRlbF9jcnRjLT5jb25maWctPmJhc2UuYWRq dXN0ZWRfbW9kZTsKKwkJCSZjcnRjLT5jb25maWctPmJhc2UuYWRqdXN0ZWRfbW9kZTsKIAkJdTMy IGJwYyA9IChJOTE1X1JFQUQoUElQRUNPTkYocGlwZSkpICYgUElQRUNPTkZfQlBDX01BU0spID4+ IDU7CiAJCWk5MTVfcmVnX3QgcmVnID0gVFJBTlNfRFBfQ1RMKHBpcGUpOwogCQl0ZW1wID0gSTkx NV9SRUFEKHJlZyk7CkBAIC01MjkwLDcgKzUyODUsNyBAQCBzdGF0aWMgdm9pZCBpcm9ubGFrZV9j cnRjX2VuYWJsZShzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqcGlwZV9jb25maWcsCiAJaW50ZWxf ZW5hYmxlX3BpcGUoaW50ZWxfY3J0Yyk7CiAKIAlpZiAoaW50ZWxfY3J0Yy0+Y29uZmlnLT5oYXNf cGNoX2VuY29kZXIpCi0JCWlyb25sYWtlX3BjaF9lbmFibGUoY3J0Yyk7CisJCWlyb25sYWtlX3Bj aF9lbmFibGUoaW50ZWxfY3J0Yyk7CiAKIAlhc3NlcnRfdmJsYW5rX2Rpc2FibGVkKGNydGMpOwog CWRybV9jcnRjX3ZibGFua19vbihjcnRjKTsKQEAgLTUzNzIsNyArNTM2Nyw3IEBAIHN0YXRpYyB2 b2lkIGhhc3dlbGxfY3J0Y19lbmFibGUoc3RydWN0IGludGVsX2NydGNfc3RhdGUgKnBpcGVfY29u ZmlnLAogCWludGVsX2VuY29kZXJzX3ByZV9lbmFibGUoY3J0YywgcGlwZV9jb25maWcsIG9sZF9z dGF0ZSk7CiAKIAlpZiAoaW50ZWxfY3J0Yy0+Y29uZmlnLT5oYXNfcGNoX2VuY29kZXIpCi0JCWRl dl9wcml2LT5kaXNwbGF5LmZkaV9saW5rX3RyYWluKGNydGMpOworCQlkZXZfcHJpdi0+ZGlzcGxh eS5mZGlfbGlua190cmFpbihpbnRlbF9jcnRjKTsKIAogCWlmICghdHJhbnNjb2Rlcl9pc19kc2ko Y3B1X3RyYW5zY29kZXIpKQogCQlpbnRlbF9kZGlfZW5hYmxlX3BpcGVfY2xvY2soaW50ZWxfY3J0 Yyk7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaCBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCmluZGV4IDlkYTU0ZjUuLjAwN2U4NTkgMTAwNjQ0 Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2Rydi5oCkBAIC0xMjI1LDcgKzEyMjUsNyBAQCB2b2lkIGludGVsX2Rk aV9mZGlfcG9zdF9kaXNhYmxlKHN0cnVjdCBpbnRlbF9lbmNvZGVyICppbnRlbF9lbmNvZGVyLAog CQkJCXN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpvbGRfY3J0Y19zdGF0ZSwKIAkJCQlzdHJ1Y3Qg ZHJtX2Nvbm5lY3Rvcl9zdGF0ZSAqb2xkX2Nvbm5fc3RhdGUpOwogdm9pZCBpbnRlbF9wcmVwYXJl X2RwX2RkaV9idWZmZXJzKHN0cnVjdCBpbnRlbF9lbmNvZGVyICplbmNvZGVyKTsKLXZvaWQgaHN3 X2ZkaV9saW5rX3RyYWluKHN0cnVjdCBkcm1fY3J0YyAqY3J0Yyk7Cit2b2lkIGhzd19mZGlfbGlu a190cmFpbihzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0Yyk7CiB2b2lkIGludGVsX2RkaV9pbml0KHN0 cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwgZW51bSBwb3J0IHBvcnQpOwogZW51bSBw b3J0IGludGVsX2RkaV9nZXRfZW5jb2Rlcl9wb3J0KHN0cnVjdCBpbnRlbF9lbmNvZGVyICppbnRl bF9lbmNvZGVyKTsKIGJvb2wgaW50ZWxfZGRpX2dldF9od19zdGF0ZShzdHJ1Y3QgaW50ZWxfZW5j b2RlciAqZW5jb2RlciwgZW51bSBwaXBlICpwaXBlKTsKLS0gCjIuOS4zCgpfX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0 CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3Rv cC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK