From: Ville Syrjala Subject: [PATCH 25/29] drm/i915: Stop frobbing with DDI encoder->type Date: Mon, 18 Sep 2017 21:26:00 +0300 Message-ID: <20170918182604.9519-26-ville.syrjala@linux.intel.com> References: <20170918182604.9519-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 mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTPS id D2E506E3EB for ; Mon, 18 Sep 2017 18:27:26 +0000 (UTC) In-Reply-To: <20170918182604.9519-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 bmNvZGVyLT50eXBlLgpXZSdsbCBlRFAgYXMgSU5URUxfT1VUUFVUX0VEUCwgc2luY2UgaXQnbGwg bmV2ZXIgY2hhbmdlIGFuZCB0aGVyZSdzIGEKYnVuY2ggb2YgY29kZSB0aGF0IHJlbGllcyBvbiB0 aGF0IHZhbHVlIHRvIGlkZW50b2Z5IGVEUC4KCldlJ2xsIGludHJvZHVjZSBhIG5ldyBlbmNvZGVy IC5jb21wdXRlX291dHB1dF90eXBlKCkgaG9vay4gVGhpcyBhbGxvd3MKdXMgdG8gY29tcHV0ZSB0 aGUgZnVsbCBvdXRwdXRfdHlwZXMgYmVmb3JlIGFueSBlbmNvZGVyIC5jb21wdXRlX2NvbmZpZygp Cmhvb2tzIGdldCBjYWxsZWQsIHRodXMgdGhvc2UgaG9va3MgY2FuIHJlbHkgb24gb3V0cHV0X3R5 cGVzIGJlaW5nCmNvcnJlY3QsIHdoaWNoIGlzIHVzZWZ1bCBmb3IgY2xvbmluZyBvbiBvbGRyIHBs YXRmb3Jtcy4gRm9yIG5vdyB3ZSdsbApqdXN0IGxvb2sgYXQgdGhlIGNvbm5lY3RvciB0eXBlIGFu ZCBwaWNrIHRoZSBjb3JyZWN0IG1vZGUgYmFzZWQgb24gdGhhdC4KSW4gdGhlIGZ1dHVyZSB0aGUg bmV3IGhvb2sgY291bGQgYmUgdXNlZCB0byBpbXBsZW1lbnQgZHluYW1pYyBzd2l0Y2hpbmcKYmV0 d2VlbiBMUyBhbmQgUENPTiBtb2RlcyBmb3IgTFNQQ09OLgoKVE9ETzogbWF5YmUgbWFrZSAuZ2V0 X2NvbmZpZygpIHBvcHVsYXRlIG91dHB1dF90eXBlcyByYXRoZXIgdGhhbiBkb2luZwp0aGUgZGVm YXVsdCBlbmNvZGVyLT50eXBlIHRoaW5nIGluIGNhbGxlciBhbmQgdGhlbiB1bmRvaW5nIGl0IGZv cgpEREkgaW4gLmdldF9jb25maWcoKS4KClNpZ25lZC1vZmYtYnk6IFZpbGxlIFN5cmrDpGzDpCA8 dmlsbGUuc3lyamFsYUBsaW51eC5pbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9kZWJ1Z2ZzLmMgICB8ICAyICstCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kZGku YyAgICAgIHwgNDkgKysrKysrKysrKysrKysrKysrKysrKysrKysrKystLS0tLS0KIGRyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyAgfCAxMSArKysrKy0tLQogZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfZHAuYyAgICAgICB8IDE1ICsrLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9kcnYuaCAgICAgIHwgIDcgKysrLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2hkbWkuYyAgICAgfCAxMCArKy0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9vcHJlZ2lvbi5jIHwgIDIgKy0KIDcgZmlsZXMgY2hhbmdlZCwgNjAgaW5zZXJ0aW9ucygrKSwg MzYgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9k ZWJ1Z2ZzLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYwppbmRleCBjYTZm YTZkMTIyYzYuLjczNjAxNDY0MjQwZCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9kZWJ1Z2ZzLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kZWJ1Z2ZzLmMK QEAgLTMwNTMsNyArMzA1Myw3IEBAIHN0YXRpYyB2b2lkIGludGVsX2Nvbm5lY3Rvcl9pbmZvKHN0 cnVjdCBzZXFfZmlsZSAqbSwKIAkJYnJlYWs7CiAJY2FzZSBEUk1fTU9ERV9DT05ORUNUT1JfSERN SUE6CiAJCWlmIChpbnRlbF9lbmNvZGVyLT50eXBlID09IElOVEVMX09VVFBVVF9IRE1JIHx8Ci0J CSAgICBpbnRlbF9lbmNvZGVyLT50eXBlID09IElOVEVMX09VVFBVVF9VTktOT1dOKQorCQkgICAg aW50ZWxfZW5jb2Rlci0+dHlwZSA9PSBJTlRFTF9PVVRQVVRfRERJKQogCQkJaW50ZWxfaGRtaV9p bmZvKG0sIGludGVsX2Nvbm5lY3Rvcik7CiAJCWJyZWFrOwogCWRlZmF1bHQ6CmRpZmYgLS1naXQg YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kZGkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2RkaS5jCmluZGV4IGQ2MjViZmU2ZDQyMC4uZTkzZWQwZDMxNzM4IDEwMDY0NAotLS0g YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kZGkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9kZGkuYwpAQCAtNDk3LDEwICs0OTcsOCBAQCBlbnVtIHBvcnQgaW50ZWxfZGRp X2dldF9lbmNvZGVyX3BvcnQoc3RydWN0IGludGVsX2VuY29kZXIgKmVuY29kZXIpCiAJc3dpdGNo IChlbmNvZGVyLT50eXBlKSB7CiAJY2FzZSBJTlRFTF9PVVRQVVRfRFBfTVNUOgogCQlyZXR1cm4g ZW5jX3RvX21zdCgmZW5jb2Rlci0+YmFzZSktPnByaW1hcnktPnBvcnQ7Ci0JY2FzZSBJTlRFTF9P VVRQVVRfRFA6CiAJY2FzZSBJTlRFTF9PVVRQVVRfRURQOgotCWNhc2UgSU5URUxfT1VUUFVUX0hE TUk6Ci0JY2FzZSBJTlRFTF9PVVRQVVRfVU5LTk9XTjoKKwljYXNlIElOVEVMX09VVFBVVF9EREk6 CiAJCXJldHVybiBlbmNfdG9fZGlnX3BvcnQoJmVuY29kZXItPmJhc2UpLT5wb3J0OwogCWNhc2Ug SU5URUxfT1VUUFVUX0FOQUxPRzoKIAkJcmV0dXJuIFBPUlRfRTsKQEAgLTE1MTYsNiArMTUxNCw3 IEBAIHZvaWQgaW50ZWxfZGRpX3NldF92Y19wYXlsb2FkX2FsbG9jKGNvbnN0IHN0cnVjdCBpbnRl bF9jcnRjX3N0YXRlICpjcnRjX3N0YXRlLAogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZf cHJpdiA9IHRvX2k5MTUoY3J0Yy0+YmFzZS5kZXYpOwogCWVudW0gdHJhbnNjb2RlciBjcHVfdHJh bnNjb2RlciA9IGNydGNfc3RhdGUtPmNwdV90cmFuc2NvZGVyOwogCXVpbnQzMl90IHRlbXA7CisK IAl0ZW1wID0gSTkxNV9SRUFEKFRSQU5TX0RESV9GVU5DX0NUTChjcHVfdHJhbnNjb2RlcikpOwog CWlmIChzdGF0ZSA9PSB0cnVlKQogCQl0ZW1wIHw9IFRSQU5TX0RESV9EUF9WQ19QQVlMT0FEX0FM TE9DOwpAQCAtMjQ4OSw2ICsyNDg4LDEzIEBAIHZvaWQgaW50ZWxfZGRpX2dldF9jb25maWcoc3Ry dWN0IGludGVsX2VuY29kZXIgKmVuY29kZXIsCiAJc3RydWN0IGludGVsX2RpZ2l0YWxfcG9ydCAq aW50ZWxfZGlnX3BvcnQ7CiAJdTMyIHRlbXAsIGZsYWdzID0gMDsKIAorCS8qCisJICogQ2FuIGJl IHNldCBieSB0aGUgY2FsbGVyIGJhc2VkIG9uIGVuY29kZXItPnR5cGUuCisJICogVW5kbyB0aGF0 IHNpbmNlIHdlIGRvbid0IHdhbnQgSU5URUxfT1VUUFVUX0RESQorCSAqIHRvIGFwcGVhciBpbiBv dXRwdXRfdHlwZXMuCisJICovCisJcGlwZV9jb25maWctPm91dHB1dF90eXBlcyAmPSB+QklUKElO VEVMX09VVFBVVF9EREkpOworCiAJLyogWFhYOiBEU0kgdHJhbnNjb2RlciBwYXJhbm9pYSAqLwog CWlmIChXQVJOX09OKHRyYW5zY29kZXJfaXNfZHNpKGNwdV90cmFuc2NvZGVyKSkpCiAJCXJldHVy bjsKQEAgLTI1MzcsMTIgKzI1NDMsMjMgQEAgdm9pZCBpbnRlbF9kZGlfZ2V0X2NvbmZpZyhzdHJ1 Y3QgaW50ZWxfZW5jb2RlciAqZW5jb2RlciwKIAkJCXBpcGVfY29uZmlnLT5oZG1pX2hpZ2hfdG1k c19jbG9ja19yYXRpbyA9IHRydWU7CiAJCS8qIGZhbGwgdGhyb3VnaCAqLwogCWNhc2UgVFJBTlNf RERJX01PREVfU0VMRUNUX0RWSToKKwkJcGlwZV9jb25maWctPm91dHB1dF90eXBlcyB8PSBCSVQo SU5URUxfT1VUUFVUX0hETUkpOwogCQlwaXBlX2NvbmZpZy0+bGFuZV9jb3VudCA9IDQ7CiAJCWJy ZWFrOwogCWNhc2UgVFJBTlNfRERJX01PREVfU0VMRUNUX0ZESToKKwkJcGlwZV9jb25maWctPm91 dHB1dF90eXBlcyB8PSBCSVQoSU5URUxfT1VUUFVUX0FOQUxPRyk7CiAJCWJyZWFrOwogCWNhc2Ug VFJBTlNfRERJX01PREVfU0VMRUNUX0RQX1NTVDoKKwkJaWYgKGVuY29kZXItPnR5cGUgPT0gSU5U RUxfT1VUUFVUX0VEUCkKKwkJCXBpcGVfY29uZmlnLT5vdXRwdXRfdHlwZXMgfD0gQklUKElOVEVM X09VVFBVVF9FRFApOworCQllbHNlCisJCQlwaXBlX2NvbmZpZy0+b3V0cHV0X3R5cGVzIHw9IEJJ VChJTlRFTF9PVVRQVVRfRFApOworCQlwaXBlX2NvbmZpZy0+bGFuZV9jb3VudCA9CisJCQkoKHRl bXAgJiBERElfUE9SVF9XSURUSF9NQVNLKSA+PiBERElfUE9SVF9XSURUSF9TSElGVCkgKyAxOwor CQlpbnRlbF9kcF9nZXRfbV9uKGludGVsX2NydGMsIHBpcGVfY29uZmlnKTsKKwkJYnJlYWs7CiAJ Y2FzZSBUUkFOU19ERElfTU9ERV9TRUxFQ1RfRFBfTVNUOgorCQlwaXBlX2NvbmZpZy0+b3V0cHV0 X3R5cGVzIHw9IEJJVChJTlRFTF9PVVRQVVRfRFBfTVNUKTsKIAkJcGlwZV9jb25maWctPmxhbmVf Y291bnQgPQogCQkJKCh0ZW1wICYgRERJX1BPUlRfV0lEVEhfTUFTSykgPj4gRERJX1BPUlRfV0lE VEhfU0hJRlQpICsgMTsKIAkJaW50ZWxfZHBfZ2V0X21fbihpbnRlbF9jcnRjLCBwaXBlX2NvbmZp Zyk7CkBAIC0yNTgxLDIxICsyNTk4LDM2IEBAIHZvaWQgaW50ZWxfZGRpX2dldF9jb25maWcoc3Ry dWN0IGludGVsX2VuY29kZXIgKmVuY29kZXIsCiAJCQlieHRfZGRpX3BoeV9nZXRfbGFuZV9sYXRf b3B0aW1fbWFzayhlbmNvZGVyKTsKIH0KIAorc3RhdGljIGVudW0gaW50ZWxfb3V0cHV0X3R5cGUK K2ludGVsX2RkaV9jb21wdXRlX291dHB1dF90eXBlKHN0cnVjdCBpbnRlbF9lbmNvZGVyICplbmNv ZGVyLAorCQkJICAgICAgc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNfc3RhdGUsCisJCQkg ICAgICBzdHJ1Y3QgZHJtX2Nvbm5lY3Rvcl9zdGF0ZSAqY29ubl9zdGF0ZSkKK3sKKwlzd2l0Y2gg KGNvbm5fc3RhdGUtPmNvbm5lY3Rvci0+Y29ubmVjdG9yX3R5cGUpIHsKKwljYXNlIERSTV9NT0RF X0NPTk5FQ1RPUl9IRE1JQToKKwkJcmV0dXJuIElOVEVMX09VVFBVVF9IRE1JOworCWNhc2UgRFJN X01PREVfQ09OTkVDVE9SX2VEUDoKKwkJcmV0dXJuIElOVEVMX09VVFBVVF9FRFA7CisJY2FzZSBE Uk1fTU9ERV9DT05ORUNUT1JfRGlzcGxheVBvcnQ6CisJCXJldHVybiBJTlRFTF9PVVRQVVRfRFA7 CisJZGVmYXVsdDoKKwkJTUlTU0lOR19DQVNFKGNvbm5fc3RhdGUtPmNvbm5lY3Rvci0+Y29ubmVj dG9yX3R5cGUpOworCQlyZXR1cm4gSU5URUxfT1VUUFVUX1VOVVNFRDsKKwl9Cit9CisKIHN0YXRp YyBib29sIGludGVsX2RkaV9jb21wdXRlX2NvbmZpZyhzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqZW5j b2RlciwKIAkJCQkgICAgIHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpwaXBlX2NvbmZpZywKIAkJ CQkgICAgIHN0cnVjdCBkcm1fY29ubmVjdG9yX3N0YXRlICpjb25uX3N0YXRlKQogewogCXN0cnVj dCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoZW5jb2Rlci0+YmFzZS5kZXYp OwotCWludCB0eXBlID0gZW5jb2Rlci0+dHlwZTsKIAlpbnQgcG9ydCA9IGludGVsX2RkaV9nZXRf ZW5jb2Rlcl9wb3J0KGVuY29kZXIpOwogCWludCByZXQ7CiAKLQlXQVJOKHR5cGUgPT0gSU5URUxf T1VUUFVUX1VOS05PV04sICJjb21wdXRlX2NvbmZpZygpIG9uIHVua25vd24gb3V0cHV0IVxuIik7 Ci0KIAlpZiAocG9ydCA9PSBQT1JUX0EpCiAJCXBpcGVfY29uZmlnLT5jcHVfdHJhbnNjb2RlciA9 IFRSQU5TQ09ERVJfRURQOwogCi0JaWYgKHR5cGUgPT0gSU5URUxfT1VUUFVUX0hETUkpCisJaWYg KGludGVsX2NydGNfaGFzX3R5cGUocGlwZV9jb25maWcsIElOVEVMX09VVFBVVF9IRE1JKSkKIAkJ cmV0ID0gaW50ZWxfaGRtaV9jb21wdXRlX2NvbmZpZyhlbmNvZGVyLCBwaXBlX2NvbmZpZywgY29u bl9zdGF0ZSk7CiAJZWxzZQogCQlyZXQgPSBpbnRlbF9kcF9jb21wdXRlX2NvbmZpZyhlbmNvZGVy LCBwaXBlX2NvbmZpZywgY29ubl9zdGF0ZSk7CkBAIC0yNzE1LDYgKzI3NDcsNyBAQCB2b2lkIGlu dGVsX2RkaV9pbml0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwgZW51bSBwb3J0 IHBvcnQpCiAJZHJtX2VuY29kZXJfaW5pdCgmZGV2X3ByaXYtPmRybSwgZW5jb2RlciwgJmludGVs X2RkaV9mdW5jcywKIAkJCSBEUk1fTU9ERV9FTkNPREVSX1RNRFMsICJEREkgJWMiLCBwb3J0X25h bWUocG9ydCkpOwogCisJaW50ZWxfZW5jb2Rlci0+Y29tcHV0ZV9vdXRwdXRfdHlwZSA9IGludGVs X2RkaV9jb21wdXRlX291dHB1dF90eXBlOwogCWludGVsX2VuY29kZXItPmNvbXB1dGVfY29uZmln ID0gaW50ZWxfZGRpX2NvbXB1dGVfY29uZmlnOwogCWludGVsX2VuY29kZXItPmVuYWJsZSA9IGlu dGVsX2VuYWJsZV9kZGk7CiAJaWYgKElTX0dFTjlfTFAoZGV2X3ByaXYpKQpAQCAtMjc3NCw3ICsy ODA3LDcgQEAgdm9pZCBpbnRlbF9kZGlfaW5pdChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2 X3ByaXYsIGVudW0gcG9ydCBwb3J0KQogCiAJaW50ZWxfZGlnX3BvcnQtPm1heF9sYW5lcyA9IG1h eF9sYW5lczsKIAotCWludGVsX2VuY29kZXItPnR5cGUgPSBJTlRFTF9PVVRQVVRfVU5LTk9XTjsK KwlpbnRlbF9lbmNvZGVyLT50eXBlID0gSU5URUxfT1VUUFVUX0RESTsKIAlpbnRlbF9lbmNvZGVy LT5wb3dlcl9kb21haW4gPSBpbnRlbF9wb3J0X3RvX3Bvd2VyX2RvbWFpbihwb3J0KTsKIAlpbnRl bF9lbmNvZGVyLT5wb3J0ID0gcG9ydDsKIAlpbnRlbF9lbmNvZGVyLT5jcnRjX21hc2sgPSAoMSA8 PCAwKSB8ICgxIDw8IDEpIHwgKDEgPDwgMik7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5 LmMKaW5kZXggMTkyYjA3YTkyZTc2Li44ZjRmNWYzYTFjNzUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9kaXNwbGF5LmMKQEAgLTEwNjk2LDcgKzEwNjk2LDcgQEAgc3RhdGljIGNvbnN0IGNoYXIg KiBjb25zdCBvdXRwdXRfdHlwZV9zdHJbXSA9IHsKIAlPVVRQVVRfVFlQRShEUCksCiAJT1VUUFVU X1RZUEUoRURQKSwKIAlPVVRQVVRfVFlQRShEU0kpLAotCU9VVFBVVF9UWVBFKFVOS05PV04pLAor CU9VVFBVVF9UWVBFKERESSksCiAJT1VUUFVUX1RZUEUoRFBfTVNUKSwKIH07CiAKQEAgLTEwODY2 LDcgKzEwODY2LDcgQEAgc3RhdGljIGJvb2wgY2hlY2tfZGlnaXRhbF9wb3J0X2NvbmZsaWN0cyhz dHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGUpCiAKIAkJc3dpdGNoIChlbmNvZGVyLT50eXBl KSB7CiAJCQl1bnNpZ25lZCBpbnQgcG9ydF9tYXNrOwotCQljYXNlIElOVEVMX09VVFBVVF9VTktO T1dOOgorCQljYXNlIElOVEVMX09VVFBVVF9EREk6CiAJCQlpZiAoV0FSTl9PTighSEFTX0RESSh0 b19pOTE1KGRldikpKSkKIAkJCQlicmVhazsKIAkJY2FzZSBJTlRFTF9PVVRQVVRfRFA6CkBAIC0x MDk5OSw3ICsxMDk5OSwxMiBAQCBpbnRlbF9tb2Rlc2V0X3BpcGVfY29uZmlnKHN0cnVjdCBkcm1f Y3J0YyAqY3J0YywKIAkJICogRGV0ZXJtaW5lIG91dHB1dF90eXBlcyBiZWZvcmUgY2FsbGluZyB0 aGUgLmNvbXB1dGVfY29uZmlnKCkKIAkJICogaG9va3Mgc28gdGhhdCB0aGUgaG9va3MgY2FuIHVz ZSB0aGlzIGluZm9ybWF0aW9uIHNhZmVseS4KIAkJICovCi0JCXBpcGVfY29uZmlnLT5vdXRwdXRf dHlwZXMgfD0gMSA8PCBlbmNvZGVyLT50eXBlOworCQlpZiAoZW5jb2Rlci0+Y29tcHV0ZV9vdXRw dXRfdHlwZSkKKwkJCXBpcGVfY29uZmlnLT5vdXRwdXRfdHlwZXMgfD0KKwkJCQlCSVQoZW5jb2Rl ci0+Y29tcHV0ZV9vdXRwdXRfdHlwZShlbmNvZGVyLCBwaXBlX2NvbmZpZywKKwkJCQkJCQkJIGNv bm5lY3Rvcl9zdGF0ZSkpOworCQllbHNlCisJCQlwaXBlX2NvbmZpZy0+b3V0cHV0X3R5cGVzIHw9 IEJJVChlbmNvZGVyLT50eXBlKTsKIAl9CiAKIGVuY29kZXJfcmV0cnk6CmRpZmYgLS1naXQgYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcC5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfZHAuYwppbmRleCBjYzI1YTliMTBmZDkuLjQxOTY0MzVhZTE3ZSAxMDA2NDQKLS0tIGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHAuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9kcC5jCkBAIC03NjgsNyArNzY4LDggQEAgdm9pZCBpbnRlbF9wb3dlcl9zZXF1ZW5jZXJf cmVzZXQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogCWZvcl9lYWNoX2ludGVs X2VuY29kZXIoZGV2LCBlbmNvZGVyKSB7CiAJCXN0cnVjdCBpbnRlbF9kcCAqaW50ZWxfZHA7CiAK LQkJaWYgKGVuY29kZXItPnR5cGUgIT0gSU5URUxfT1VUUFVUX0RQICYmCisJCWlmICghSVNfR0VO OV9MUChkZXZfcHJpdikgJiYKKwkJICAgIGVuY29kZXItPnR5cGUgIT0gSU5URUxfT1VUUFVUX0RQ ICYmCiAJCSAgICBlbmNvZGVyLT50eXBlICE9IElOVEVMX09VVFBVVF9FRFApCiAJCQljb250aW51 ZTsKIApAQCAtNDY5Nyw4ICs0Njk4LDYgQEAgaW50ZWxfZHBfbG9uZ19wdWxzZShzdHJ1Y3QgaW50 ZWxfY29ubmVjdG9yICppbnRlbF9jb25uZWN0b3IpCiB7CiAJc3RydWN0IGRybV9jb25uZWN0b3Ig KmNvbm5lY3RvciA9ICZpbnRlbF9jb25uZWN0b3ItPmJhc2U7CiAJc3RydWN0IGludGVsX2RwICpp bnRlbF9kcCA9IGludGVsX2F0dGFjaGVkX2RwKGNvbm5lY3Rvcik7Ci0Jc3RydWN0IGludGVsX2Rp Z2l0YWxfcG9ydCAqaW50ZWxfZGlnX3BvcnQgPSBkcF90b19kaWdfcG9ydChpbnRlbF9kcCk7Ci0J c3RydWN0IGludGVsX2VuY29kZXIgKmludGVsX2VuY29kZXIgPSAmaW50ZWxfZGlnX3BvcnQtPmJh c2U7CiAJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGNvbm5lY3Rvci0+ZGV2OwogCWVudW0gZHJt X2Nvbm5lY3Rvcl9zdGF0dXMgc3RhdHVzOwogCXU4IHNpbmtfaXJxX3ZlY3RvciA9IDA7CkBAIC00 NzMxLDkgKzQ3MzAsNiBAQCBpbnRlbF9kcF9sb25nX3B1bHNlKHN0cnVjdCBpbnRlbF9jb25uZWN0 b3IgKmludGVsX2Nvbm5lY3RvcikKIAkJZ290byBvdXQ7CiAJfQogCi0JaWYgKGludGVsX2VuY29k ZXItPnR5cGUgIT0gSU5URUxfT1VUUFVUX0VEUCkKLQkJaW50ZWxfZW5jb2Rlci0+dHlwZSA9IElO VEVMX09VVFBVVF9EUDsKLQogCURSTV9ERUJVR19LTVMoIkRpc3BsYXkgUG9ydCBUUFMzIHN1cHBv cnQ6IHNvdXJjZSAlcywgc2luayAlc1xuIiwKIAkJICAgICAgeWVzbm8oaW50ZWxfZHBfc291cmNl X3N1cHBvcnRzX2hicjIoaW50ZWxfZHApKSwKIAkJICAgICAgeWVzbm8oZHJtX2RwX3RwczNfc3Vw cG9ydGVkKGludGVsX2RwLT5kcGNkKSkpOwpAQCAtNDg1NCw5ICs0ODUwLDYgQEAgaW50ZWxfZHBf Zm9yY2Uoc3RydWN0IGRybV9jb25uZWN0b3IgKmNvbm5lY3RvcikKIAlpbnRlbF9kcF9zZXRfZWRp ZChpbnRlbF9kcCk7CiAKIAlpbnRlbF9kaXNwbGF5X3Bvd2VyX3B1dChkZXZfcHJpdiwgaW50ZWxf ZHAtPmF1eF9wb3dlcl9kb21haW4pOwotCi0JaWYgKGludGVsX2VuY29kZXItPnR5cGUgIT0gSU5U RUxfT1VUUFVUX0VEUCkKLQkJaW50ZWxfZW5jb2Rlci0+dHlwZSA9IElOVEVMX09VVFBVVF9EUDsK IH0KIAogc3RhdGljIGludCBpbnRlbF9kcF9nZXRfbW9kZXMoc3RydWN0IGRybV9jb25uZWN0b3Ig KmNvbm5lY3RvcikKQEAgLTUwNzUsMTAgKzUwNjgsNiBAQCBpbnRlbF9kcF9ocGRfcHVsc2Uoc3Ry dWN0IGludGVsX2RpZ2l0YWxfcG9ydCAqaW50ZWxfZGlnX3BvcnQsIGJvb2wgbG9uZ19ocGQpCiAJ c3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShkZXYpOwogCWVudW0g aXJxcmV0dXJuIHJldCA9IElSUV9OT05FOwogCi0JaWYgKGludGVsX2RpZ19wb3J0LT5iYXNlLnR5 cGUgIT0gSU5URUxfT1VUUFVUX0VEUCAmJgotCSAgICBpbnRlbF9kaWdfcG9ydC0+YmFzZS50eXBl ICE9IElOVEVMX09VVFBVVF9IRE1JKQotCQlpbnRlbF9kaWdfcG9ydC0+YmFzZS50eXBlID0gSU5U RUxfT1VUUFVUX0RQOwotCiAJaWYgKGxvbmdfaHBkICYmIGludGVsX2RpZ19wb3J0LT5iYXNlLnR5 cGUgPT0gSU5URUxfT1VUUFVUX0VEUCkgewogCQkvKgogCQkgKiB2ZGQgb2ZmIGNhbiBnZW5lcmF0 ZSBhIGxvbmcgcHVsc2Ugb24gZURQIHdoaWNoCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCmluZGV4 IDMwNzgwNzY3Mjg5Ni4uNmUzNzVkMmUwNTJjIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9kcnYuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaApA QCAtMTczLDcgKzE3Myw3IEBAIGVudW0gaW50ZWxfb3V0cHV0X3R5cGUgewogCUlOVEVMX09VVFBV VF9EUCA9IDcsCiAJSU5URUxfT1VUUFVUX0VEUCA9IDgsCiAJSU5URUxfT1VUUFVUX0RTSSA9IDks Ci0JSU5URUxfT1VUUFVUX1VOS05PV04gPSAxMCwKKwlJTlRFTF9PVVRQVVRfRERJID0gMTAsCiAJ SU5URUxfT1VUUFVUX0RQX01TVCA9IDExLAogfTsKIApAQCAtMjE2LDYgKzIxNiw5IEBAIHN0cnVj dCBpbnRlbF9lbmNvZGVyIHsKIAllbnVtIHBvcnQgcG9ydDsKIAl1bnNpZ25lZCBpbnQgY2xvbmVh YmxlOwogCXZvaWQgKCpob3RfcGx1Zykoc3RydWN0IGludGVsX2VuY29kZXIgKik7CisJZW51bSBp bnRlbF9vdXRwdXRfdHlwZSAoKmNvbXB1dGVfb3V0cHV0X3R5cGUpKHN0cnVjdCBpbnRlbF9lbmNv ZGVyICosCisJCQkJCQkgICAgICBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqLAorCQkJCQkJICAg ICAgc3RydWN0IGRybV9jb25uZWN0b3Jfc3RhdGUgKik7CiAJYm9vbCAoKmNvbXB1dGVfY29uZmln KShzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqLAogCQkJICAgICAgIHN0cnVjdCBpbnRlbF9jcnRjX3N0 YXRlICosCiAJCQkgICAgICAgc3RydWN0IGRybV9jb25uZWN0b3Jfc3RhdGUgKik7CkBAIC0xMTUx LDcgKzExNTQsNyBAQCBlbmNfdG9fZGlnX3BvcnQoc3RydWN0IGRybV9lbmNvZGVyICplbmNvZGVy KQogCXN0cnVjdCBpbnRlbF9lbmNvZGVyICppbnRlbF9lbmNvZGVyID0gdG9faW50ZWxfZW5jb2Rl cihlbmNvZGVyKTsKIAogCXN3aXRjaCAoaW50ZWxfZW5jb2Rlci0+dHlwZSkgewotCWNhc2UgSU5U RUxfT1VUUFVUX1VOS05PV046CisJY2FzZSBJTlRFTF9PVVRQVVRfRERJOgogCQlXQVJOX09OKCFI QVNfRERJKHRvX2k5MTUoZW5jb2Rlci0+ZGV2KSkpOwogCWNhc2UgSU5URUxfT1VUUFVUX0RQOgog CWNhc2UgSU5URUxfT1VUUFVUX0VEUDoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2hkbWkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2hkbWkuYwppbmRleCBl NmY4ZjMwY2U3YmQuLmFiOGY4ZDc1MTA4MSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfaGRtaS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2hkbWkuYwpA QCAtMTYwNCwxMiArMTYwNCw5IEBAIGludGVsX2hkbWlfZGV0ZWN0KHN0cnVjdCBkcm1fY29ubmVj dG9yICpjb25uZWN0b3IsIGJvb2wgZm9yY2UpCiAKIAlpbnRlbF9oZG1pX3Vuc2V0X2VkaWQoY29u bmVjdG9yKTsKIAotCWlmIChpbnRlbF9oZG1pX3NldF9lZGlkKGNvbm5lY3RvcikpIHsKLQkJc3Ry dWN0IGludGVsX2hkbWkgKmludGVsX2hkbWkgPSBpbnRlbF9hdHRhY2hlZF9oZG1pKGNvbm5lY3Rv cik7Ci0KLQkJaGRtaV90b19kaWdfcG9ydChpbnRlbF9oZG1pKS0+YmFzZS50eXBlID0gSU5URUxf T1VUUFVUX0hETUk7CisJaWYgKGludGVsX2hkbWlfc2V0X2VkaWQoY29ubmVjdG9yKSkKIAkJc3Rh dHVzID0gY29ubmVjdG9yX3N0YXR1c19jb25uZWN0ZWQ7Ci0JfSBlbHNlCisJZWxzZQogCQlzdGF0 dXMgPSBjb25uZWN0b3Jfc3RhdHVzX2Rpc2Nvbm5lY3RlZDsKIAogCWludGVsX2Rpc3BsYXlfcG93 ZXJfcHV0KGRldl9wcml2LCBQT1dFUl9ET01BSU5fR01CVVMpOwpAQCAtMTYyMCw4ICsxNjE3LDYg QEAgaW50ZWxfaGRtaV9kZXRlY3Qoc3RydWN0IGRybV9jb25uZWN0b3IgKmNvbm5lY3RvciwgYm9v bCBmb3JjZSkKIHN0YXRpYyB2b2lkCiBpbnRlbF9oZG1pX2ZvcmNlKHN0cnVjdCBkcm1fY29ubmVj dG9yICpjb25uZWN0b3IpCiB7Ci0Jc3RydWN0IGludGVsX2hkbWkgKmludGVsX2hkbWkgPSBpbnRl bF9hdHRhY2hlZF9oZG1pKGNvbm5lY3Rvcik7Ci0KIAlEUk1fREVCVUdfS01TKCJbQ09OTkVDVE9S OiVkOiVzXVxuIiwKIAkJICAgICAgY29ubmVjdG9yLT5iYXNlLmlkLCBjb25uZWN0b3ItPm5hbWUp OwogCkBAIC0xNjMxLDcgKzE2MjYsNiBAQCBpbnRlbF9oZG1pX2ZvcmNlKHN0cnVjdCBkcm1fY29u bmVjdG9yICpjb25uZWN0b3IpCiAJCXJldHVybjsKIAogCWludGVsX2hkbWlfc2V0X2VkaWQoY29u bmVjdG9yKTsKLQloZG1pX3RvX2RpZ19wb3J0KGludGVsX2hkbWkpLT5iYXNlLnR5cGUgPSBJTlRF TF9PVVRQVVRfSERNSTsKIH0KIAogc3RhdGljIGludCBpbnRlbF9oZG1pX2dldF9tb2RlcyhzdHJ1 Y3QgZHJtX2Nvbm5lY3RvciAqY29ubmVjdG9yKQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfb3ByZWdpb24uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX29wcmVn aW9uLmMKaW5kZXggOTgxNTRlZmNiMmY0Li5kNTdhZGUwYjY1MmEgMTAwNjQ0Ci0tLSBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX29wcmVnaW9uLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfb3ByZWdpb24uYwpAQCAtMzgzLDcgKzM4Myw3IEBAIGludCBpbnRlbF9vcHJlZ2lv bl9ub3RpZnlfZW5jb2RlcihzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqaW50ZWxfZW5jb2RlciwKIAlj YXNlIElOVEVMX09VVFBVVF9BTkFMT0c6CiAJCXR5cGUgPSBESVNQTEFZX1RZUEVfQ1JUOwogCQli cmVhazsKLQljYXNlIElOVEVMX09VVFBVVF9VTktOT1dOOgorCWNhc2UgSU5URUxfT1VUUFVUX0RE SToKIAljYXNlIElOVEVMX09VVFBVVF9EUDoKIAljYXNlIElOVEVMX09VVFBVVF9IRE1JOgogCWNh c2UgSU5URUxfT1VUUFVUX0RQX01TVDoKLS0gCjIuMTMuNQoKX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1n ZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21h aWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==