From: Ander Conselvan de Oliveira Subject: [PATCH v2 2/8] drm/i915: Pass intel_crtc to fdi_link_train() hooks Date: Wed, 1 Mar 2017 16:13:12 +0200 Message-ID: <20170301141318.3607-3-ander.conselvan.de.oliveira@intel.com> References: <20170301141318.3607-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 mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTPS id CEE136E93E for ; Wed, 1 Mar 2017 14:13:46 +0000 (UTC) In-Reply-To: <20170301141318.3607-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 Y29uc2VsdmFuLmRlLm9saXZlaXJhQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X2Rydi5oICAgICAgfCAgMiArLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGRp LmMgICAgIHwgMTMgKysrKy0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXku YyB8IDYzICsrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tLQogZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfZHJ2LmggICAgIHwgIDIgKy0KIDQgZmlsZXMgY2hhbmdlZCwgMzcgaW5z ZXJ0aW9ucygrKSwgNDMgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKaW5kZXgg YmM5MjgzYi4uOGIxMWNkZiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9k cnYuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCkBAIC02NjksNyArNjY5 LDcgQEAgc3RydWN0IGRybV9pOTE1X2Rpc3BsYXlfZnVuY3MgewogCQkJCSAgIHN0cnVjdCBpbnRl bF9lbmNvZGVyICplbmNvZGVyLAogCQkJCSAgIGNvbnN0IHN0cnVjdCBkcm1fZGlzcGxheV9tb2Rl ICphZGp1c3RlZF9tb2RlKTsKIAl2b2lkICgqYXVkaW9fY29kZWNfZGlzYWJsZSkoc3RydWN0IGlu dGVsX2VuY29kZXIgKmVuY29kZXIpOwotCXZvaWQgKCpmZGlfbGlua190cmFpbikoc3RydWN0IGRy bV9jcnRjICpjcnRjKTsKKwl2b2lkICgqZmRpX2xpbmtfdHJhaW4pKHN0cnVjdCBpbnRlbF9jcnRj ICpjcnRjKTsKIAl2b2lkICgqaW5pdF9jbG9ja19nYXRpbmcpKHN0cnVjdCBkcm1faTkxNV9wcml2 YXRlICpkZXZfcHJpdik7CiAJaW50ICgqcXVldWVfZmxpcCkoc3RydWN0IGRybV9kZXZpY2UgKmRl diwgc3RydWN0IGRybV9jcnRjICpjcnRjLAogCQkJICBzdHJ1Y3QgZHJtX2ZyYW1lYnVmZmVyICpm YiwKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RkaS5jIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfZGRpLmMKaW5kZXggYTdjMDhkNy4uMTExZjY2MCAxMDA2NDQK LS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGRpLmMKKysrIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfZGRpLmMKQEAgLTY3NCwxNSArNjc0LDE0IEBAIHN0YXRpYyB1aW50MzJf dCBoc3dfcGxsX3RvX2RkaV9wbGxfc2VsKHN0cnVjdCBpbnRlbF9zaGFyZWRfZHBsbCAqcGxsKQog ICogRERJIEEgKHdoaWNoIGlzIHVzZWQgZm9yIGVEUCkKICAqLwogCi12b2lkIGhzd19mZGlfbGlu a190cmFpbihzdHJ1Y3QgZHJtX2NydGMgKmNydGMpCit2b2lkIGhzd19mZGlfbGlua190cmFpbihz dHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YykKIHsKLQlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gY3J0 Yy0+ZGV2OworCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBjcnRjLT5iYXNlLmRldjsKIAlzdHJ1 Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGRldik7Ci0Jc3RydWN0IGlu dGVsX2NydGMgKmludGVsX2NydGMgPSB0b19pbnRlbF9jcnRjKGNydGMpOwogCXN0cnVjdCBpbnRl bF9lbmNvZGVyICplbmNvZGVyOwogCXUzMiB0ZW1wLCBpLCByeF9jdGxfdmFsLCBkZGlfcGxsX3Nl bDsKIAotCWZvcl9lYWNoX2VuY29kZXJfb25fY3J0YyhkZXYsIGNydGMsIGVuY29kZXIpIHsKKwlm b3JfZWFjaF9lbmNvZGVyX29uX2NydGMoZGV2LCAmY3J0Yy0+YmFzZSwgZW5jb2RlcikgewogCQlX QVJOX09OKGVuY29kZXItPnR5cGUgIT0gSU5URUxfT1VUUFVUX0FOQUxPRyk7CiAJCWludGVsX3By ZXBhcmVfZHBfZGRpX2J1ZmZlcnMoZW5jb2Rlcik7CiAJfQpAQCAtNzAxLDcgKzcwMCw3IEBAIHZv aWQgaHN3X2ZkaV9saW5rX3RyYWluKHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKIAkvKiBFbmFibGUg dGhlIFBDSCBSZWNlaXZlciBGREkgUExMICovCiAJcnhfY3RsX3ZhbCA9IGRldl9wcml2LT5mZGlf cnhfY29uZmlnIHwgRkRJX1JYX0VOSEFOQ0VfRlJBTUVfRU5BQkxFIHwKIAkJICAgICBGRElfUlhf UExMX0VOQUJMRSB8Ci0JCSAgICAgRkRJX0RQX1BPUlRfV0lEVEgoaW50ZWxfY3J0Yy0+Y29uZmln LT5mZGlfbGFuZXMpOworCQkgICAgIEZESV9EUF9QT1JUX1dJRFRIKGNydGMtPmNvbmZpZy0+ZmRp X2xhbmVzKTsKIAlJOTE1X1dSSVRFKEZESV9SWF9DVEwoUElQRV9BKSwgcnhfY3RsX3ZhbCk7CiAJ UE9TVElOR19SRUFEKEZESV9SWF9DVEwoUElQRV9BKSk7CiAJdWRlbGF5KDIyMCk7CkBAIC03MTEs NyArNzEwLDcgQEAgdm9pZCBoc3dfZmRpX2xpbmtfdHJhaW4oc3RydWN0IGRybV9jcnRjICpjcnRj KQogCUk5MTVfV1JJVEUoRkRJX1JYX0NUTChQSVBFX0EpLCByeF9jdGxfdmFsKTsKIAogCS8qIENv bmZpZ3VyZSBQb3J0IENsb2NrIFNlbGVjdCAqLwotCWRkaV9wbGxfc2VsID0gaHN3X3BsbF90b19k ZGlfcGxsX3NlbChpbnRlbF9jcnRjLT5jb25maWctPnNoYXJlZF9kcGxsKTsKKwlkZGlfcGxsX3Nl bCA9IGhzd19wbGxfdG9fZGRpX3BsbF9zZWwoY3J0Yy0+Y29uZmlnLT5zaGFyZWRfZHBsbCk7CiAJ STkxNV9XUklURShQT1JUX0NMS19TRUwoUE9SVF9FKSwgZGRpX3BsbF9zZWwpOwogCVdBUk5fT04o ZGRpX3BsbF9zZWwgIT0gUE9SVF9DTEtfU0VMX1NQTEwpOwogCkBAIC03MzEsNyArNzMwLDcgQEAg dm9pZCBoc3dfZmRpX2xpbmtfdHJhaW4oc3RydWN0IGRybV9jcnRjICpjcnRjKQogCQkgKiBwb3J0 IHJldmVyc2FsIGJpdCAqLwogCQlJOTE1X1dSSVRFKERESV9CVUZfQ1RMKFBPUlRfRSksCiAJCQkg ICBERElfQlVGX0NUTF9FTkFCTEUgfAotCQkJICAgKChpbnRlbF9jcnRjLT5jb25maWctPmZkaV9s YW5lcyAtIDEpIDw8IDEpIHwKKwkJCSAgICgoY3J0Yy0+Y29uZmlnLT5mZGlfbGFuZXMgLSAxKSA8 PCAxKSB8CiAJCQkgICBERElfQlVGX1RSQU5TX1NFTEVDVChpIC8gMikpOwogCQlQT1NUSU5HX1JF QUQoRERJX0JVRl9DVEwoUE9SVF9FKSk7CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2Rpc3BsYXkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXku YwppbmRleCA3NjczZDVkLi5jNjI3ZjdlIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9kaXNwbGF5LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxh eS5jCkBAIC0zNjQ3LDEyICszNjQ3LDExIEBAIHN0YXRpYyB2b2lkIGludGVsX3VwZGF0ZV9waXBl X2NvbmZpZyhzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YywKIAl9CiB9CiAKLXN0YXRpYyB2b2lkIGlu dGVsX2ZkaV9ub3JtYWxfdHJhaW4oc3RydWN0IGRybV9jcnRjICpjcnRjKQorc3RhdGljIHZvaWQg aW50ZWxfZmRpX25vcm1hbF90cmFpbihzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YykKIHsKLQlzdHJ1 Y3QgZHJtX2RldmljZSAqZGV2ID0gY3J0Yy0+ZGV2OworCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYg PSBjcnRjLT5iYXNlLmRldjsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0 b19pOTE1KGRldik7Ci0Jc3RydWN0IGludGVsX2NydGMgKmludGVsX2NydGMgPSB0b19pbnRlbF9j cnRjKGNydGMpOwotCWludCBwaXBlID0gaW50ZWxfY3J0Yy0+cGlwZTsKKwlpbnQgcGlwZSA9IGNy dGMtPnBpcGU7CiAJaTkxNV9yZWdfdCByZWc7CiAJdTMyIHRlbXA7CiAKQEAgLTM2OTAsMTIgKzM2 ODksMTEgQEAgc3RhdGljIHZvaWQgaW50ZWxfZmRpX25vcm1hbF90cmFpbihzdHJ1Y3QgZHJtX2Ny dGMgKmNydGMpCiB9CiAKIC8qIFRoZSBGREkgbGluayB0cmFpbmluZyBmdW5jdGlvbnMgZm9yIElM Sy9JYmV4cGVhay4gKi8KLXN0YXRpYyB2b2lkIGlyb25sYWtlX2ZkaV9saW5rX3RyYWluKHN0cnVj dCBkcm1fY3J0YyAqY3J0YykKK3N0YXRpYyB2b2lkIGlyb25sYWtlX2ZkaV9saW5rX3RyYWluKHN0 cnVjdCBpbnRlbF9jcnRjICpjcnRjKQogewotCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBjcnRj LT5kZXY7CisJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGNydGMtPmJhc2UuZGV2OwogCXN0cnVj dCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoZGV2KTsKLQlzdHJ1Y3QgaW50 ZWxfY3J0YyAqaW50ZWxfY3J0YyA9IHRvX2ludGVsX2NydGMoY3J0Yyk7Ci0JaW50IHBpcGUgPSBp bnRlbF9jcnRjLT5waXBlOworCWludCBwaXBlID0gY3J0Yy0+cGlwZTsKIAlpOTE1X3JlZ190IHJl ZzsKIAl1MzIgdGVtcCwgdHJpZXM7CiAKQEAgLTM3MTYsNyArMzcxNCw3IEBAIHN0YXRpYyB2b2lk IGlyb25sYWtlX2ZkaV9saW5rX3RyYWluKHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKIAlyZWcgPSBG RElfVFhfQ1RMKHBpcGUpOwogCXRlbXAgPSBJOTE1X1JFQUQocmVnKTsKIAl0ZW1wICY9IH5GRElf RFBfUE9SVF9XSURUSF9NQVNLOwotCXRlbXAgfD0gRkRJX0RQX1BPUlRfV0lEVEgoaW50ZWxfY3J0 Yy0+Y29uZmlnLT5mZGlfbGFuZXMpOworCXRlbXAgfD0gRkRJX0RQX1BPUlRfV0lEVEgoY3J0Yy0+ Y29uZmlnLT5mZGlfbGFuZXMpOwogCXRlbXAgJj0gfkZESV9MSU5LX1RSQUlOX05PTkU7CiAJdGVt cCB8PSBGRElfTElOS19UUkFJTl9QQVRURVJOXzE7CiAJSTkxNV9XUklURShyZWcsIHRlbXAgfCBG RElfVFhfRU5BQkxFKTsKQEAgLTM3OTEsMTIgKzM3ODksMTEgQEAgc3RhdGljIGNvbnN0IGludCBz bmJfYl9mZGlfdHJhaW5fcGFyYW1bXSA9IHsKIH07CiAKIC8qIFRoZSBGREkgbGluayB0cmFpbmlu ZyBmdW5jdGlvbnMgZm9yIFNOQi9Db3VnYXJwb2ludC4gKi8KLXN0YXRpYyB2b2lkIGdlbjZfZmRp X2xpbmtfdHJhaW4oc3RydWN0IGRybV9jcnRjICpjcnRjKQorc3RhdGljIHZvaWQgZ2VuNl9mZGlf bGlua190cmFpbihzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YykKIHsKLQlzdHJ1Y3QgZHJtX2Rldmlj ZSAqZGV2ID0gY3J0Yy0+ZGV2OworCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBjcnRjLT5iYXNl LmRldjsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGRldik7 Ci0Jc3RydWN0IGludGVsX2NydGMgKmludGVsX2NydGMgPSB0b19pbnRlbF9jcnRjKGNydGMpOwot CWludCBwaXBlID0gaW50ZWxfY3J0Yy0+cGlwZTsKKwlpbnQgcGlwZSA9IGNydGMtPnBpcGU7CiAJ aTkxNV9yZWdfdCByZWc7CiAJdTMyIHRlbXAsIGksIHJldHJ5OwogCkBAIC0zODE1LDcgKzM4MTIs NyBAQCBzdGF0aWMgdm9pZCBnZW42X2ZkaV9saW5rX3RyYWluKHN0cnVjdCBkcm1fY3J0YyAqY3J0 YykKIAlyZWcgPSBGRElfVFhfQ1RMKHBpcGUpOwogCXRlbXAgPSBJOTE1X1JFQUQocmVnKTsKIAl0 ZW1wICY9IH5GRElfRFBfUE9SVF9XSURUSF9NQVNLOwotCXRlbXAgfD0gRkRJX0RQX1BPUlRfV0lE VEgoaW50ZWxfY3J0Yy0+Y29uZmlnLT5mZGlfbGFuZXMpOworCXRlbXAgfD0gRkRJX0RQX1BPUlRf V0lEVEgoY3J0Yy0+Y29uZmlnLT5mZGlfbGFuZXMpOwogCXRlbXAgJj0gfkZESV9MSU5LX1RSQUlO X05PTkU7CiAJdGVtcCB8PSBGRElfTElOS19UUkFJTl9QQVRURVJOXzE7CiAJdGVtcCAmPSB+RkRJ X0xJTktfVFJBSU5fVk9MX0VNUF9NQVNLOwpAQCAtMzkyNCwxMiArMzkyMSwxMSBAQCBzdGF0aWMg dm9pZCBnZW42X2ZkaV9saW5rX3RyYWluKHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKIH0KIAogLyog TWFudWFsIGxpbmsgdHJhaW5pbmcgZm9yIEl2eSBCcmlkZ2UgQTAgcGFydHMgKi8KLXN0YXRpYyB2 b2lkIGl2Yl9tYW51YWxfZmRpX2xpbmtfdHJhaW4oc3RydWN0IGRybV9jcnRjICpjcnRjKQorc3Rh dGljIHZvaWQgaXZiX21hbnVhbF9mZGlfbGlua190cmFpbihzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0 YykKIHsKLQlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gY3J0Yy0+ZGV2OworCXN0cnVjdCBkcm1f ZGV2aWNlICpkZXYgPSBjcnRjLT5iYXNlLmRldjsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAq ZGV2X3ByaXYgPSB0b19pOTE1KGRldik7Ci0Jc3RydWN0IGludGVsX2NydGMgKmludGVsX2NydGMg PSB0b19pbnRlbF9jcnRjKGNydGMpOwotCWludCBwaXBlID0gaW50ZWxfY3J0Yy0+cGlwZTsKKwlp bnQgcGlwZSA9IGNydGMtPnBpcGU7CiAJaTkxNV9yZWdfdCByZWc7CiAJdTMyIHRlbXAsIGksIGo7 CiAKQEAgLTM5NjcsNyArMzk2Myw3IEBAIHN0YXRpYyB2b2lkIGl2Yl9tYW51YWxfZmRpX2xpbmtf dHJhaW4oc3RydWN0IGRybV9jcnRjICpjcnRjKQogCQlyZWcgPSBGRElfVFhfQ1RMKHBpcGUpOwog CQl0ZW1wID0gSTkxNV9SRUFEKHJlZyk7CiAJCXRlbXAgJj0gfkZESV9EUF9QT1JUX1dJRFRIX01B U0s7Ci0JCXRlbXAgfD0gRkRJX0RQX1BPUlRfV0lEVEgoaW50ZWxfY3J0Yy0+Y29uZmlnLT5mZGlf bGFuZXMpOworCQl0ZW1wIHw9IEZESV9EUF9QT1JUX1dJRFRIKGNydGMtPmNvbmZpZy0+ZmRpX2xh bmVzKTsKIAkJdGVtcCB8PSBGRElfTElOS19UUkFJTl9QQVRURVJOXzFfSVZCOwogCQl0ZW1wICY9 IH5GRElfTElOS19UUkFJTl9WT0xfRU1QX01BU0s7CiAJCXRlbXAgfD0gc25iX2JfZmRpX3RyYWlu X3BhcmFtW2ovMl07CkBAIC00NDM4LDEyICs0NDM0LDEyIEBAIHN0YXRpYyB2b2lkIGl2eWJyaWRn ZV91cGRhdGVfZmRpX2JjX2JpZnVyY2F0aW9uKHN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRj KQogCiAvKiBSZXR1cm4gd2hpY2ggRFAgUG9ydCBzaG91bGQgYmUgc2VsZWN0ZWQgZm9yIFRyYW5z Y29kZXIgRFAgY29udHJvbCAqLwogc3RhdGljIGVudW0gcG9ydAotaW50ZWxfdHJhbnNfZHBfcG9y dF9zZWwoc3RydWN0IGRybV9jcnRjICpjcnRjKQoraW50ZWxfdHJhbnNfZHBfcG9ydF9zZWwoc3Ry dWN0IGludGVsX2NydGMgKmNydGMpCiB7Ci0Jc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGNydGMt PmRldjsKKwlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gY3J0Yy0+YmFzZS5kZXY7CiAJc3RydWN0 IGludGVsX2VuY29kZXIgKmVuY29kZXI7CiAKLQlmb3JfZWFjaF9lbmNvZGVyX29uX2NydGMoZGV2 LCBjcnRjLCBlbmNvZGVyKSB7CisJZm9yX2VhY2hfZW5jb2Rlcl9vbl9jcnRjKGRldiwgJmNydGMt PmJhc2UsIGVuY29kZXIpIHsKIAkJaWYgKGVuY29kZXItPnR5cGUgPT0gSU5URUxfT1VUUFVUX0RQ IHx8CiAJCSAgICBlbmNvZGVyLT50eXBlID09IElOVEVMX09VVFBVVF9FRFApCiAJCQlyZXR1cm4g ZW5jX3RvX2RpZ19wb3J0KCZlbmNvZGVyLT5iYXNlKS0+cG9ydDsKQEAgLTQ0NjAsMTggKzQ0NTYs MTcgQEAgaW50ZWxfdHJhbnNfZHBfcG9ydF9zZWwoc3RydWN0IGRybV9jcnRjICpjcnRjKQogICog ICAtIERQIHRyYW5zY29kaW5nIGJpdHMKICAqICAgLSB0cmFuc2NvZGVyCiAgKi8KLXN0YXRpYyB2 b2lkIGlyb25sYWtlX3BjaF9lbmFibGUoc3RydWN0IGRybV9jcnRjICpjcnRjKQorc3RhdGljIHZv aWQgaXJvbmxha2VfcGNoX2VuYWJsZShzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YykKIHsKLQlzdHJ1 Y3QgZHJtX2RldmljZSAqZGV2ID0gY3J0Yy0+ZGV2OworCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYg PSBjcnRjLT5iYXNlLmRldjsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0 b19pOTE1KGRldik7Ci0Jc3RydWN0IGludGVsX2NydGMgKmludGVsX2NydGMgPSB0b19pbnRlbF9j cnRjKGNydGMpOwotCWludCBwaXBlID0gaW50ZWxfY3J0Yy0+cGlwZTsKKwlpbnQgcGlwZSA9IGNy dGMtPnBpcGU7CiAJdTMyIHRlbXA7CiAKIAlhc3NlcnRfcGNoX3RyYW5zY29kZXJfZGlzYWJsZWQo ZGV2X3ByaXYsIHBpcGUpOwogCiAJaWYgKElTX0lWWUJSSURHRShkZXZfcHJpdikpCi0JCWl2eWJy aWRnZV91cGRhdGVfZmRpX2JjX2JpZnVyY2F0aW9uKGludGVsX2NydGMpOworCQlpdnlicmlkZ2Vf dXBkYXRlX2ZkaV9iY19iaWZ1cmNhdGlvbihjcnRjKTsKIAogCS8qIFdyaXRlIHRoZSBUVSBzaXpl IGJpdHMgYmVmb3JlIGZkaSBsaW5rIHRyYWluaW5nLCBzbyB0aGF0IGVycm9yCiAJICogZGV0ZWN0 aW9uIHdvcmtzLiAqLwpAQCAtNDQ4OSw3ICs0NDg0LDcgQEAgc3RhdGljIHZvaWQgaXJvbmxha2Vf cGNoX2VuYWJsZShzdHJ1Y3QgZHJtX2NydGMgKmNydGMpCiAJCXRlbXAgPSBJOTE1X1JFQUQoUENI X0RQTExfU0VMKTsKIAkJdGVtcCB8PSBUUkFOU19EUExMX0VOQUJMRShwaXBlKTsKIAkJc2VsID0g VFJBTlNfRFBMTEJfU0VMKHBpcGUpOwotCQlpZiAoaW50ZWxfY3J0Yy0+Y29uZmlnLT5zaGFyZWRf ZHBsbCA9PQorCQlpZiAoY3J0Yy0+Y29uZmlnLT5zaGFyZWRfZHBsbCA9PQogCQkgICAgaW50ZWxf Z2V0X3NoYXJlZF9kcGxsX2J5X2lkKGRldl9wcml2LCBEUExMX0lEX1BDSF9QTExfQikpCiAJCQl0 ZW1wIHw9IHNlbDsKIAkJZWxzZQpAQCAtNDUwNCwxOSArNDQ5OSwxOSBAQCBzdGF0aWMgdm9pZCBp cm9ubGFrZV9wY2hfZW5hYmxlKHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKIAkgKiBOb3RlIHRoYXQg ZW5hYmxlX3NoYXJlZF9kcGxsIHRyaWVzIHRvIGRvIHRoZSByaWdodCB0aGluZywgYnV0CiAJICog Z2V0X3NoYXJlZF9kcGxsIHVuY29uZGl0aW9uYWxseSByZXNldHMgdGhlIHBsbCAtIHdlIG5lZWQg dGhhdCB0byBoYXZlCiAJICogdGhlIHJpZ2h0IExWRFMgZW5hYmxlIHNlcXVlbmNlLiAqLwotCWlu dGVsX2VuYWJsZV9zaGFyZWRfZHBsbChpbnRlbF9jcnRjKTsKKwlpbnRlbF9lbmFibGVfc2hhcmVk X2RwbGwoY3J0Yyk7CiAKIAkvKiBzZXQgdHJhbnNjb2RlciB0aW1pbmcsIHBhbmVsIG11c3QgYWxs b3cgaXQgKi8KIAlhc3NlcnRfcGFuZWxfdW5sb2NrZWQoZGV2X3ByaXYsIHBpcGUpOwotCWlyb25s YWtlX3BjaF90cmFuc2NvZGVyX3NldF90aW1pbmdzKGludGVsX2NydGMsIHBpcGUpOworCWlyb25s YWtlX3BjaF90cmFuc2NvZGVyX3NldF90aW1pbmdzKGNydGMsIHBpcGUpOwogCiAJaW50ZWxfZmRp X25vcm1hbF90cmFpbihjcnRjKTsKIAogCS8qIEZvciBQQ0ggRFAsIGVuYWJsZSBUUkFOU19EUF9D VEwgKi8KIAlpZiAoSEFTX1BDSF9DUFQoZGV2X3ByaXYpICYmCi0JICAgIGludGVsX2NydGNfaGFz X2RwX2VuY29kZXIoaW50ZWxfY3J0Yy0+Y29uZmlnKSkgeworCSAgICBpbnRlbF9jcnRjX2hhc19k cF9lbmNvZGVyKGNydGMtPmNvbmZpZykpIHsKIAkJY29uc3Qgc3RydWN0IGRybV9kaXNwbGF5X21v ZGUgKmFkanVzdGVkX21vZGUgPQotCQkJJmludGVsX2NydGMtPmNvbmZpZy0+YmFzZS5hZGp1c3Rl ZF9tb2RlOworCQkJJmNydGMtPmNvbmZpZy0+YmFzZS5hZGp1c3RlZF9tb2RlOwogCQl1MzIgYnBj ID0gKEk5MTVfUkVBRChQSVBFQ09ORihwaXBlKSkgJiBQSVBFQ09ORl9CUENfTUFTSykgPj4gNTsK IAkJaTkxNV9yZWdfdCByZWcgPSBUUkFOU19EUF9DVEwocGlwZSk7CiAJCXRlbXAgPSBJOTE1X1JF QUQocmVnKTsKQEAgLTUyOTAsNyArNTI4NSw3IEBAIHN0YXRpYyB2b2lkIGlyb25sYWtlX2NydGNf ZW5hYmxlKHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpwaXBlX2NvbmZpZywKIAlpbnRlbF9lbmFi bGVfcGlwZShpbnRlbF9jcnRjKTsKIAogCWlmIChpbnRlbF9jcnRjLT5jb25maWctPmhhc19wY2hf ZW5jb2RlcikKLQkJaXJvbmxha2VfcGNoX2VuYWJsZShjcnRjKTsKKwkJaXJvbmxha2VfcGNoX2Vu YWJsZShpbnRlbF9jcnRjKTsKIAogCWFzc2VydF92YmxhbmtfZGlzYWJsZWQoY3J0Yyk7CiAJZHJt X2NydGNfdmJsYW5rX29uKGNydGMpOwpAQCAtNTM3Miw3ICs1MzY3LDcgQEAgc3RhdGljIHZvaWQg aGFzd2VsbF9jcnRjX2VuYWJsZShzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqcGlwZV9jb25maWcs CiAJaW50ZWxfZW5jb2RlcnNfcHJlX2VuYWJsZShjcnRjLCBwaXBlX2NvbmZpZywgb2xkX3N0YXRl KTsKIAogCWlmIChpbnRlbF9jcnRjLT5jb25maWctPmhhc19wY2hfZW5jb2RlcikKLQkJZGV2X3By aXYtPmRpc3BsYXkuZmRpX2xpbmtfdHJhaW4oY3J0Yyk7CisJCWRldl9wcml2LT5kaXNwbGF5LmZk aV9saW5rX3RyYWluKGludGVsX2NydGMpOwogCiAJaWYgKCF0cmFuc2NvZGVyX2lzX2RzaShjcHVf dHJhbnNjb2RlcikpCiAJCWludGVsX2RkaV9lbmFibGVfcGlwZV9jbG9jayhpbnRlbF9jcnRjKTsK ZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKaW5kZXggOTA3ZmIwMC4uYWNlNTYwOCAxMDA2NDQKLS0t IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfZHJ2LmgKQEAgLTEyMjUsNyArMTIyNSw3IEBAIHZvaWQgaW50ZWxfZGRpX2Zk aV9wb3N0X2Rpc2FibGUoc3RydWN0IGludGVsX2VuY29kZXIgKmludGVsX2VuY29kZXIsCiAJCQkJ c3RydWN0IGludGVsX2NydGNfc3RhdGUgKm9sZF9jcnRjX3N0YXRlLAogCQkJCXN0cnVjdCBkcm1f Y29ubmVjdG9yX3N0YXRlICpvbGRfY29ubl9zdGF0ZSk7CiB2b2lkIGludGVsX3ByZXBhcmVfZHBf ZGRpX2J1ZmZlcnMoc3RydWN0IGludGVsX2VuY29kZXIgKmVuY29kZXIpOwotdm9pZCBoc3dfZmRp X2xpbmtfdHJhaW4oc3RydWN0IGRybV9jcnRjICpjcnRjKTsKK3ZvaWQgaHN3X2ZkaV9saW5rX3Ry YWluKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjKTsKIHZvaWQgaW50ZWxfZGRpX2luaXQoc3RydWN0 IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LCBlbnVtIHBvcnQgcG9ydCk7CiBlbnVtIHBvcnQg aW50ZWxfZGRpX2dldF9lbmNvZGVyX3BvcnQoc3RydWN0IGludGVsX2VuY29kZXIgKmludGVsX2Vu Y29kZXIpOwogYm9vbCBpbnRlbF9kZGlfZ2V0X2h3X3N0YXRlKHN0cnVjdCBpbnRlbF9lbmNvZGVy ICplbmNvZGVyLCBlbnVtIHBpcGUgKnBpcGUpOwotLSAKMi45LjMKCl9fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50 ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9y Zy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=