From: Ville Syrjala Subject: [PATCH v3 4/7] drm/i915: Clean up DP pipe select bits Date: Fri, 18 May 2018 18:29:28 +0300 Message-ID: <20180518152931.13104-4-ville.syrjala@linux.intel.com> References: <20180518152931.13104-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 83ACF6EDE4 for ; Fri, 18 May 2018 15:31:44 +0000 (UTC) In-Reply-To: <20180518152931.13104-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 RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KCkNs ZWFuIHVwIHRoZSBEUCBwaXBlIHNlbGVjdCBiaXRzLiBUbyBtYWtlIHRoZSB3aG9sZSBzaXR1YXRp b24gYSBiaXQKbGVzcyB1Z2x5IHdlJ2xsIHN0YXJ0IHRvIHNoYXJlIHRoZSBzYW1lIGNvZGUgYmV0 d2VlbiAuZ2V0X2h3X3N0YXRlKCksCnRoZSBwb3J0IHN0YXRlIGFzc2VydHMsIGFuZCB0aGUgVkxW IHBvd2VyIHNlcXVlbmNlciBjb2RlLgoKdjI6IFJldHVybiBQSVBFX0EgZm9yIGNwdC9wcHQgd2hl biB0aGUgcG9ydCBpc24ndCBzZWxlY3RlZCBieQogICAgYW55IHRyYW5zY29kZXIuIFJldHVybmlu ZyBJTlZBTElEX1BJUEUgZXhwbG9kZXMgKnNvbWV3aGVyZSoKICAgIG9uIHNvbWUgbWFjaGluZXMg KGNhbid0IGltbWVkaWF0ZWx5IHNlZSB3aGVyZSB0aG91Z2gpLiBUaGlzCiAgICBub3cgbWF0Y2hl cyB0aGUgb2xkIGJlaGF2aW91ci4KdjM6IE9yZGVyIHRoZSBkZWZpbmVzIHNoaWZ0LG1hc2ssdmFs dWUgKEphbmkpCgpTaWduZWQtb2ZmLWJ5OiBWaWxsZSBTeXJqw6Rsw6QgPHZpbGxlLnN5cmphbGFA bGludXguaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcmVnLmggICAg ICB8ICAyNCArKystLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIHwg IDQ4ICsrKysrLS0tLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHAuYyAgICAg IHwgMTEzICsrKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9kcnYuaCAgICAgfCAgIDMgKwogNCBmaWxlcyBjaGFuZ2VkLCA5MiBpbnNl cnRpb25zKCspLCA5NiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X3JlZy5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9yZWcuaAppbmRleCA1 YTEwMzQ5NjQyM2MuLmI4ODhkYTk2Y2FmNyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9yZWcuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3JlZy5oCkBAIC01 MTgyLDEwICs1MTgyLDE1IEBAIGVudW0gewogI2RlZmluZSBDSFZfRFBfRAkJX01NSU8oVkxWX0RJ U1BMQVlfQkFTRSArIDB4NjQzMDApCiAKICNkZWZpbmUgICBEUF9QT1JUX0VOCQkJKDEgPDwgMzEp Ci0jZGVmaW5lICAgRFBfUElQRUJfU0VMRUNUCQkoMSA8PCAzMCkKLSNkZWZpbmUgICBEUF9QSVBF X01BU0sJCQkoMSA8PCAzMCkKLSNkZWZpbmUgICBEUF9QSVBFX1NFTEVDVF9DSFYocGlwZSkJKChw aXBlKSA8PCAxNikKLSNkZWZpbmUgICBEUF9QSVBFX01BU0tfQ0hWCQkoMyA8PCAxNikKKyNkZWZp bmUgICBEUF9QSVBFX1NFTF9TSElGVAkJMzAKKyNkZWZpbmUgICBEUF9QSVBFX1NFTF9NQVNLCQko MSA8PCAzMCkKKyNkZWZpbmUgICBEUF9QSVBFX1NFTChwaXBlKQkJKChwaXBlKSA8PCAzMCkKKyNk ZWZpbmUgICBEUF9QSVBFX1NFTF9TSElGVF9JVkIJCTI5CisjZGVmaW5lICAgRFBfUElQRV9TRUxf TUFTS19JVkIJCSgzIDw8IDI5KQorI2RlZmluZSAgIERQX1BJUEVfU0VMX0lWQihwaXBlKQkJKChw aXBlKSA8PCAyOSkKKyNkZWZpbmUgICBEUF9QSVBFX1NFTF9TSElGVF9DSFYJCTE2CisjZGVmaW5l ICAgRFBfUElQRV9TRUxfTUFTS19DSFYJCSgzIDw8IDE2KQorI2RlZmluZSAgIERQX1BJUEVfU0VM X0NIVihwaXBlKQkJKChwaXBlKSA8PCAxNikKIAogLyogTGluayB0cmFpbmluZyBtb2RlIC0gc2Vs ZWN0IGEgc3VpdGFibGUgbW9kZSBmb3IgZWFjaCBzdGFnZSAqLwogI2RlZmluZSAgIERQX0xJTktf VFJBSU5fUEFUXzEJCSgwIDw8IDI4KQpAQCAtNzg3MiwxNiArNzg3Nyw2IEBAIGVudW0gewogI2Rl ZmluZSBQQ0hfRFBfQVVYX0NIX0RBVEEoYXV4X2NoLCBpKQlfTU1JTyhfUE9SVCgoYXV4X2NoKSAt IEFVWF9DSF9CLCBfUENIX0RQQl9BVVhfQ0hfREFUQTEsIF9QQ0hfRFBDX0FVWF9DSF9EQVRBMSkg KyAoaSkgKiA0KSAvKiA1IHJlZ2lzdGVycyAqLwogCiAvKiBDUFQgKi8KLSNkZWZpbmUgIFBPUlRf VFJBTlNfQV9TRUxfQ1BUCTAKLSNkZWZpbmUgIFBPUlRfVFJBTlNfQl9TRUxfQ1BUCSgxPDwyOSkK LSNkZWZpbmUgIFBPUlRfVFJBTlNfQ19TRUxfQ1BUCSgyPDwyOSkKLSNkZWZpbmUgIFBPUlRfVFJB TlNfU0VMX01BU0sJKDM8PDI5KQotI2RlZmluZSAgUE9SVF9UUkFOU19TRUxfQ1BUKHBpcGUpCSgo cGlwZSkgPDwgMjkpCi0jZGVmaW5lICBQT1JUX1RPX1BJUEUodmFsKQkoKCh2YWwpICYgKDE8PDMw KSkgPj4gMzApCi0jZGVmaW5lICBQT1JUX1RPX1BJUEVfQ1BUKHZhbCkJKCgodmFsKSAmIFBPUlRf VFJBTlNfU0VMX01BU0spID4+IDI5KQotI2RlZmluZSAgU0RWT19QT1JUX1RPX1BJUEVfQ0hWKHZh bCkJKCgodmFsKSAmICgzPDwyNCkpID4+IDI0KQotI2RlZmluZSAgRFBfUE9SVF9UT19QSVBFX0NI Vih2YWwpCSgoKHZhbCkgJiAoMzw8MTYpKSA+PiAxNikKLQogI2RlZmluZSBfVFJBTlNfRFBfQ1RM X0EJCTB4ZTAzMDAKICNkZWZpbmUgX1RSQU5TX0RQX0NUTF9CCQkweGUxMzAwCiAjZGVmaW5lIF9U UkFOU19EUF9DVExfQwkJMHhlMjMwMApAQCAtNzg5MCw3ICs3ODg1LDYgQEAgZW51bSB7CiAjZGVm aW5lICBUUkFOU19EUF9QT1JUX1NFTF9NQVNLCQkoMyA8PCAyOSkKICNkZWZpbmUgIFRSQU5TX0RQ X1BPUlRfU0VMX05PTkUJCSgzIDw8IDI5KQogI2RlZmluZSAgVFJBTlNfRFBfUE9SVF9TRUwocG9y dCkJKCgocG9ydCkgLSBQT1JUX0IpIDw8IDI5KQotI2RlZmluZSAgVFJBTlNfRFBfUElQRV9UT19Q T1JUKHZhbCkJKCgoKHZhbCkgJiBUUkFOU19EUF9QT1JUX1NFTF9NQVNLKSA+PiAyOSkgKyBQT1JU X0IpCiAjZGVmaW5lICBUUkFOU19EUF9BVURJT19PTkxZCSgxPDwyNikKICNkZWZpbmUgIFRSQU5T X0RQX0VOSF9GUkFNSU5HCSgxPDwxOCkKICNkZWZpbmUgIFRSQU5TX0RQXzhCUEMJCSgwPDw5KQpk aWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCmluZGV4IGQzNmRlYTU2OGI4Mi4uZDM5N2Zl YmI1YTdmIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMK KysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCkBAIC0xMzAzLDM4ICsx MzAzLDIyIEBAIHZvaWQgYXNzZXJ0X3BjaF90cmFuc2NvZGVyX2Rpc2FibGVkKHN0cnVjdCBkcm1f aTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAkgICAgIHBpcGVfbmFtZShwaXBlKSk7CiB9CiAKLXN0 YXRpYyBib29sIGRwX3BpcGVfZW5hYmxlZChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3By aXYsCi0JCQkgICAgZW51bSBwaXBlIHBpcGUsIHUzMiBwb3J0X3NlbCwgdTMyIHZhbCkKLXsKLQlp ZiAoKHZhbCAmIERQX1BPUlRfRU4pID09IDApCi0JCXJldHVybiBmYWxzZTsKLQotCWlmIChIQVNf UENIX0NQVChkZXZfcHJpdikpIHsKLQkJdTMyIHRyYW5zX2RwX2N0bCA9IEk5MTVfUkVBRChUUkFO U19EUF9DVEwocGlwZSkpOwotCQlpZiAoKHRyYW5zX2RwX2N0bCAmIFRSQU5TX0RQX1BPUlRfU0VM X01BU0spICE9IHBvcnRfc2VsKQotCQkJcmV0dXJuIGZhbHNlOwotCX0gZWxzZSBpZiAoSVNfQ0hF UlJZVklFVyhkZXZfcHJpdikpIHsKLQkJaWYgKCh2YWwgJiBEUF9QSVBFX01BU0tfQ0hWKSAhPSBE UF9QSVBFX1NFTEVDVF9DSFYocGlwZSkpCi0JCQlyZXR1cm4gZmFsc2U7Ci0JfSBlbHNlIHsKLQkJ aWYgKCh2YWwgJiBEUF9QSVBFX01BU0spICE9IChwaXBlIDw8IDMwKSkKLQkJCXJldHVybiBmYWxz ZTsKLQl9Ci0JcmV0dXJuIHRydWU7Ci19Ci0KIHN0YXRpYyB2b2lkIGFzc2VydF9wY2hfZHBfZGlz YWJsZWQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAotCQkJCSAgIGVudW0gcGlw ZSBwaXBlLCBpOTE1X3JlZ190IHJlZywKLQkJCQkgICB1MzIgcG9ydF9zZWwpCisJCQkJICAgZW51 bSBwaXBlIHBpcGUsIGVudW0gcG9ydCBwb3J0LAorCQkJCSAgIGk5MTVfcmVnX3QgZHBfcmVnKQog ewotCXUzMiB2YWwgPSBJOTE1X1JFQUQocmVnKTsKLQlJOTE1X1NUQVRFX1dBUk4oZHBfcGlwZV9l bmFibGVkKGRldl9wcml2LCBwaXBlLCBwb3J0X3NlbCwgdmFsKSwKLQkgICAgICJQQ0ggRFAgKDB4 JTA4eCkgZW5hYmxlZCBvbiB0cmFuc2NvZGVyICVjLCBzaG91bGQgYmUgZGlzYWJsZWRcbiIsCi0J ICAgICBpOTE1X21taW9fcmVnX29mZnNldChyZWcpLCBwaXBlX25hbWUocGlwZSkpOworCWVudW0g cGlwZSBwb3J0X3BpcGU7CisJYm9vbCBzdGF0ZTsKIAotCUk5MTVfU1RBVEVfV0FSTihIQVNfUENI X0lCWChkZXZfcHJpdikgJiYgKHZhbCAmIERQX1BPUlRfRU4pID09IDAKLQkgICAgICYmICh2YWwg JiBEUF9QSVBFQl9TRUxFQ1QpLAotCSAgICAgIklCWCBQQ0ggZHAgcG9ydCBzdGlsbCB1c2luZyB0 cmFuc2NvZGVyIEJcbiIpOworCXN0YXRlID0gaW50ZWxfZHBfcG9ydF9lbmFibGVkKGRldl9wcml2 LCBkcF9yZWcsIHBvcnQsICZwb3J0X3BpcGUpOworCisJSTkxNV9TVEFURV9XQVJOKHN0YXRlICYm IHBvcnRfcGlwZSA9PSBwaXBlLAorCQkJIlBDSCBEUCAlYyBlbmFibGVkIG9uIHRyYW5zY29kZXIg JWMsIHNob3VsZCBiZSBkaXNhYmxlZFxuIiwKKwkJCXBvcnRfbmFtZShwb3J0KSwgcGlwZV9uYW1l KHBpcGUpKTsKKworCUk5MTVfU1RBVEVfV0FSTihIQVNfUENIX0lCWChkZXZfcHJpdikgJiYgIXN0 YXRlICYmIHBvcnRfcGlwZSA9PSBQSVBFX0IsCisJCQkiSUJYIFBDSCBEUCAlYyBzdGlsbCB1c2lu ZyB0cmFuc2NvZGVyIEJcbiIsCisJCQlwb3J0X25hbWUocG9ydCkpOwogfQogCiBzdGF0aWMgdm9p ZCBhc3NlcnRfcGNoX2hkbWlfZGlzYWJsZWQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9w cml2LApAQCAtMTM2MCw5ICsxMzQ0LDkgQEAgc3RhdGljIHZvaWQgYXNzZXJ0X3BjaF9wb3J0c19k aXNhYmxlZChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiB7CiAJZW51bSBwaXBl IHBvcnRfcGlwZTsKIAotCWFzc2VydF9wY2hfZHBfZGlzYWJsZWQoZGV2X3ByaXYsIHBpcGUsIFBD SF9EUF9CLCBUUkFOU19EUF9QT1JUX1NFTChQT1JUX0IpKTsKLQlhc3NlcnRfcGNoX2RwX2Rpc2Fi bGVkKGRldl9wcml2LCBwaXBlLCBQQ0hfRFBfQywgVFJBTlNfRFBfUE9SVF9TRUwoUE9SVF9DKSk7 Ci0JYXNzZXJ0X3BjaF9kcF9kaXNhYmxlZChkZXZfcHJpdiwgcGlwZSwgUENIX0RQX0QsIFRSQU5T X0RQX1BPUlRfU0VMKFBPUlRfRCkpOworCWFzc2VydF9wY2hfZHBfZGlzYWJsZWQoZGV2X3ByaXYs IHBpcGUsIFBPUlRfQiwgUENIX0RQX0IpOworCWFzc2VydF9wY2hfZHBfZGlzYWJsZWQoZGV2X3By aXYsIHBpcGUsIFBPUlRfQywgUENIX0RQX0MpOworCWFzc2VydF9wY2hfZHBfZGlzYWJsZWQoZGV2 X3ByaXYsIHBpcGUsIFBPUlRfRCwgUENIX0RQX0QpOwogCiAJSTkxNV9TVEFURV9XQVJOKGludGVs X2NydF9wb3J0X2VuYWJsZWQoZGV2X3ByaXYsIFBDSF9BRFBBLCAmcG9ydF9waXBlKSAmJgogCQkJ cG9ydF9waXBlID09IHBpcGUsCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9kcC5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHAuYwppbmRleCAxMDIwNzA5NDAw OTUuLmFhYjQ4MjgzZjE1NSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf ZHAuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcC5jCkBAIC01MjksOSArNTI5 LDkgQEAgdmx2X3Bvd2VyX3NlcXVlbmNlcl9raWNrKHN0cnVjdCBpbnRlbF9kcCAqaW50ZWxfZHAp CiAJRFAgfD0gRFBfTElOS19UUkFJTl9QQVRfMTsKIAogCWlmIChJU19DSEVSUllWSUVXKGRldl9w cml2KSkKLQkJRFAgfD0gRFBfUElQRV9TRUxFQ1RfQ0hWKHBpcGUpOwotCWVsc2UgaWYgKHBpcGUg PT0gUElQRV9CKQotCQlEUCB8PSBEUF9QSVBFQl9TRUxFQ1Q7CisJCURQIHw9IERQX1BJUEVfU0VM X0NIVihwaXBlKTsKKwllbHNlCisJCURQIHw9IERQX1BJUEVfU0VMKHBpcGUpOwogCiAJcGxsX2Vu YWJsZWQgPSBJOTE1X1JFQUQoRFBMTChwaXBlKSkgJiBEUExMX1ZDT19FTkFCTEU7CiAKQEAgLTE5 OTksNyArMTk5OSw3IEBAIHN0YXRpYyB2b2lkIGludGVsX2RwX3ByZXBhcmUoc3RydWN0IGludGVs X2VuY29kZXIgKmVuY29kZXIsCiAJCWlmIChkcm1fZHBfZW5oYW5jZWRfZnJhbWVfY2FwKGludGVs X2RwLT5kcGNkKSkKIAkJCWludGVsX2RwLT5EUCB8PSBEUF9FTkhBTkNFRF9GUkFNSU5HOwogCi0J CWludGVsX2RwLT5EUCB8PSBjcnRjLT5waXBlIDw8IDI5OworCQlpbnRlbF9kcC0+RFAgfD0gRFBf UElQRV9TRUxfSVZCKGNydGMtPnBpcGUpOwogCX0gZWxzZSBpZiAoSEFTX1BDSF9DUFQoZGV2X3By aXYpICYmIHBvcnQgIT0gUE9SVF9BKSB7CiAJCXUzMiB0cmFuc19kcDsKIApAQCAtMjAyNSw5ICsy MDI1LDkgQEAgc3RhdGljIHZvaWQgaW50ZWxfZHBfcHJlcGFyZShzdHJ1Y3QgaW50ZWxfZW5jb2Rl ciAqZW5jb2RlciwKIAkJCWludGVsX2RwLT5EUCB8PSBEUF9FTkhBTkNFRF9GUkFNSU5HOwogCiAJ CWlmIChJU19DSEVSUllWSUVXKGRldl9wcml2KSkKLQkJCWludGVsX2RwLT5EUCB8PSBEUF9QSVBF X1NFTEVDVF9DSFYoY3J0Yy0+cGlwZSk7Ci0JCWVsc2UgaWYgKGNydGMtPnBpcGUgPT0gUElQRV9C KQotCQkJaW50ZWxfZHAtPkRQIHw9IERQX1BJUEVCX1NFTEVDVDsKKwkJCWludGVsX2RwLT5EUCB8 PSBEUF9QSVBFX1NFTF9DSFYoY3J0Yy0+cGlwZSk7CisJCWVsc2UKKwkJCWludGVsX2RwLT5EUCB8 PSBEUF9QSVBFX1NFTChjcnRjLT5waXBlKTsKIAl9CiB9CiAKQEAgLTI2NDksNTIgKzI2NDksNjYg QEAgdm9pZCBpbnRlbF9kcF9zaW5rX2RwbXMoc3RydWN0IGludGVsX2RwICppbnRlbF9kcCwgaW50 IG1vZGUpCiAJCQkgICAgICBtb2RlID09IERSTV9NT0RFX0RQTVNfT04gPyAiZW5hYmxlIiA6ICJk aXNhYmxlIik7CiB9CiAKK3N0YXRpYyBib29sIGNwdF9kcF9wb3J0X3NlbGVjdGVkKHN0cnVjdCBk cm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKKwkJCQkgZW51bSBwb3J0IHBvcnQsIGVudW0gcGlw ZSAqcGlwZSkKK3sKKwllbnVtIHBpcGUgcDsKKworCWZvcl9lYWNoX3BpcGUoZGV2X3ByaXYsIHAp IHsKKwkJdTMyIHZhbCA9IEk5MTVfUkVBRChUUkFOU19EUF9DVEwocCkpOworCisJCWlmICgodmFs ICYgVFJBTlNfRFBfUE9SVF9TRUxfTUFTSykgPT0gVFJBTlNfRFBfUE9SVF9TRUwocG9ydCkpIHsK KwkJCSpwaXBlID0gcDsKKwkJCXJldHVybiB0cnVlOworCQl9CisJfQorCisJRFJNX0RFQlVHX0tN UygiTm8gcGlwZSBmb3IgRFAgcG9ydCAlYyBmb3VuZFxuIiwgcG9ydF9uYW1lKHBvcnQpKTsKKwor CS8qIG11c3QgaW5pdGlhbGl6ZSBwaXBlIHRvIHNvbWV0aGluZyBmb3IgdGhlIGFzc2VydHMgKi8K KwkqcGlwZSA9IFBJUEVfQTsKKworCXJldHVybiBmYWxzZTsKK30KKworYm9vbCBpbnRlbF9kcF9w b3J0X2VuYWJsZWQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAorCQkJICAgaTkx NV9yZWdfdCBkcF9yZWcsIGVudW0gcG9ydCBwb3J0LAorCQkJICAgZW51bSBwaXBlICpwaXBlKQor eworCWJvb2wgcmV0OworCXUzMiB2YWw7CisKKwl2YWwgPSBJOTE1X1JFQUQoZHBfcmVnKTsKKwor CXJldCA9IHZhbCAmIERQX1BPUlRfRU47CisKKwkvKiBhc3NlcnRzIHdhbnQgdG8ga25vdyB0aGUg cGlwZSBldmVuIGlmIHRoZSBwb3J0IGlzIGRpc2FibGVkICovCisJaWYgKElTX0lWWUJSSURHRShk ZXZfcHJpdikgJiYgcG9ydCA9PSBQT1JUX0EpCisJCSpwaXBlID0gKHZhbCAmIERQX1BJUEVfU0VM X01BU0tfSVZCKSA+PiBEUF9QSVBFX1NFTF9TSElGVF9JVkI7CisJZWxzZSBpZiAoSEFTX1BDSF9D UFQoZGV2X3ByaXYpICYmIHBvcnQgIT0gUE9SVF9BKQorCQlyZXQgJj0gY3B0X2RwX3BvcnRfc2Vs ZWN0ZWQoZGV2X3ByaXYsIHBvcnQsIHBpcGUpOworCWVsc2UgaWYgKElTX0NIRVJSWVZJRVcoZGV2 X3ByaXYpKQorCQkqcGlwZSA9ICh2YWwgJiBEUF9QSVBFX1NFTF9NQVNLX0NIVikgPj4gRFBfUElQ RV9TRUxfU0hJRlRfQ0hWOworCWVsc2UKKwkJKnBpcGUgPSAodmFsICYgRFBfUElQRV9TRUxfTUFT SykgPj4gRFBfUElQRV9TRUxfU0hJRlQ7CisKKwlyZXR1cm4gcmV0OworfQorCiBzdGF0aWMgYm9v bCBpbnRlbF9kcF9nZXRfaHdfc3RhdGUoc3RydWN0IGludGVsX2VuY29kZXIgKmVuY29kZXIsCiAJ CQkJICBlbnVtIHBpcGUgKnBpcGUpCiB7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9w cml2ID0gdG9faTkxNShlbmNvZGVyLT5iYXNlLmRldik7CiAJc3RydWN0IGludGVsX2RwICppbnRl bF9kcCA9IGVuY190b19pbnRlbF9kcCgmZW5jb2Rlci0+YmFzZSk7Ci0JZW51bSBwb3J0IHBvcnQg PSBlbmNvZGVyLT5wb3J0OwotCXUzMiB0bXA7CiAJYm9vbCByZXQ7CiAKIAlpZiAoIWludGVsX2Rp c3BsYXlfcG93ZXJfZ2V0X2lmX2VuYWJsZWQoZGV2X3ByaXYsCiAJCQkJCQllbmNvZGVyLT5wb3dl cl9kb21haW4pKQogCQlyZXR1cm4gZmFsc2U7CiAKLQlyZXQgPSBmYWxzZTsKKwlyZXQgPSBpbnRl bF9kcF9wb3J0X2VuYWJsZWQoZGV2X3ByaXYsIGludGVsX2RwLT5vdXRwdXRfcmVnLAorCQkJCSAg ICBlbmNvZGVyLT5wb3J0LCBwaXBlKTsKIAotCXRtcCA9IEk5MTVfUkVBRChpbnRlbF9kcC0+b3V0 cHV0X3JlZyk7Ci0KLQlpZiAoISh0bXAgJiBEUF9QT1JUX0VOKSkKLQkJZ290byBvdXQ7Ci0KLQlp ZiAoSVNfSVZZQlJJREdFKGRldl9wcml2KSAmJiBwb3J0ID09IFBPUlRfQSkgewotCQkqcGlwZSA9 IFBPUlRfVE9fUElQRV9DUFQodG1wKTsKLQl9IGVsc2UgaWYgKEhBU19QQ0hfQ1BUKGRldl9wcml2 KSAmJiBwb3J0ICE9IFBPUlRfQSkgewotCQllbnVtIHBpcGUgcDsKLQotCQlmb3JfZWFjaF9waXBl KGRldl9wcml2LCBwKSB7Ci0JCQl1MzIgdHJhbnNfZHAgPSBJOTE1X1JFQUQoVFJBTlNfRFBfQ1RM KHApKTsKLQkJCWlmIChUUkFOU19EUF9QSVBFX1RPX1BPUlQodHJhbnNfZHApID09IHBvcnQpIHsK LQkJCQkqcGlwZSA9IHA7Ci0JCQkJcmV0ID0gdHJ1ZTsKLQotCQkJCWdvdG8gb3V0OwotCQkJfQot CQl9Ci0KLQkJRFJNX0RFQlVHX0tNUygiTm8gcGlwZSBmb3IgZHAgcG9ydCAweCV4IGZvdW5kXG4i LAotCQkJICAgICAgaTkxNV9tbWlvX3JlZ19vZmZzZXQoaW50ZWxfZHAtPm91dHB1dF9yZWcpKTsK LQl9IGVsc2UgaWYgKElTX0NIRVJSWVZJRVcoZGV2X3ByaXYpKSB7Ci0JCSpwaXBlID0gRFBfUE9S VF9UT19QSVBFX0NIVih0bXApOwotCX0gZWxzZSB7Ci0JCSpwaXBlID0gUE9SVF9UT19QSVBFKHRt cCk7Ci0JfQotCi0JcmV0ID0gdHJ1ZTsKLQotb3V0OgogCWludGVsX2Rpc3BsYXlfcG93ZXJfcHV0 KGRldl9wcml2LCBlbmNvZGVyLT5wb3dlcl9kb21haW4pOwogCiAJcmV0dXJuIHJldDsKQEAgLTM2 ODQsOCArMzY5OCw5IEBAIGludGVsX2RwX2xpbmtfZG93bihzdHJ1Y3QgaW50ZWxfZW5jb2RlciAq ZW5jb2RlciwKIAkJaW50ZWxfc2V0X3BjaF9maWZvX3VuZGVycnVuX3JlcG9ydGluZyhkZXZfcHJp diwgUElQRV9BLCBmYWxzZSk7CiAKIAkJLyogYWx3YXlzIGVuYWJsZSB3aXRoIHBhdHRlcm4gMSAo YXMgcGVyIHNwZWMpICovCi0JCURQICY9IH4oRFBfUElQRUJfU0VMRUNUIHwgRFBfTElOS19UUkFJ Tl9NQVNLKTsKLQkJRFAgfD0gRFBfUE9SVF9FTiB8IERQX0xJTktfVFJBSU5fUEFUXzE7CisJCURQ ICY9IH4oRFBfUElQRV9TRUxfTUFTSyB8IERQX0xJTktfVFJBSU5fTUFTSyk7CisJCURQIHw9IERQ X1BPUlRfRU4gfCBEUF9QSVBFX1NFTChQSVBFX0EpIHwKKwkJCURQX0xJTktfVFJBSU5fUEFUXzE7 CiAJCUk5MTVfV1JJVEUoaW50ZWxfZHAtPm91dHB1dF9yZWcsIERQKTsKIAkJUE9TVElOR19SRUFE KGludGVsX2RwLT5vdXRwdXRfcmVnKTsKIApAQCAtNTMyMCwxNCArNTMzNSwxNCBAQCBzdGF0aWMg dm9pZCBpbnRlbF9lZHBfcGFuZWxfdmRkX3Nhbml0aXplKHN0cnVjdCBpbnRlbF9kcCAqaW50ZWxf ZHApCiBzdGF0aWMgZW51bSBwaXBlIHZsdl9hY3RpdmVfcGlwZShzdHJ1Y3QgaW50ZWxfZHAgKmlu dGVsX2RwKQogewogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUo aW50ZWxfZHBfdG9fZGV2KGludGVsX2RwKSk7CisJc3RydWN0IGludGVsX2VuY29kZXIgKmVuY29k ZXIgPSAmZHBfdG9fZGlnX3BvcnQoaW50ZWxfZHApLT5iYXNlOworCWVudW0gcGlwZSBwaXBlOwog Ci0JaWYgKChpbnRlbF9kcC0+RFAgJiBEUF9QT1JUX0VOKSA9PSAwKQotCQlyZXR1cm4gSU5WQUxJ RF9QSVBFOworCWlmIChpbnRlbF9kcF9wb3J0X2VuYWJsZWQoZGV2X3ByaXYsIGludGVsX2RwLT5v dXRwdXRfcmVnLAorCQkJCSAgZW5jb2Rlci0+cG9ydCwgJnBpcGUpKQorCQlyZXR1cm4gcGlwZTsK IAotCWlmIChJU19DSEVSUllWSUVXKGRldl9wcml2KSkKLQkJcmV0dXJuIERQX1BPUlRfVE9fUElQ RV9DSFYoaW50ZWxfZHAtPkRQKTsKLQllbHNlCi0JCXJldHVybiBQT1JUX1RPX1BJUEUoaW50ZWxf ZHAtPkRQKTsKKwlyZXR1cm4gSU5WQUxJRF9QSVBFOwogfQogCiB2b2lkIGludGVsX2RwX2VuY29k ZXJfcmVzZXQoc3RydWN0IGRybV9lbmNvZGVyICplbmNvZGVyKQpkaWZmIC0tZ2l0IGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9k cnYuaAppbmRleCBhODI3YTIyNDVjMTguLmRjN2Y4MWUxZTIwYSAxMDA2NDQKLS0tIGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfZHJ2LmgKQEAgLTE2NDcsNiArMTY0Nyw5IEBAIHZvaWQgaW50ZWxfY3NyX3Vjb2RlX3N1c3Bl bmQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKik7CiB2b2lkIGludGVsX2Nzcl91Y29kZV9yZXN1 bWUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKik7CiAKIC8qIGludGVsX2RwLmMgKi8KK2Jvb2wg aW50ZWxfZHBfcG9ydF9lbmFibGVkKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwK KwkJCSAgIGk5MTVfcmVnX3QgZHBfcmVnLCBlbnVtIHBvcnQgcG9ydCwKKwkJCSAgIGVudW0gcGlw ZSAqcGlwZSk7CiBib29sIGludGVsX2RwX2luaXQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRl dl9wcml2LCBpOTE1X3JlZ190IG91dHB1dF9yZWcsCiAJCSAgIGVudW0gcG9ydCBwb3J0KTsKIGJv b2wgaW50ZWxfZHBfaW5pdF9jb25uZWN0b3Ioc3RydWN0IGludGVsX2RpZ2l0YWxfcG9ydCAqaW50 ZWxfZGlnX3BvcnQsCi0tIAoyLjE2LjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZy ZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3Rp bmZvL2ludGVsLWdmeAo=