From: Ville Syrjala Subject: [PATCH v3 25/29] drm/i915: Stop frobbing with DDI encoder->type Date: Thu, 21 Sep 2017 17:56:36 +0300 Message-ID: <20170921145636.27342-1-ville.syrjala@linux.intel.com> References: <20170918182604.9519-26-ville.syrjala@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by gabe.freedesktop.org (Postfix) with ESMTPS id DCD0E6E1D5 for ; Thu, 21 Sep 2017 14:56:39 +0000 (UTC) In-Reply-To: <20170918182604.9519-26-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 bmNvZGVyLT50eXBlLgpXZSdsbCBlRFAgYXMgSU5URUxfT1VUUFVUX0VEUCwgc2luY2UgaXQnbGwg bmV2ZXIgY2hhbmdlIGFuZCB0aGVyZSdzIGEKYnVuY2ggb2YgY29kZSB0aGF0IHJlbGllcyBvbiB0 aGF0IHZhbHVlIHRvIGlkZW50b2Z5IGVEUC4KCldlJ2xsIGludHJvZHVjZSBhIG5ldyBlbmNvZGVy IC5jb21wdXRlX291dHB1dF90eXBlKCkgaG9vay4gVGhpcyBhbGxvd3MKdXMgdG8gY29tcHV0ZSB0 aGUgZnVsbCBvdXRwdXRfdHlwZXMgYmVmb3JlIGFueSBlbmNvZGVyIC5jb21wdXRlX2NvbmZpZygp Cmhvb2tzIGdldCBjYWxsZWQsIHRodXMgdGhvc2UgaG9va3MgY2FuIHJlbHkgb24gb3V0cHV0X3R5 cGVzIGJlaW5nCmNvcnJlY3QsIHdoaWNoIGlzIHVzZWZ1bCBmb3IgY2xvbmluZyBvbiBvbGRyIHBs YXRmb3Jtcy4gRm9yIG5vdyB3ZSdsbApqdXN0IGxvb2sgYXQgdGhlIGNvbm5lY3RvciB0eXBlIGFu ZCBwaWNrIHRoZSBjb3JyZWN0IG1vZGUgYmFzZWQgb24gdGhhdC4KSW4gdGhlIGZ1dHVyZSB0aGUg bmV3IGhvb2sgY291bGQgYmUgdXNlZCB0byBpbXBsZW1lbnQgZHluYW1pYyBzd2l0Y2hpbmcKYmV0 d2VlbiBMUyBhbmQgUENPTiBtb2RlcyBmb3IgTFNQQ09OLgoKVE9ETzogbWF5YmUgbWFrZSAuZ2V0 X2NvbmZpZygpIHBvcHVsYXRlIG91dHB1dF90eXBlcyByYXRoZXIgdGhhbiBkb2luZwp0aGUgZGVm YXVsdCBlbmNvZGVyLT50eXBlIHRoaW5nIGluIGNhbGxlciBhbmQgdGhlbiB1bmRvaW5nIGl0IGZv cgpEREkgaW4gLmdldF9jb25maWcoKS4KCnYyOiBGaXggQlhUL0dMSyBQUFMgZXhwbG9zaW9uIHdp dGggRFNJL01TVCBlbmNvZGVycwp2MzogQXZvaWQgdGhlIFBQUyB3YXJuIG9uIHB1cmUgSERNSS9E VkkgRERJIGVuY29kZXJzIGJ5IGNoZWNraW5nIGRwLm91dHB1dF9yZWcKClNpZ25lZC1vZmYtYnk6 IFZpbGxlIFN5cmrDpGzDpCA8dmlsbGUuc3lyamFsYUBsaW51eC5pbnRlbC5jb20+Ci0tLQogZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kZWJ1Z2ZzLmMgICB8ICAyICstCiBkcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9kZGkuYyAgICAgIHwgNTAgKysrKysrKysrKysrKysrKysrKysrKysrKysr KystLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyAgfCAxMSArKysr Ky0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHAuYyAgICAgICB8IDE5ICsrKysrLS0t LS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oICAgICAgfCAgNyArKystLQog ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfaGRtaS5jICAgICB8IDEwICsrLS0tLS0KIGRyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX29wcmVnaW9uLmMgfCAgMiArLQogNyBmaWxlcyBjaGFuZ2Vk LCA2NSBpbnNlcnRpb25zKCspLCAzNiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf ZGVidWdmcy5jCmluZGV4IGNhNmZhNmQxMjJjNi4uNzM2MDE0NjQyNDBkIDEwMDY0NAotLS0gYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYworKysgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2RlYnVnZnMuYwpAQCAtMzA1Myw3ICszMDUzLDcgQEAgc3RhdGljIHZvaWQgaW50 ZWxfY29ubmVjdG9yX2luZm8oc3RydWN0IHNlcV9maWxlICptLAogCQlicmVhazsKIAljYXNlIERS TV9NT0RFX0NPTk5FQ1RPUl9IRE1JQToKIAkJaWYgKGludGVsX2VuY29kZXItPnR5cGUgPT0gSU5U RUxfT1VUUFVUX0hETUkgfHwKLQkJICAgIGludGVsX2VuY29kZXItPnR5cGUgPT0gSU5URUxfT1VU UFVUX1VOS05PV04pCisJCSAgICBpbnRlbF9lbmNvZGVyLT50eXBlID09IElOVEVMX09VVFBVVF9E REkpCiAJCQlpbnRlbF9oZG1pX2luZm8obSwgaW50ZWxfY29ubmVjdG9yKTsKIAkJYnJlYWs7CiAJ ZGVmYXVsdDoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RkaS5jIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGRpLmMKaW5kZXggZDYyNWJmZTZkNDIwLi4xN2I5 YmI4MGZiMDkgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RkaS5jCisr KyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RkaS5jCkBAIC00OTcsMTAgKzQ5Nyw4IEBA IGVudW0gcG9ydCBpbnRlbF9kZGlfZ2V0X2VuY29kZXJfcG9ydChzdHJ1Y3QgaW50ZWxfZW5jb2Rl ciAqZW5jb2RlcikKIAlzd2l0Y2ggKGVuY29kZXItPnR5cGUpIHsKIAljYXNlIElOVEVMX09VVFBV VF9EUF9NU1Q6CiAJCXJldHVybiBlbmNfdG9fbXN0KCZlbmNvZGVyLT5iYXNlKS0+cHJpbWFyeS0+ cG9ydDsKLQljYXNlIElOVEVMX09VVFBVVF9EUDoKIAljYXNlIElOVEVMX09VVFBVVF9FRFA6Ci0J Y2FzZSBJTlRFTF9PVVRQVVRfSERNSToKLQljYXNlIElOVEVMX09VVFBVVF9VTktOT1dOOgorCWNh c2UgSU5URUxfT1VUUFVUX0RESToKIAkJcmV0dXJuIGVuY190b19kaWdfcG9ydCgmZW5jb2Rlci0+ YmFzZSktPnBvcnQ7CiAJY2FzZSBJTlRFTF9PVVRQVVRfQU5BTE9HOgogCQlyZXR1cm4gUE9SVF9F OwpAQCAtMTUxNiw2ICsxNTE0LDcgQEAgdm9pZCBpbnRlbF9kZGlfc2V0X3ZjX3BheWxvYWRfYWxs b2MoY29uc3Qgc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNfc3RhdGUsCiAJc3RydWN0IGRy bV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShjcnRjLT5iYXNlLmRldik7CiAJZW51 bSB0cmFuc2NvZGVyIGNwdV90cmFuc2NvZGVyID0gY3J0Y19zdGF0ZS0+Y3B1X3RyYW5zY29kZXI7 CiAJdWludDMyX3QgdGVtcDsKKwogCXRlbXAgPSBJOTE1X1JFQUQoVFJBTlNfRERJX0ZVTkNfQ1RM KGNwdV90cmFuc2NvZGVyKSk7CiAJaWYgKHN0YXRlID09IHRydWUpCiAJCXRlbXAgfD0gVFJBTlNf RERJX0RQX1ZDX1BBWUxPQURfQUxMT0M7CkBAIC0yNDg5LDYgKzI0ODgsMTMgQEAgdm9pZCBpbnRl bF9kZGlfZ2V0X2NvbmZpZyhzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqZW5jb2RlciwKIAlzdHJ1Y3Qg aW50ZWxfZGlnaXRhbF9wb3J0ICppbnRlbF9kaWdfcG9ydDsKIAl1MzIgdGVtcCwgZmxhZ3MgPSAw OwogCisJLyoKKwkgKiBDYW4gYmUgc2V0IGJ5IHRoZSBjYWxsZXIgYmFzZWQgb24gZW5jb2Rlci0+ dHlwZS4KKwkgKiBVbmRvIHRoYXQgc2luY2Ugd2UgZG9uJ3Qgd2FudCBJTlRFTF9PVVRQVVRfRERJ CisJICogdG8gYXBwZWFyIGluIG91dHB1dF90eXBlcy4KKwkgKi8KKwlwaXBlX2NvbmZpZy0+b3V0 cHV0X3R5cGVzICY9IH5CSVQoSU5URUxfT1VUUFVUX0RESSk7CisKIAkvKiBYWFg6IERTSSB0cmFu c2NvZGVyIHBhcmFub2lhICovCiAJaWYgKFdBUk5fT04odHJhbnNjb2Rlcl9pc19kc2koY3B1X3Ry YW5zY29kZXIpKSkKIAkJcmV0dXJuOwpAQCAtMjUzNywxMiArMjU0MywyMyBAQCB2b2lkIGludGVs X2RkaV9nZXRfY29uZmlnKHN0cnVjdCBpbnRlbF9lbmNvZGVyICplbmNvZGVyLAogCQkJcGlwZV9j b25maWctPmhkbWlfaGlnaF90bWRzX2Nsb2NrX3JhdGlvID0gdHJ1ZTsKIAkJLyogZmFsbCB0aHJv dWdoICovCiAJY2FzZSBUUkFOU19ERElfTU9ERV9TRUxFQ1RfRFZJOgorCQlwaXBlX2NvbmZpZy0+ b3V0cHV0X3R5cGVzIHw9IEJJVChJTlRFTF9PVVRQVVRfSERNSSk7CiAJCXBpcGVfY29uZmlnLT5s YW5lX2NvdW50ID0gNDsKIAkJYnJlYWs7CiAJY2FzZSBUUkFOU19ERElfTU9ERV9TRUxFQ1RfRkRJ OgorCQlwaXBlX2NvbmZpZy0+b3V0cHV0X3R5cGVzIHw9IEJJVChJTlRFTF9PVVRQVVRfQU5BTE9H KTsKIAkJYnJlYWs7CiAJY2FzZSBUUkFOU19ERElfTU9ERV9TRUxFQ1RfRFBfU1NUOgorCQlpZiAo ZW5jb2Rlci0+dHlwZSA9PSBJTlRFTF9PVVRQVVRfRURQKQorCQkJcGlwZV9jb25maWctPm91dHB1 dF90eXBlcyB8PSBCSVQoSU5URUxfT1VUUFVUX0VEUCk7CisJCWVsc2UKKwkJCXBpcGVfY29uZmln LT5vdXRwdXRfdHlwZXMgfD0gQklUKElOVEVMX09VVFBVVF9EUCk7CisJCXBpcGVfY29uZmlnLT5s YW5lX2NvdW50ID0KKwkJCSgodGVtcCAmIERESV9QT1JUX1dJRFRIX01BU0spID4+IERESV9QT1JU X1dJRFRIX1NISUZUKSArIDE7CisJCWludGVsX2RwX2dldF9tX24oaW50ZWxfY3J0YywgcGlwZV9j b25maWcpOworCQlicmVhazsKIAljYXNlIFRSQU5TX0RESV9NT0RFX1NFTEVDVF9EUF9NU1Q6CisJ CXBpcGVfY29uZmlnLT5vdXRwdXRfdHlwZXMgfD0gQklUKElOVEVMX09VVFBVVF9EUF9NU1QpOwog CQlwaXBlX2NvbmZpZy0+bGFuZV9jb3VudCA9CiAJCQkoKHRlbXAgJiBERElfUE9SVF9XSURUSF9N QVNLKSA+PiBERElfUE9SVF9XSURUSF9TSElGVCkgKyAxOwogCQlpbnRlbF9kcF9nZXRfbV9uKGlu dGVsX2NydGMsIHBpcGVfY29uZmlnKTsKQEAgLTI1ODEsMjEgKzI1OTgsMzYgQEAgdm9pZCBpbnRl bF9kZGlfZ2V0X2NvbmZpZyhzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqZW5jb2RlciwKIAkJCWJ4dF9k ZGlfcGh5X2dldF9sYW5lX2xhdF9vcHRpbV9tYXNrKGVuY29kZXIpOwogfQogCitzdGF0aWMgZW51 bSBpbnRlbF9vdXRwdXRfdHlwZQoraW50ZWxfZGRpX2NvbXB1dGVfb3V0cHV0X3R5cGUoc3RydWN0 IGludGVsX2VuY29kZXIgKmVuY29kZXIsCisJCQkgICAgICBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0 ZSAqY3J0Y19zdGF0ZSwKKwkJCSAgICAgIHN0cnVjdCBkcm1fY29ubmVjdG9yX3N0YXRlICpjb25u X3N0YXRlKQoreworCXN3aXRjaCAoY29ubl9zdGF0ZS0+Y29ubmVjdG9yLT5jb25uZWN0b3JfdHlw ZSkgeworCWNhc2UgRFJNX01PREVfQ09OTkVDVE9SX0hETUlBOgorCQlyZXR1cm4gSU5URUxfT1VU UFVUX0hETUk7CisJY2FzZSBEUk1fTU9ERV9DT05ORUNUT1JfZURQOgorCQlyZXR1cm4gSU5URUxf T1VUUFVUX0VEUDsKKwljYXNlIERSTV9NT0RFX0NPTk5FQ1RPUl9EaXNwbGF5UG9ydDoKKwkJcmV0 dXJuIElOVEVMX09VVFBVVF9EUDsKKwlkZWZhdWx0OgorCQlNSVNTSU5HX0NBU0UoY29ubl9zdGF0 ZS0+Y29ubmVjdG9yLT5jb25uZWN0b3JfdHlwZSk7CisJCXJldHVybiBJTlRFTF9PVVRQVVRfVU5V U0VEOworCX0KK30KKwogc3RhdGljIGJvb2wgaW50ZWxfZGRpX2NvbXB1dGVfY29uZmlnKHN0cnVj dCBpbnRlbF9lbmNvZGVyICplbmNvZGVyLAogCQkJCSAgICAgc3RydWN0IGludGVsX2NydGNfc3Rh dGUgKnBpcGVfY29uZmlnLAogCQkJCSAgICAgc3RydWN0IGRybV9jb25uZWN0b3Jfc3RhdGUgKmNv bm5fc3RhdGUpCiB7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkx NShlbmNvZGVyLT5iYXNlLmRldik7Ci0JaW50IHR5cGUgPSBlbmNvZGVyLT50eXBlOwogCWludCBw b3J0ID0gaW50ZWxfZGRpX2dldF9lbmNvZGVyX3BvcnQoZW5jb2Rlcik7CiAJaW50IHJldDsKIAot CVdBUk4odHlwZSA9PSBJTlRFTF9PVVRQVVRfVU5LTk9XTiwgImNvbXB1dGVfY29uZmlnKCkgb24g dW5rbm93biBvdXRwdXQhXG4iKTsKLQogCWlmIChwb3J0ID09IFBPUlRfQSkKIAkJcGlwZV9jb25m aWctPmNwdV90cmFuc2NvZGVyID0gVFJBTlNDT0RFUl9FRFA7CiAKLQlpZiAodHlwZSA9PSBJTlRF TF9PVVRQVVRfSERNSSkKKwlpZiAoaW50ZWxfY3J0Y19oYXNfdHlwZShwaXBlX2NvbmZpZywgSU5U RUxfT1VUUFVUX0hETUkpKQogCQlyZXQgPSBpbnRlbF9oZG1pX2NvbXB1dGVfY29uZmlnKGVuY29k ZXIsIHBpcGVfY29uZmlnLCBjb25uX3N0YXRlKTsKIAllbHNlCiAJCXJldCA9IGludGVsX2RwX2Nv bXB1dGVfY29uZmlnKGVuY29kZXIsIHBpcGVfY29uZmlnLCBjb25uX3N0YXRlKTsKQEAgLTI3MTUs NiArMjc0Nyw3IEBAIHZvaWQgaW50ZWxfZGRpX2luaXQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUg KmRldl9wcml2LCBlbnVtIHBvcnQgcG9ydCkKIAlkcm1fZW5jb2Rlcl9pbml0KCZkZXZfcHJpdi0+ ZHJtLCBlbmNvZGVyLCAmaW50ZWxfZGRpX2Z1bmNzLAogCQkJIERSTV9NT0RFX0VOQ09ERVJfVE1E UywgIkRESSAlYyIsIHBvcnRfbmFtZShwb3J0KSk7CiAKKwlpbnRlbF9lbmNvZGVyLT5jb21wdXRl X291dHB1dF90eXBlID0gaW50ZWxfZGRpX2NvbXB1dGVfb3V0cHV0X3R5cGU7CiAJaW50ZWxfZW5j b2Rlci0+Y29tcHV0ZV9jb25maWcgPSBpbnRlbF9kZGlfY29tcHV0ZV9jb25maWc7CiAJaW50ZWxf ZW5jb2Rlci0+ZW5hYmxlID0gaW50ZWxfZW5hYmxlX2RkaTsKIAlpZiAoSVNfR0VOOV9MUChkZXZf cHJpdikpCkBAIC0yNzcyLDkgKzI4MDUsMTAgQEAgdm9pZCBpbnRlbF9kZGlfaW5pdChzdHJ1Y3Qg ZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsIGVudW0gcG9ydCBwb3J0KQogCQl9CiAJfQogCisJ aW50ZWxfZGlnX3BvcnQtPmRwLm91dHB1dF9yZWcgPSBJTlZBTElEX01NSU9fUkVHOwogCWludGVs X2RpZ19wb3J0LT5tYXhfbGFuZXMgPSBtYXhfbGFuZXM7CiAKLQlpbnRlbF9lbmNvZGVyLT50eXBl ID0gSU5URUxfT1VUUFVUX1VOS05PV047CisJaW50ZWxfZW5jb2Rlci0+dHlwZSA9IElOVEVMX09V VFBVVF9EREk7CiAJaW50ZWxfZW5jb2Rlci0+cG93ZXJfZG9tYWluID0gaW50ZWxfcG9ydF90b19w b3dlcl9kb21haW4ocG9ydCk7CiAJaW50ZWxfZW5jb2Rlci0+cG9ydCA9IHBvcnQ7CiAJaW50ZWxf ZW5jb2Rlci0+Y3J0Y19tYXNrID0gKDEgPDwgMCkgfCAoMSA8PCAxKSB8ICgxIDw8IDIpOwpkaWZm IC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCmluZGV4IDkyMjFmNjEzNjQzYS4uMThiZmZiODgz YTY1IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKKysr IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCkBAIC0xMDY5Niw3ICsxMDY5 Niw3IEBAIHN0YXRpYyBjb25zdCBjaGFyICogY29uc3Qgb3V0cHV0X3R5cGVfc3RyW10gPSB7CiAJ T1VUUFVUX1RZUEUoRFApLAogCU9VVFBVVF9UWVBFKEVEUCksCiAJT1VUUFVUX1RZUEUoRFNJKSwK LQlPVVRQVVRfVFlQRShVTktOT1dOKSwKKwlPVVRQVVRfVFlQRShEREkpLAogCU9VVFBVVF9UWVBF KERQX01TVCksCiB9OwogCkBAIC0xMDg2Nyw3ICsxMDg2Nyw3IEBAIHN0YXRpYyBib29sIGNoZWNr X2RpZ2l0YWxfcG9ydF9jb25mbGljdHMoc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlKQog CiAJCXN3aXRjaCAoZW5jb2Rlci0+dHlwZSkgewogCQkJdW5zaWduZWQgaW50IHBvcnRfbWFzazsK LQkJY2FzZSBJTlRFTF9PVVRQVVRfVU5LTk9XTjoKKwkJY2FzZSBJTlRFTF9PVVRQVVRfRERJOgog CQkJaWYgKFdBUk5fT04oIUhBU19EREkodG9faTkxNShkZXYpKSkpCiAJCQkJYnJlYWs7CiAJCWNh c2UgSU5URUxfT1VUUFVUX0RQOgpAQCAtMTEwMDAsNyArMTEwMDAsMTIgQEAgaW50ZWxfbW9kZXNl dF9waXBlX2NvbmZpZyhzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAJCSAqIERldGVybWluZSBvdXRw dXRfdHlwZXMgYmVmb3JlIGNhbGxpbmcgdGhlIC5jb21wdXRlX2NvbmZpZygpCiAJCSAqIGhvb2tz IHNvIHRoYXQgdGhlIGhvb2tzIGNhbiB1c2UgdGhpcyBpbmZvcm1hdGlvbiBzYWZlbHkuCiAJCSAq LwotCQlwaXBlX2NvbmZpZy0+b3V0cHV0X3R5cGVzIHw9IDEgPDwgZW5jb2Rlci0+dHlwZTsKKwkJ aWYgKGVuY29kZXItPmNvbXB1dGVfb3V0cHV0X3R5cGUpCisJCQlwaXBlX2NvbmZpZy0+b3V0cHV0 X3R5cGVzIHw9CisJCQkJQklUKGVuY29kZXItPmNvbXB1dGVfb3V0cHV0X3R5cGUoZW5jb2Rlciwg cGlwZV9jb25maWcsCisJCQkJCQkJCSBjb25uZWN0b3Jfc3RhdGUpKTsKKwkJZWxzZQorCQkJcGlw ZV9jb25maWctPm91dHB1dF90eXBlcyB8PSBCSVQoZW5jb2Rlci0+dHlwZSk7CiAJfQogCiBlbmNv ZGVyX3JldHJ5OgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHAuYyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwLmMKaW5kZXggMmVmNjhkMjhlYTFlLi5mMzBm YWJjODAyYzUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwLmMKKysr IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHAuYwpAQCAtNzY5LDExICs3NjksMTYgQEAg dm9pZCBpbnRlbF9wb3dlcl9zZXF1ZW5jZXJfcmVzZXQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUg KmRldl9wcml2KQogCQlzdHJ1Y3QgaW50ZWxfZHAgKmludGVsX2RwOwogCiAJCWlmIChlbmNvZGVy LT50eXBlICE9IElOVEVMX09VVFBVVF9EUCAmJgotCQkgICAgZW5jb2Rlci0+dHlwZSAhPSBJTlRF TF9PVVRQVVRfRURQKQorCQkgICAgZW5jb2Rlci0+dHlwZSAhPSBJTlRFTF9PVVRQVVRfRURQICYm CisJCSAgICBlbmNvZGVyLT50eXBlICE9IElOVEVMX09VVFBVVF9EREkpCiAJCQljb250aW51ZTsK IAogCQlpbnRlbF9kcCA9IGVuY190b19pbnRlbF9kcCgmZW5jb2Rlci0+YmFzZSk7CiAKKwkJLyog U2tpcCBwdXJlIERWSS9IRE1JIERESSBlbmNvZGVycyAqLworCQlpZiAoIWk5MTVfbW1pb19yZWdf dmFsaWQoaW50ZWxfZHAtPm91dHB1dF9yZWcpKQorCQkJY29udGludWU7CisKIAkJV0FSTl9PTihp bnRlbF9kcC0+YWN0aXZlX3BpcGUgIT0gSU5WQUxJRF9QSVBFKTsKIAogCQlpZiAoZW5jb2Rlci0+ dHlwZSAhPSBJTlRFTF9PVVRQVVRfRURQKQpAQCAtNDcxOSw4ICs0NzI0LDYgQEAgaW50ZWxfZHBf bG9uZ19wdWxzZShzdHJ1Y3QgaW50ZWxfY29ubmVjdG9yICppbnRlbF9jb25uZWN0b3IpCiB7CiAJ c3RydWN0IGRybV9jb25uZWN0b3IgKmNvbm5lY3RvciA9ICZpbnRlbF9jb25uZWN0b3ItPmJhc2U7 CiAJc3RydWN0IGludGVsX2RwICppbnRlbF9kcCA9IGludGVsX2F0dGFjaGVkX2RwKGNvbm5lY3Rv cik7Ci0Jc3RydWN0IGludGVsX2RpZ2l0YWxfcG9ydCAqaW50ZWxfZGlnX3BvcnQgPSBkcF90b19k aWdfcG9ydChpbnRlbF9kcCk7Ci0Jc3RydWN0IGludGVsX2VuY29kZXIgKmludGVsX2VuY29kZXIg PSAmaW50ZWxfZGlnX3BvcnQtPmJhc2U7CiAJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGNvbm5l Y3Rvci0+ZGV2OwogCWVudW0gZHJtX2Nvbm5lY3Rvcl9zdGF0dXMgc3RhdHVzOwogCXU4IHNpbmtf aXJxX3ZlY3RvciA9IDA7CkBAIC00NzUzLDkgKzQ3NTYsNiBAQCBpbnRlbF9kcF9sb25nX3B1bHNl KHN0cnVjdCBpbnRlbF9jb25uZWN0b3IgKmludGVsX2Nvbm5lY3RvcikKIAkJZ290byBvdXQ7CiAJ fQogCi0JaWYgKGludGVsX2VuY29kZXItPnR5cGUgIT0gSU5URUxfT1VUUFVUX0VEUCkKLQkJaW50 ZWxfZW5jb2Rlci0+dHlwZSA9IElOVEVMX09VVFBVVF9EUDsKLQogCURSTV9ERUJVR19LTVMoIkRp c3BsYXkgUG9ydCBUUFMzIHN1cHBvcnQ6IHNvdXJjZSAlcywgc2luayAlc1xuIiwKIAkJICAgICAg eWVzbm8oaW50ZWxfZHBfc291cmNlX3N1cHBvcnRzX2hicjIoaW50ZWxfZHApKSwKIAkJICAgICAg eWVzbm8oZHJtX2RwX3RwczNfc3VwcG9ydGVkKGludGVsX2RwLT5kcGNkKSkpOwpAQCAtNDg3Niw5 ICs0ODc2LDYgQEAgaW50ZWxfZHBfZm9yY2Uoc3RydWN0IGRybV9jb25uZWN0b3IgKmNvbm5lY3Rv cikKIAlpbnRlbF9kcF9zZXRfZWRpZChpbnRlbF9kcCk7CiAKIAlpbnRlbF9kaXNwbGF5X3Bvd2Vy X3B1dChkZXZfcHJpdiwgaW50ZWxfZHAtPmF1eF9wb3dlcl9kb21haW4pOwotCi0JaWYgKGludGVs X2VuY29kZXItPnR5cGUgIT0gSU5URUxfT1VUUFVUX0VEUCkKLQkJaW50ZWxfZW5jb2Rlci0+dHlw ZSA9IElOVEVMX09VVFBVVF9EUDsKIH0KIAogc3RhdGljIGludCBpbnRlbF9kcF9nZXRfbW9kZXMo c3RydWN0IGRybV9jb25uZWN0b3IgKmNvbm5lY3RvcikKQEAgLTUwOTcsMTAgKzUwOTQsNiBAQCBp bnRlbF9kcF9ocGRfcHVsc2Uoc3RydWN0IGludGVsX2RpZ2l0YWxfcG9ydCAqaW50ZWxfZGlnX3Bv cnQsIGJvb2wgbG9uZ19ocGQpCiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0g dG9faTkxNShkZXYpOwogCWVudW0gaXJxcmV0dXJuIHJldCA9IElSUV9OT05FOwogCi0JaWYgKGlu dGVsX2RpZ19wb3J0LT5iYXNlLnR5cGUgIT0gSU5URUxfT1VUUFVUX0VEUCAmJgotCSAgICBpbnRl bF9kaWdfcG9ydC0+YmFzZS50eXBlICE9IElOVEVMX09VVFBVVF9IRE1JKQotCQlpbnRlbF9kaWdf cG9ydC0+YmFzZS50eXBlID0gSU5URUxfT1VUUFVUX0RQOwotCiAJaWYgKGxvbmdfaHBkICYmIGlu dGVsX2RpZ19wb3J0LT5iYXNlLnR5cGUgPT0gSU5URUxfT1VUUFVUX0VEUCkgewogCQkvKgogCQkg KiB2ZGQgb2ZmIGNhbiBnZW5lcmF0ZSBhIGxvbmcgcHVsc2Ugb24gZURQIHdoaWNoCmRpZmYgLS1n aXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2Rydi5oCmluZGV4IDMwNzgwNzY3Mjg5Ni4uNmUzNzVkMmUwNTJjIDEwMDY0NAot LS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaAorKysgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9kcnYuaApAQCAtMTczLDcgKzE3Myw3IEBAIGVudW0gaW50ZWxfb3V0cHV0 X3R5cGUgewogCUlOVEVMX09VVFBVVF9EUCA9IDcsCiAJSU5URUxfT1VUUFVUX0VEUCA9IDgsCiAJ SU5URUxfT1VUUFVUX0RTSSA9IDksCi0JSU5URUxfT1VUUFVUX1VOS05PV04gPSAxMCwKKwlJTlRF TF9PVVRQVVRfRERJID0gMTAsCiAJSU5URUxfT1VUUFVUX0RQX01TVCA9IDExLAogfTsKIApAQCAt MjE2LDYgKzIxNiw5IEBAIHN0cnVjdCBpbnRlbF9lbmNvZGVyIHsKIAllbnVtIHBvcnQgcG9ydDsK IAl1bnNpZ25lZCBpbnQgY2xvbmVhYmxlOwogCXZvaWQgKCpob3RfcGx1Zykoc3RydWN0IGludGVs X2VuY29kZXIgKik7CisJZW51bSBpbnRlbF9vdXRwdXRfdHlwZSAoKmNvbXB1dGVfb3V0cHV0X3R5 cGUpKHN0cnVjdCBpbnRlbF9lbmNvZGVyICosCisJCQkJCQkgICAgICBzdHJ1Y3QgaW50ZWxfY3J0 Y19zdGF0ZSAqLAorCQkJCQkJICAgICAgc3RydWN0IGRybV9jb25uZWN0b3Jfc3RhdGUgKik7CiAJ Ym9vbCAoKmNvbXB1dGVfY29uZmlnKShzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqLAogCQkJICAgICAg IHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICosCiAJCQkgICAgICAgc3RydWN0IGRybV9jb25uZWN0 b3Jfc3RhdGUgKik7CkBAIC0xMTUxLDcgKzExNTQsNyBAQCBlbmNfdG9fZGlnX3BvcnQoc3RydWN0 IGRybV9lbmNvZGVyICplbmNvZGVyKQogCXN0cnVjdCBpbnRlbF9lbmNvZGVyICppbnRlbF9lbmNv ZGVyID0gdG9faW50ZWxfZW5jb2RlcihlbmNvZGVyKTsKIAogCXN3aXRjaCAoaW50ZWxfZW5jb2Rl ci0+dHlwZSkgewotCWNhc2UgSU5URUxfT1VUUFVUX1VOS05PV046CisJY2FzZSBJTlRFTF9PVVRQ VVRfRERJOgogCQlXQVJOX09OKCFIQVNfRERJKHRvX2k5MTUoZW5jb2Rlci0+ZGV2KSkpOwogCWNh c2UgSU5URUxfT1VUUFVUX0RQOgogCWNhc2UgSU5URUxfT1VUUFVUX0VEUDoKZGlmZiAtLWdpdCBh L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2hkbWkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2hkbWkuYwppbmRleCBlNmY4ZjMwY2U3YmQuLmFiOGY4ZDc1MTA4MSAxMDA2NDQKLS0t IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfaGRtaS5jCisrKyBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2hkbWkuYwpAQCAtMTYwNCwxMiArMTYwNCw5IEBAIGludGVsX2hkbWlfZGV0 ZWN0KHN0cnVjdCBkcm1fY29ubmVjdG9yICpjb25uZWN0b3IsIGJvb2wgZm9yY2UpCiAKIAlpbnRl bF9oZG1pX3Vuc2V0X2VkaWQoY29ubmVjdG9yKTsKIAotCWlmIChpbnRlbF9oZG1pX3NldF9lZGlk KGNvbm5lY3RvcikpIHsKLQkJc3RydWN0IGludGVsX2hkbWkgKmludGVsX2hkbWkgPSBpbnRlbF9h dHRhY2hlZF9oZG1pKGNvbm5lY3Rvcik7Ci0KLQkJaGRtaV90b19kaWdfcG9ydChpbnRlbF9oZG1p KS0+YmFzZS50eXBlID0gSU5URUxfT1VUUFVUX0hETUk7CisJaWYgKGludGVsX2hkbWlfc2V0X2Vk aWQoY29ubmVjdG9yKSkKIAkJc3RhdHVzID0gY29ubmVjdG9yX3N0YXR1c19jb25uZWN0ZWQ7Ci0J fSBlbHNlCisJZWxzZQogCQlzdGF0dXMgPSBjb25uZWN0b3Jfc3RhdHVzX2Rpc2Nvbm5lY3RlZDsK IAogCWludGVsX2Rpc3BsYXlfcG93ZXJfcHV0KGRldl9wcml2LCBQT1dFUl9ET01BSU5fR01CVVMp OwpAQCAtMTYyMCw4ICsxNjE3LDYgQEAgaW50ZWxfaGRtaV9kZXRlY3Qoc3RydWN0IGRybV9jb25u ZWN0b3IgKmNvbm5lY3RvciwgYm9vbCBmb3JjZSkKIHN0YXRpYyB2b2lkCiBpbnRlbF9oZG1pX2Zv cmNlKHN0cnVjdCBkcm1fY29ubmVjdG9yICpjb25uZWN0b3IpCiB7Ci0Jc3RydWN0IGludGVsX2hk bWkgKmludGVsX2hkbWkgPSBpbnRlbF9hdHRhY2hlZF9oZG1pKGNvbm5lY3Rvcik7Ci0KIAlEUk1f REVCVUdfS01TKCJbQ09OTkVDVE9SOiVkOiVzXVxuIiwKIAkJICAgICAgY29ubmVjdG9yLT5iYXNl LmlkLCBjb25uZWN0b3ItPm5hbWUpOwogCkBAIC0xNjMxLDcgKzE2MjYsNiBAQCBpbnRlbF9oZG1p X2ZvcmNlKHN0cnVjdCBkcm1fY29ubmVjdG9yICpjb25uZWN0b3IpCiAJCXJldHVybjsKIAogCWlu dGVsX2hkbWlfc2V0X2VkaWQoY29ubmVjdG9yKTsKLQloZG1pX3RvX2RpZ19wb3J0KGludGVsX2hk bWkpLT5iYXNlLnR5cGUgPSBJTlRFTF9PVVRQVVRfSERNSTsKIH0KIAogc3RhdGljIGludCBpbnRl bF9oZG1pX2dldF9tb2RlcyhzdHJ1Y3QgZHJtX2Nvbm5lY3RvciAqY29ubmVjdG9yKQpkaWZmIC0t Z2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfb3ByZWdpb24uYyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX29wcmVnaW9uLmMKaW5kZXggOTgxNTRlZmNiMmY0Li5kNTdhZGUwYjY1 MmEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX29wcmVnaW9uLmMKKysr IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfb3ByZWdpb24uYwpAQCAtMzgzLDcgKzM4Myw3 IEBAIGludCBpbnRlbF9vcHJlZ2lvbl9ub3RpZnlfZW5jb2RlcihzdHJ1Y3QgaW50ZWxfZW5jb2Rl ciAqaW50ZWxfZW5jb2RlciwKIAljYXNlIElOVEVMX09VVFBVVF9BTkFMT0c6CiAJCXR5cGUgPSBE SVNQTEFZX1RZUEVfQ1JUOwogCQlicmVhazsKLQljYXNlIElOVEVMX09VVFBVVF9VTktOT1dOOgor CWNhc2UgSU5URUxfT1VUUFVUX0RESToKIAljYXNlIElOVEVMX09VVFBVVF9EUDoKIAljYXNlIElO VEVMX09VVFBVVF9IRE1JOgogCWNhc2UgSU5URUxfT1VUUFVUX0RQX01TVDoKLS0gCjIuMTMuNQoK X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4 IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlz dHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==