From: Ville Syrjala Subject: [PATCH v5 2/6] drm/i915: Stop frobbing with DDI encoder->type Date: Fri, 27 Oct 2017 22:31:24 +0300 Message-ID: <20171027193128.14483-3-ville.syrjala@linux.intel.com> References: <20171027193128.14483-1-ville.syrjala@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTPS id 46CDA6E31E for ; Fri, 27 Oct 2017 19:31:54 +0000 (UTC) In-Reply-To: <20171027193128.14483-1-ville.syrjala@linux.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 List-Id: intel-gfx@lists.freedesktop.org RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KCkN1 cnJlbnRseSB0aGUgRERJIGVuY29kZXItPnR5cGUgd2lsbCBjaGFuZ2UgYXQgcnVudGltZSBkZXBl bmRpbmcgb24Kd2hhdCBraW5kIG9mIGhvdHBsdWdzIHdlJ3ZlIHByb2Nlc3NlZC4gVGhhdCdzIHF1 aXRlIGJhZCBzaW5jZSB3ZSBjYW4ndApyZWFsbHkgdHJ1c3QgdGhhdCB0aGF0IGN1cnJlbnQgdmFs dWUgb2YgZW5jb2Rlci0+dHlwZSBhY3R1YWxseSBtYXRjaGVzCnRoZSB0eXBlIG9mIHNpZ25hbCB3 ZSdyZSB0cnlpbmcgdG8gZHJpdmUgdGhyb3VnaCBpdC4KCkxldCdzIGVsaW1pbmF0ZSB0aGF0IHBy b2JsZW0gYnkgZGVjbGFyaW5nIHRoYXQgbm9uLWVEUCBEREkgcG9ydCB3aWxsCmFsd2F5cyBoYXZl IHRoZSBlbmNvZGVyIHR5cGUgYXMgSU5URUxfT1VUUFVUX0RESS4gVGhpcyBtZWFucyB0aGUgY29k ZQpjYW4gbm8gbG9uZ2VyIHRyeSB0byBkaXN0aW5ndWlzaCBEUCB2cy4gSERNSSBiYXNlZCBvbiBl bmNvZGVyLT50eXBlLgpXZSdsbCBsZWF2ZSBlRFAgYXMgSU5URUxfT1VUUFVUX0VEUCwgc2luY2Ug aXQnbGwgbmV2ZXIgY2hhbmdlIGFuZAp0aGVyZSdzIGEgYnVuY2ggb2YgY29kZSB0aGF0IHJlbGll cyBvbiB0aGF0IHZhbHVlIHRvIGlkZW50aWZ5IGVEUAplbmNvZGVycy4KCldlJ2xsIGludHJvZHVj ZSBhIG5ldyBlbmNvZGVyIC5jb21wdXRlX291dHB1dF90eXBlKCkgaG9vay4gVGhpcyBhbGxvd3MK dXMgdG8gY29tcHV0ZSB0aGUgZnVsbCBvdXRwdXRfdHlwZXMgYmVmb3JlIGFueSBlbmNvZGVyIC5j b21wdXRlX2NvbmZpZygpCmhvb2tzIGdldCBjYWxsZWQsIHRodXMgdGhvc2UgaG9va3MgY2FuIHJl bHkgb24gb3V0cHV0X3R5cGVzIGJlaW5nCmNvcnJlY3QsIHdoaWNoIGlzIHVzZWZ1bCBmb3IgY2xv bmluZyBvbiBvbGRyIHBsYXRmb3Jtcy4gRm9yIG5vdyB3ZSdsbApqdXN0IGxvb2sgYXQgdGhlIGNv bm5lY3RvciB0eXBlIGFuZCBwaWNrIHRoZSBjb3JyZWN0IG1vZGUgYmFzZWQgb24gdGhhdC4KSW4g dGhlIGZ1dHVyZSB0aGUgbmV3IGhvb2sgY291bGQgYmUgdXNlZCB0byBpbXBsZW1lbnQgZHluYW1p YyBzd2l0Y2hpbmcKYmV0d2VlbiBMUyBhbmQgUENPTiBtb2RlcyBmb3IgTFNQQ09OLgoKdjI6IEZp eCBCWFQvR0xLIFBQUyBleHBsb3Npb24gd2l0aCBEU0kvTVNUIGVuY29kZXJzCnYzOiBBdm9pZCB0 aGUgUFBTIHdhcm4gb24gcHVyZSBIRE1JL0RWSSBEREkgZW5jb2RlcnMgYnkgY2hlY2tpbmcgZHAu b3V0cHV0X3JlZwp2NDogUmViYXNlCnY1OiBQb3B1bGF0ZSBvdXRwdXRfdHlwZXMgaW4gLmdldF9j b25maWcoKSByYXRoZXIgdGhhbiBpbiB0aGUgY2FsbGVyCnY1OiBTcGxpdCBvdXQgcG9wdWxhdGlu ZyBvdXRwdXRfdHlwZXMgaW4gLmdldF9jb25maWcoKSAoTWFhcnRlbikKCkNjOiBNYWFydGVuIExh bmtob3JzdCA8bWFhcnRlbi5sYW5raG9yc3RAbGludXguaW50ZWwuY29tPgpTaWduZWQtb2ZmLWJ5 OiBWaWxsZSBTeXJqw6Rsw6QgPHZpbGxlLnN5cmphbGFAbGludXguaW50ZWwuY29tPgotLS0KIGRy aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZGVidWdmcy5jICAgfCAgMiArLQogZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfZGRpLmMgICAgICB8IDMyICsrKysrKysrKysrKysrKysrKysrKysrKy0t LS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgIHwgMTEgKysrKysr KystLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwLmMgICAgICAgfCAxOSArKysrKyst LS0tLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaCAgICAgIHwgIDcg KysrKystLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfaGRtaS5jICAgICB8IDEwICsrLS0t LS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX29wcmVnaW9uLmMgfCAgMiArLQogNyBm aWxlcyBjaGFuZ2VkLCA0NyBpbnNlcnRpb25zKCspLCAzNiBkZWxldGlvbnMoLSkKCmRpZmYgLS1n aXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYyBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZGVidWdmcy5jCmluZGV4IGMxZTViYmE5MWJmZi4uMzk4ODNjZDkxNWRiIDEw MDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYworKysgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYwpAQCAtMzA1MSw3ICszMDUxLDcgQEAgc3Rh dGljIHZvaWQgaW50ZWxfY29ubmVjdG9yX2luZm8oc3RydWN0IHNlcV9maWxlICptLAogCQlicmVh azsKIAljYXNlIERSTV9NT0RFX0NPTk5FQ1RPUl9IRE1JQToKIAkJaWYgKGludGVsX2VuY29kZXIt PnR5cGUgPT0gSU5URUxfT1VUUFVUX0hETUkgfHwKLQkJICAgIGludGVsX2VuY29kZXItPnR5cGUg PT0gSU5URUxfT1VUUFVUX1VOS05PV04pCisJCSAgICBpbnRlbF9lbmNvZGVyLT50eXBlID09IElO VEVMX09VVFBVVF9EREkpCiAJCQlpbnRlbF9oZG1pX2luZm8obSwgaW50ZWxfY29ubmVjdG9yKTsK IAkJYnJlYWs7CiAJZGVmYXVsdDoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2RkaS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGRpLmMKaW5kZXggN2UwYjFh MDI5MTJhLi5lNWRkMjgxNzgxZmUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2RkaS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RkaS5jCkBAIC00OTcs MTAgKzQ5Nyw4IEBAIGVudW0gcG9ydCBpbnRlbF9kZGlfZ2V0X2VuY29kZXJfcG9ydChzdHJ1Y3Qg aW50ZWxfZW5jb2RlciAqZW5jb2RlcikKIAlzd2l0Y2ggKGVuY29kZXItPnR5cGUpIHsKIAljYXNl IElOVEVMX09VVFBVVF9EUF9NU1Q6CiAJCXJldHVybiBlbmNfdG9fbXN0KCZlbmNvZGVyLT5iYXNl KS0+cHJpbWFyeS0+cG9ydDsKLQljYXNlIElOVEVMX09VVFBVVF9EUDoKIAljYXNlIElOVEVMX09V VFBVVF9FRFA6Ci0JY2FzZSBJTlRFTF9PVVRQVVRfSERNSToKLQljYXNlIElOVEVMX09VVFBVVF9V TktOT1dOOgorCWNhc2UgSU5URUxfT1VUUFVUX0RESToKIAkJcmV0dXJuIGVuY190b19kaWdfcG9y dCgmZW5jb2Rlci0+YmFzZSktPnBvcnQ7CiAJY2FzZSBJTlRFTF9PVVRQVVRfQU5BTE9HOgogCQly ZXR1cm4gUE9SVF9FOwpAQCAtMTUzNCw2ICsxNTMyLDcgQEAgdm9pZCBpbnRlbF9kZGlfc2V0X3Zj X3BheWxvYWRfYWxsb2MoY29uc3Qgc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNfc3RhdGUs CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShjcnRjLT5iYXNl LmRldik7CiAJZW51bSB0cmFuc2NvZGVyIGNwdV90cmFuc2NvZGVyID0gY3J0Y19zdGF0ZS0+Y3B1 X3RyYW5zY29kZXI7CiAJdWludDMyX3QgdGVtcDsKKwogCXRlbXAgPSBJOTE1X1JFQUQoVFJBTlNf RERJX0ZVTkNfQ1RMKGNwdV90cmFuc2NvZGVyKSk7CiAJaWYgKHN0YXRlID09IHRydWUpCiAJCXRl bXAgfD0gVFJBTlNfRERJX0RQX1ZDX1BBWUxPQURfQUxMT0M7CkBAIC0yNjUyLDIxICsyNjUxLDM2 IEBAIHZvaWQgaW50ZWxfZGRpX2dldF9jb25maWcoc3RydWN0IGludGVsX2VuY29kZXIgKmVuY29k ZXIsCiAJaW50ZWxfZGRpX2NvbXB1dGVfbWluX3ZvbHRhZ2VfbGV2ZWwoZGV2X3ByaXYsIHBpcGVf Y29uZmlnKTsKIH0KIAorc3RhdGljIGVudW0gaW50ZWxfb3V0cHV0X3R5cGUKK2ludGVsX2RkaV9j b21wdXRlX291dHB1dF90eXBlKHN0cnVjdCBpbnRlbF9lbmNvZGVyICplbmNvZGVyLAorCQkJICAg ICAgc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNfc3RhdGUsCisJCQkgICAgICBzdHJ1Y3Qg ZHJtX2Nvbm5lY3Rvcl9zdGF0ZSAqY29ubl9zdGF0ZSkKK3sKKwlzd2l0Y2ggKGNvbm5fc3RhdGUt PmNvbm5lY3Rvci0+Y29ubmVjdG9yX3R5cGUpIHsKKwljYXNlIERSTV9NT0RFX0NPTk5FQ1RPUl9I RE1JQToKKwkJcmV0dXJuIElOVEVMX09VVFBVVF9IRE1JOworCWNhc2UgRFJNX01PREVfQ09OTkVD VE9SX2VEUDoKKwkJcmV0dXJuIElOVEVMX09VVFBVVF9FRFA7CisJY2FzZSBEUk1fTU9ERV9DT05O RUNUT1JfRGlzcGxheVBvcnQ6CisJCXJldHVybiBJTlRFTF9PVVRQVVRfRFA7CisJZGVmYXVsdDoK KwkJTUlTU0lOR19DQVNFKGNvbm5fc3RhdGUtPmNvbm5lY3Rvci0+Y29ubmVjdG9yX3R5cGUpOwor CQlyZXR1cm4gSU5URUxfT1VUUFVUX1VOVVNFRDsKKwl9Cit9CisKIHN0YXRpYyBib29sIGludGVs X2RkaV9jb21wdXRlX2NvbmZpZyhzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqZW5jb2RlciwKIAkJCQkg ICAgIHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpwaXBlX2NvbmZpZywKIAkJCQkgICAgIHN0cnVj dCBkcm1fY29ubmVjdG9yX3N0YXRlICpjb25uX3N0YXRlKQogewogCXN0cnVjdCBkcm1faTkxNV9w cml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoZW5jb2Rlci0+YmFzZS5kZXYpOwotCWludCB0eXBl ID0gZW5jb2Rlci0+dHlwZTsKIAlpbnQgcG9ydCA9IGludGVsX2RkaV9nZXRfZW5jb2Rlcl9wb3J0 KGVuY29kZXIpOwogCWludCByZXQ7CiAKLQlXQVJOKHR5cGUgPT0gSU5URUxfT1VUUFVUX1VOS05P V04sICJjb21wdXRlX2NvbmZpZygpIG9uIHVua25vd24gb3V0cHV0IVxuIik7Ci0KIAlpZiAocG9y dCA9PSBQT1JUX0EpCiAJCXBpcGVfY29uZmlnLT5jcHVfdHJhbnNjb2RlciA9IFRSQU5TQ09ERVJf RURQOwogCi0JaWYgKHR5cGUgPT0gSU5URUxfT1VUUFVUX0hETUkpCisJaWYgKGludGVsX2NydGNf aGFzX3R5cGUocGlwZV9jb25maWcsIElOVEVMX09VVFBVVF9IRE1JKSkKIAkJcmV0ID0gaW50ZWxf aGRtaV9jb21wdXRlX2NvbmZpZyhlbmNvZGVyLCBwaXBlX2NvbmZpZywgY29ubl9zdGF0ZSk7CiAJ ZWxzZQogCQlyZXQgPSBpbnRlbF9kcF9jb21wdXRlX2NvbmZpZyhlbmNvZGVyLCBwaXBlX2NvbmZp ZywgY29ubl9zdGF0ZSk7CkBAIC0yODE1LDYgKzI4MjksNyBAQCB2b2lkIGludGVsX2RkaV9pbml0 KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwgZW51bSBwb3J0IHBvcnQpCiAJZHJt X2VuY29kZXJfaW5pdCgmZGV2X3ByaXYtPmRybSwgZW5jb2RlciwgJmludGVsX2RkaV9mdW5jcywK IAkJCSBEUk1fTU9ERV9FTkNPREVSX1RNRFMsICJEREkgJWMiLCBwb3J0X25hbWUocG9ydCkpOwog CisJaW50ZWxfZW5jb2Rlci0+Y29tcHV0ZV9vdXRwdXRfdHlwZSA9IGludGVsX2RkaV9jb21wdXRl X291dHB1dF90eXBlOwogCWludGVsX2VuY29kZXItPmNvbXB1dGVfY29uZmlnID0gaW50ZWxfZGRp X2NvbXB1dGVfY29uZmlnOwogCWludGVsX2VuY29kZXItPmVuYWJsZSA9IGludGVsX2VuYWJsZV9k ZGk7CiAJaWYgKElTX0dFTjlfTFAoZGV2X3ByaXYpKQpAQCAtMjg2OCw5ICsyODgzLDEwIEBAIHZv aWQgaW50ZWxfZGRpX2luaXQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LCBlbnVt IHBvcnQgcG9ydCkKIAkJbWF4X2xhbmVzID0gNDsKIAl9CiAKKwlpbnRlbF9kaWdfcG9ydC0+ZHAu b3V0cHV0X3JlZyA9IElOVkFMSURfTU1JT19SRUc7CiAJaW50ZWxfZGlnX3BvcnQtPm1heF9sYW5l cyA9IG1heF9sYW5lczsKIAotCWludGVsX2VuY29kZXItPnR5cGUgPSBJTlRFTF9PVVRQVVRfVU5L Tk9XTjsKKwlpbnRlbF9lbmNvZGVyLT50eXBlID0gSU5URUxfT1VUUFVUX0RESTsKIAlpbnRlbF9l bmNvZGVyLT5wb3dlcl9kb21haW4gPSBpbnRlbF9wb3J0X3RvX3Bvd2VyX2RvbWFpbihwb3J0KTsK IAlpbnRlbF9lbmNvZGVyLT5wb3J0ID0gcG9ydDsKIAlpbnRlbF9lbmNvZGVyLT5jcnRjX21hc2sg PSAoMSA8PCAwKSB8ICgxIDw8IDEpIHwgKDEgPDwgMik7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9k aXNwbGF5LmMKaW5kZXggOGY3NjllOWI5MzQyLi43MzdkZTI1MWQwZjggMTAwNjQ0Ci0tLSBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9kaXNwbGF5LmMKQEAgLTEwNTc5LDcgKzEwNTc5LDcgQEAgc3RhdGljIGNvbnN0 IGNoYXIgKiBjb25zdCBvdXRwdXRfdHlwZV9zdHJbXSA9IHsKIAlPVVRQVVRfVFlQRShEUCksCiAJ T1VUUFVUX1RZUEUoRURQKSwKIAlPVVRQVVRfVFlQRShEU0kpLAotCU9VVFBVVF9UWVBFKFVOS05P V04pLAorCU9VVFBVVF9UWVBFKERESSksCiAJT1VUUFVUX1RZUEUoRFBfTVNUKSwKIH07CiAKQEAg LTEwNzUwLDcgKzEwNzUwLDcgQEAgc3RhdGljIGJvb2wgY2hlY2tfZGlnaXRhbF9wb3J0X2NvbmZs aWN0cyhzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGUpCiAKIAkJc3dpdGNoIChlbmNvZGVy LT50eXBlKSB7CiAJCQl1bnNpZ25lZCBpbnQgcG9ydF9tYXNrOwotCQljYXNlIElOVEVMX09VVFBV VF9VTktOT1dOOgorCQljYXNlIElOVEVMX09VVFBVVF9EREk6CiAJCQlpZiAoV0FSTl9PTighSEFT X0RESSh0b19pOTE1KGRldikpKSkKIAkJCQlicmVhazsKIAkJY2FzZSBJTlRFTF9PVVRQVVRfRFA6 CkBAIC0xMDg4Myw3ICsxMDg4MywxMiBAQCBpbnRlbF9tb2Rlc2V0X3BpcGVfY29uZmlnKHN0cnVj dCBkcm1fY3J0YyAqY3J0YywKIAkJICogRGV0ZXJtaW5lIG91dHB1dF90eXBlcyBiZWZvcmUgY2Fs bGluZyB0aGUgLmNvbXB1dGVfY29uZmlnKCkKIAkJICogaG9va3Mgc28gdGhhdCB0aGUgaG9va3Mg Y2FuIHVzZSB0aGlzIGluZm9ybWF0aW9uIHNhZmVseS4KIAkJICovCi0JCXBpcGVfY29uZmlnLT5v dXRwdXRfdHlwZXMgfD0gMSA8PCBlbmNvZGVyLT50eXBlOworCQlpZiAoZW5jb2Rlci0+Y29tcHV0 ZV9vdXRwdXRfdHlwZSkKKwkJCXBpcGVfY29uZmlnLT5vdXRwdXRfdHlwZXMgfD0KKwkJCQlCSVQo ZW5jb2Rlci0+Y29tcHV0ZV9vdXRwdXRfdHlwZShlbmNvZGVyLCBwaXBlX2NvbmZpZywKKwkJCQkJ CQkJIGNvbm5lY3Rvcl9zdGF0ZSkpOworCQllbHNlCisJCQlwaXBlX2NvbmZpZy0+b3V0cHV0X3R5 cGVzIHw9IEJJVChlbmNvZGVyLT50eXBlKTsKIAl9CiAKIGVuY29kZXJfcmV0cnk6CmRpZmYgLS1n aXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcC5jIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfZHAuYwppbmRleCAzMDY4OGE1ZDY4MGQuLmYwYzQ5OTYyZmZiZSAxMDA2NDQKLS0t IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHAuYworKysgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9kcC5jCkBAIC03NTgsMTEgKzc1OCwxNiBAQCB2b2lkIGludGVsX3Bvd2VyX3Nl cXVlbmNlcl9yZXNldChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJCXN0cnVj dCBpbnRlbF9kcCAqaW50ZWxfZHA7CiAKIAkJaWYgKGVuY29kZXItPnR5cGUgIT0gSU5URUxfT1VU UFVUX0RQICYmCi0JCSAgICBlbmNvZGVyLT50eXBlICE9IElOVEVMX09VVFBVVF9FRFApCisJCSAg ICBlbmNvZGVyLT50eXBlICE9IElOVEVMX09VVFBVVF9FRFAgJiYKKwkJICAgIGVuY29kZXItPnR5 cGUgIT0gSU5URUxfT1VUUFVUX0RESSkKIAkJCWNvbnRpbnVlOwogCiAJCWludGVsX2RwID0gZW5j X3RvX2ludGVsX2RwKCZlbmNvZGVyLT5iYXNlKTsKIAorCQkvKiBTa2lwIHB1cmUgRFZJL0hETUkg RERJIGVuY29kZXJzICovCisJCWlmICghaTkxNV9tbWlvX3JlZ192YWxpZChpbnRlbF9kcC0+b3V0 cHV0X3JlZykpCisJCQljb250aW51ZTsKKwogCQlXQVJOX09OKGludGVsX2RwLT5hY3RpdmVfcGlw ZSAhPSBJTlZBTElEX1BJUEUpOwogCiAJCWlmIChlbmNvZGVyLT50eXBlICE9IElOVEVMX09VVFBV VF9FRFApCkBAIC00NzMzLDggKzQ3MzgsNiBAQCBpbnRlbF9kcF9sb25nX3B1bHNlKHN0cnVjdCBp bnRlbF9jb25uZWN0b3IgKmludGVsX2Nvbm5lY3RvcikKIHsKIAlzdHJ1Y3QgZHJtX2Nvbm5lY3Rv ciAqY29ubmVjdG9yID0gJmludGVsX2Nvbm5lY3Rvci0+YmFzZTsKIAlzdHJ1Y3QgaW50ZWxfZHAg KmludGVsX2RwID0gaW50ZWxfYXR0YWNoZWRfZHAoY29ubmVjdG9yKTsKLQlzdHJ1Y3QgaW50ZWxf ZGlnaXRhbF9wb3J0ICppbnRlbF9kaWdfcG9ydCA9IGRwX3RvX2RpZ19wb3J0KGludGVsX2RwKTsK LQlzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqaW50ZWxfZW5jb2RlciA9ICZpbnRlbF9kaWdfcG9ydC0+ YmFzZTsKIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gY29ubmVjdG9yLT5kZXY7CiAJZW51bSBk cm1fY29ubmVjdG9yX3N0YXR1cyBzdGF0dXM7CiAJdTggc2lua19pcnFfdmVjdG9yID0gMDsKQEAg LTQ3NjcsOSArNDc3MCw2IEBAIGludGVsX2RwX2xvbmdfcHVsc2Uoc3RydWN0IGludGVsX2Nvbm5l Y3RvciAqaW50ZWxfY29ubmVjdG9yKQogCQlnb3RvIG91dDsKIAl9CiAKLQlpZiAoaW50ZWxfZW5j b2Rlci0+dHlwZSAhPSBJTlRFTF9PVVRQVVRfRURQKQotCQlpbnRlbF9lbmNvZGVyLT50eXBlID0g SU5URUxfT1VUUFVUX0RQOwotCiAJaWYgKGludGVsX2RwLT5yZXNldF9saW5rX3BhcmFtcykgewog CQkvKiBJbml0aWFsIG1heCBsaW5rIGxhbmUgY291bnQgKi8KIAkJaW50ZWxfZHAtPm1heF9saW5r X2xhbmVfY291bnQgPSBpbnRlbF9kcF9tYXhfY29tbW9uX2xhbmVfY291bnQoaW50ZWxfZHApOwpA QCAtNDg4Niw5ICs0ODg2LDYgQEAgaW50ZWxfZHBfZm9yY2Uoc3RydWN0IGRybV9jb25uZWN0b3Ig KmNvbm5lY3RvcikKIAlpbnRlbF9kcF9zZXRfZWRpZChpbnRlbF9kcCk7CiAKIAlpbnRlbF9kaXNw bGF5X3Bvd2VyX3B1dChkZXZfcHJpdiwgaW50ZWxfZHAtPmF1eF9wb3dlcl9kb21haW4pOwotCi0J aWYgKGludGVsX2VuY29kZXItPnR5cGUgIT0gSU5URUxfT1VUUFVUX0VEUCkKLQkJaW50ZWxfZW5j b2Rlci0+dHlwZSA9IElOVEVMX09VVFBVVF9EUDsKIH0KIAogc3RhdGljIGludCBpbnRlbF9kcF9n ZXRfbW9kZXMoc3RydWN0IGRybV9jb25uZWN0b3IgKmNvbm5lY3RvcikKQEAgLTUxMDcsMTAgKzUx MDQsNiBAQCBpbnRlbF9kcF9ocGRfcHVsc2Uoc3RydWN0IGludGVsX2RpZ2l0YWxfcG9ydCAqaW50 ZWxfZGlnX3BvcnQsIGJvb2wgbG9uZ19ocGQpCiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRl dl9wcml2ID0gdG9faTkxNShkZXYpOwogCWVudW0gaXJxcmV0dXJuIHJldCA9IElSUV9OT05FOwog Ci0JaWYgKGludGVsX2RpZ19wb3J0LT5iYXNlLnR5cGUgIT0gSU5URUxfT1VUUFVUX0VEUCAmJgot CSAgICBpbnRlbF9kaWdfcG9ydC0+YmFzZS50eXBlICE9IElOVEVMX09VVFBVVF9IRE1JKQotCQlp bnRlbF9kaWdfcG9ydC0+YmFzZS50eXBlID0gSU5URUxfT1VUUFVUX0RQOwotCiAJaWYgKGxvbmdf aHBkICYmIGludGVsX2RpZ19wb3J0LT5iYXNlLnR5cGUgPT0gSU5URUxfT1VUUFVUX0VEUCkgewog CQkvKgogCQkgKiB2ZGQgb2ZmIGNhbiBnZW5lcmF0ZSBhIGxvbmcgcHVsc2Ugb24gZURQIHdoaWNo CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaCBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCmluZGV4IGRmOTY2NDI3MjMyYy4uNjI5ZWJjNzNiYjA5 IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaAorKysgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaApAQCAtMTczLDcgKzE3Myw3IEBAIGVudW0gaW50 ZWxfb3V0cHV0X3R5cGUgewogCUlOVEVMX09VVFBVVF9EUCA9IDcsCiAJSU5URUxfT1VUUFVUX0VE UCA9IDgsCiAJSU5URUxfT1VUUFVUX0RTSSA9IDksCi0JSU5URUxfT1VUUFVUX1VOS05PV04gPSAx MCwKKwlJTlRFTF9PVVRQVVRfRERJID0gMTAsCiAJSU5URUxfT1VUUFVUX0RQX01TVCA9IDExLAog fTsKIApAQCAtMjE2LDYgKzIxNiw5IEBAIHN0cnVjdCBpbnRlbF9lbmNvZGVyIHsKIAllbnVtIHBv cnQgcG9ydDsKIAl1bnNpZ25lZCBpbnQgY2xvbmVhYmxlOwogCXZvaWQgKCpob3RfcGx1Zykoc3Ry dWN0IGludGVsX2VuY29kZXIgKik7CisJZW51bSBpbnRlbF9vdXRwdXRfdHlwZSAoKmNvbXB1dGVf b3V0cHV0X3R5cGUpKHN0cnVjdCBpbnRlbF9lbmNvZGVyICosCisJCQkJCQkgICAgICBzdHJ1Y3Qg aW50ZWxfY3J0Y19zdGF0ZSAqLAorCQkJCQkJICAgICAgc3RydWN0IGRybV9jb25uZWN0b3Jfc3Rh dGUgKik7CiAJYm9vbCAoKmNvbXB1dGVfY29uZmlnKShzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqLAog CQkJICAgICAgIHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICosCiAJCQkgICAgICAgc3RydWN0IGRy bV9jb25uZWN0b3Jfc3RhdGUgKik7CkBAIC0xMTUyLDcgKzExNTUsNyBAQCBlbmNfdG9fZGlnX3Bv cnQoc3RydWN0IGRybV9lbmNvZGVyICplbmNvZGVyKQogCXN0cnVjdCBpbnRlbF9lbmNvZGVyICpp bnRlbF9lbmNvZGVyID0gdG9faW50ZWxfZW5jb2RlcihlbmNvZGVyKTsKIAogCXN3aXRjaCAoaW50 ZWxfZW5jb2Rlci0+dHlwZSkgewotCWNhc2UgSU5URUxfT1VUUFVUX1VOS05PV046CisJY2FzZSBJ TlRFTF9PVVRQVVRfRERJOgogCQlXQVJOX09OKCFIQVNfRERJKHRvX2k5MTUoZW5jb2Rlci0+ZGV2 KSkpOwogCWNhc2UgSU5URUxfT1VUUFVUX0RQOgogCWNhc2UgSU5URUxfT1VUUFVUX0VEUDoKZGlm ZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2hkbWkuYyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2hkbWkuYwppbmRleCA5N2QwOGNkYTNmOGUuLmRlZGUyODk4Y2I4YSAx MDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfaGRtaS5jCisrKyBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2hkbWkuYwpAQCAtMTYxNywxMiArMTYxNyw5IEBAIGludGVs X2hkbWlfZGV0ZWN0KHN0cnVjdCBkcm1fY29ubmVjdG9yICpjb25uZWN0b3IsIGJvb2wgZm9yY2Up CiAKIAlpbnRlbF9oZG1pX3Vuc2V0X2VkaWQoY29ubmVjdG9yKTsKIAotCWlmIChpbnRlbF9oZG1p X3NldF9lZGlkKGNvbm5lY3RvcikpIHsKLQkJc3RydWN0IGludGVsX2hkbWkgKmludGVsX2hkbWkg PSBpbnRlbF9hdHRhY2hlZF9oZG1pKGNvbm5lY3Rvcik7Ci0KLQkJaGRtaV90b19kaWdfcG9ydChp bnRlbF9oZG1pKS0+YmFzZS50eXBlID0gSU5URUxfT1VUUFVUX0hETUk7CisJaWYgKGludGVsX2hk bWlfc2V0X2VkaWQoY29ubmVjdG9yKSkKIAkJc3RhdHVzID0gY29ubmVjdG9yX3N0YXR1c19jb25u ZWN0ZWQ7Ci0JfSBlbHNlCisJZWxzZQogCQlzdGF0dXMgPSBjb25uZWN0b3Jfc3RhdHVzX2Rpc2Nv bm5lY3RlZDsKIAogCWludGVsX2Rpc3BsYXlfcG93ZXJfcHV0KGRldl9wcml2LCBQT1dFUl9ET01B SU5fR01CVVMpOwpAQCAtMTYzMyw4ICsxNjMwLDYgQEAgaW50ZWxfaGRtaV9kZXRlY3Qoc3RydWN0 IGRybV9jb25uZWN0b3IgKmNvbm5lY3RvciwgYm9vbCBmb3JjZSkKIHN0YXRpYyB2b2lkCiBpbnRl bF9oZG1pX2ZvcmNlKHN0cnVjdCBkcm1fY29ubmVjdG9yICpjb25uZWN0b3IpCiB7Ci0Jc3RydWN0 IGludGVsX2hkbWkgKmludGVsX2hkbWkgPSBpbnRlbF9hdHRhY2hlZF9oZG1pKGNvbm5lY3Rvcik7 Ci0KIAlEUk1fREVCVUdfS01TKCJbQ09OTkVDVE9SOiVkOiVzXVxuIiwKIAkJICAgICAgY29ubmVj dG9yLT5iYXNlLmlkLCBjb25uZWN0b3ItPm5hbWUpOwogCkBAIC0xNjQ0LDcgKzE2MzksNiBAQCBp bnRlbF9oZG1pX2ZvcmNlKHN0cnVjdCBkcm1fY29ubmVjdG9yICpjb25uZWN0b3IpCiAJCXJldHVy bjsKIAogCWludGVsX2hkbWlfc2V0X2VkaWQoY29ubmVjdG9yKTsKLQloZG1pX3RvX2RpZ19wb3J0 KGludGVsX2hkbWkpLT5iYXNlLnR5cGUgPSBJTlRFTF9PVVRQVVRfSERNSTsKIH0KIAogc3RhdGlj IGludCBpbnRlbF9oZG1pX2dldF9tb2RlcyhzdHJ1Y3QgZHJtX2Nvbm5lY3RvciAqY29ubmVjdG9y KQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfb3ByZWdpb24uYyBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX29wcmVnaW9uLmMKaW5kZXggMWQ5NDYyNDBlNTVmLi4z OTcxNGJlM2ViNmIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX29wcmVn aW9uLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfb3ByZWdpb24uYwpAQCAtMzgz LDcgKzM4Myw3IEBAIGludCBpbnRlbF9vcHJlZ2lvbl9ub3RpZnlfZW5jb2RlcihzdHJ1Y3QgaW50 ZWxfZW5jb2RlciAqaW50ZWxfZW5jb2RlciwKIAljYXNlIElOVEVMX09VVFBVVF9BTkFMT0c6CiAJ CXR5cGUgPSBESVNQTEFZX1RZUEVfQ1JUOwogCQlicmVhazsKLQljYXNlIElOVEVMX09VVFBVVF9V TktOT1dOOgorCWNhc2UgSU5URUxfT1VUUFVUX0RESToKIAljYXNlIElOVEVMX09VVFBVVF9EUDoK IAljYXNlIElOVEVMX09VVFBVVF9IRE1JOgogCWNhc2UgSU5URUxfT1VUUFVUX0RQX01TVDoKLS0g CjIuMTMuNgoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18K SW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0 dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==