From: Ville Syrjala Subject: [PATCH 01/14] drm/i915: Clean up ADPA pipe select bits Date: Fri, 2 Mar 2018 11:54:59 +0200 Message-ID: <20180302095512.19329-2-ville.syrjala@linux.intel.com> References: <20180302095512.19329-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 mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTPS id 193906EE7B for ; Fri, 2 Mar 2018 09:55:18 +0000 (UTC) In-Reply-To: <20180302095512.19329-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 ZWFuIHVwIHRoZSBBRFBBIHBpcGUgc2VsZWN0IGJpdHMuIFRvIG1ha2UgdGhlIHdob2xlIHNpdHVh dGlvbiBhIGJpdApsZXNzIHVnbHkgd2UnbGwgc3RhcnQgdG8gc2hhcmUgdGhlIHNhbWUgY29kZSBi ZXR3ZWVuIC5nZXRfaHdfc3RhdGUoKQphbmQgdGhlIHBvcnQgc3RhdGUgYXNzZXJ0cy4KClNpZ25l ZC1vZmYtYnk6IFZpbGxlIFN5cmrDpGzDpCA8dmlsbGUuc3lyamFsYUBsaW51eC5pbnRlbC5jb20+ Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9yZWcuaCAgICAgIHwgMTEgKysrKystLS0t LQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfY3J0LmMgICAgIHwgNDAgKysrKysrKysrKysr KysrKysrLS0tLS0tLS0tLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNw bGF5LmMgfCAyNCArKysrKy0tLS0tLS0tLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9kcnYuaCAgICAgfCAgMiArKwogNCBmaWxlcyBjaGFuZ2VkLCAzMyBpbnNlcnRpb25zKCsp LCA0NCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X3JlZy5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9yZWcuaAppbmRleCA5NWEyZTUxZWNi YjAuLmY1NzMwOTVkNjBjMiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9y ZWcuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3JlZy5oCkBAIC00MTk5LDExICs0 MTk5LDEyIEBAIGVudW0gewogCiAjZGVmaW5lICAgQURQQV9EQUNfRU5BQkxFCSgxPDwzMSkKICNk ZWZpbmUgICBBRFBBX0RBQ19ESVNBQkxFCTAKLSNkZWZpbmUgICBBRFBBX1BJUEVfU0VMRUNUX01B U0sJKDE8PDMwKQotI2RlZmluZSAgIEFEUEFfUElQRV9BX1NFTEVDVAkwCi0jZGVmaW5lICAgQURQ QV9QSVBFX0JfU0VMRUNUCSgxPDwzMCkKLSNkZWZpbmUgICBBRFBBX1BJUEVfU0VMRUNUKHBpcGUp ICgocGlwZSkgPDwgMzApCi0vKiBDUFQgdXNlcyBiaXRzIDI5OjMwIGZvciBwY2ggdHJhbnNjb2Rl ciBzZWxlY3QgKi8KKyNkZWZpbmUgICBBRFBBX1BJUEVfU0VMX01BU0sJCSgxPDwzMCkKKyNkZWZp bmUgICBBRFBBX1BJUEVfU0VMX1NISUZUCQkzMAorI2RlZmluZSAgIEFEUEFfUElQRV9TRUwocGlw ZSkJCSgocGlwZSkgPDwgMzApCisjZGVmaW5lICAgQURQQV9QSVBFX1NFTF9NQVNLX0NQVAkoMzw8 MjkpCisjZGVmaW5lICAgQURQQV9QSVBFX1NFTF9TSElGVF9DUFQJMjkKKyNkZWZpbmUgICBBRFBB X1BJUEVfU0VMX0NQVChwaXBlKQkoKHBpcGUpIDw8IDI5KQogI2RlZmluZSAgIEFEUEFfQ1JUX0hP VFBMVUdfTUFTSyAgMHgwM2ZmMDAwMCAvKiBiaXQgMjUtMTYgKi8KICNkZWZpbmUgICBBRFBBX0NS VF9IT1RQTFVHX01PTklUT1JfTk9ORSAgKDA8PDI0KQogI2RlZmluZSAgIEFEUEFfQ1JUX0hPVFBM VUdfTU9OSVRPUl9NQVNLICAoMzw8MjQpCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9jcnQuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2NydC5jCmluZGV4IDM5 MWRkNjlhZTBhNC4uODg4ODlhZjQ0NjA4IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9jcnQuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9jcnQuYwpAQCAt NjMsMzMgKzYzLDM1IEBAIHN0YXRpYyBzdHJ1Y3QgaW50ZWxfY3J0ICppbnRlbF9hdHRhY2hlZF9j cnQoc3RydWN0IGRybV9jb25uZWN0b3IgKmNvbm5lY3RvcikKIAlyZXR1cm4gaW50ZWxfZW5jb2Rl cl90b19jcnQoaW50ZWxfYXR0YWNoZWRfZW5jb2Rlcihjb25uZWN0b3IpKTsKIH0KIAorYm9vbCBp bnRlbF9jcnRfcG9ydF9lbmFibGVkKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwK KwkJCSAgICBpOTE1X3JlZ190IGFkcGFfcmVnLCBlbnVtIHBpcGUgKnBpcGUpCit7CisJdTMyIHZh bDsKKworCXZhbCA9IEk5MTVfUkVBRChhZHBhX3JlZyk7CisKKwkvKiBhc3NlcnRzIHdhbnQgdG8g a25vdyB0aGUgcGlwZSBldmVuIGlmIHRoZSBwb3J0IGlzIGRpc2FibGVkICovCisJaWYgKEhBU19Q Q0hfQ1BUKGRldl9wcml2KSkKKwkJKnBpcGUgPSAodmFsICYgQURQQV9QSVBFX1NFTF9NQVNLX0NQ VCkgPj4gQURQQV9QSVBFX1NFTF9TSElGVF9DUFQ7CisJZWxzZQorCQkqcGlwZSA9ICh2YWwgJiBB RFBBX1BJUEVfU0VMX01BU0spID4+IEFEUEFfUElQRV9TRUxfU0hJRlQ7CisKKwlyZXR1cm4gdmFs ICYgQURQQV9EQUNfRU5BQkxFOworfQorCiBzdGF0aWMgYm9vbCBpbnRlbF9jcnRfZ2V0X2h3X3N0 YXRlKHN0cnVjdCBpbnRlbF9lbmNvZGVyICplbmNvZGVyLAogCQkJCSAgIGVudW0gcGlwZSAqcGlw ZSkKIHsKLQlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gZW5jb2Rlci0+YmFzZS5kZXY7Ci0Jc3Ry dWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShkZXYpOworCXN0cnVjdCBk cm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoZW5jb2Rlci0+YmFzZS5kZXYpOwog CXN0cnVjdCBpbnRlbF9jcnQgKmNydCA9IGludGVsX2VuY29kZXJfdG9fY3J0KGVuY29kZXIpOwot CXUzMiB0bXA7CiAJYm9vbCByZXQ7CiAKIAlpZiAoIWludGVsX2Rpc3BsYXlfcG93ZXJfZ2V0X2lm X2VuYWJsZWQoZGV2X3ByaXYsCiAJCQkJCQllbmNvZGVyLT5wb3dlcl9kb21haW4pKQogCQlyZXR1 cm4gZmFsc2U7CiAKLQlyZXQgPSBmYWxzZTsKLQotCXRtcCA9IEk5MTVfUkVBRChjcnQtPmFkcGFf cmVnKTsKLQotCWlmICghKHRtcCAmIEFEUEFfREFDX0VOQUJMRSkpCi0JCWdvdG8gb3V0OworCXJl dCA9IGludGVsX2NydF9wb3J0X2VuYWJsZWQoZGV2X3ByaXYsIGNydC0+YWRwYV9yZWcsIHBpcGUp OwogCi0JaWYgKEhBU19QQ0hfQ1BUKGRldl9wcml2KSkKLQkJKnBpcGUgPSBQT1JUX1RPX1BJUEVf Q1BUKHRtcCk7Ci0JZWxzZQotCQkqcGlwZSA9IFBPUlRfVE9fUElQRSh0bXApOwotCi0JcmV0ID0g dHJ1ZTsKLW91dDoKIAlpbnRlbF9kaXNwbGF5X3Bvd2VyX3B1dChkZXZfcHJpdiwgZW5jb2Rlci0+ cG93ZXJfZG9tYWluKTsKIAogCXJldHVybiByZXQ7CkBAIC0xNjgsMTEgKzE3MCw5IEBAIHN0YXRp YyB2b2lkIGludGVsX2NydF9zZXRfZHBtcyhzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqZW5jb2RlciwK IAlpZiAoSEFTX1BDSF9MUFQoZGV2X3ByaXYpKQogCQk7IC8qIFRob3NlIGJpdHMgZG9uJ3QgZXhp c3QgaGVyZSAqLwogCWVsc2UgaWYgKEhBU19QQ0hfQ1BUKGRldl9wcml2KSkKLQkJYWRwYSB8PSBQ T1JUX1RSQU5TX1NFTF9DUFQoY3J0Yy0+cGlwZSk7Ci0JZWxzZSBpZiAoY3J0Yy0+cGlwZSA9PSAw KQotCQlhZHBhIHw9IEFEUEFfUElQRV9BX1NFTEVDVDsKKwkJYWRwYSB8PSBBRFBBX1BJUEVfU0VM X0NQVChjcnRjLT5waXBlKTsKIAllbHNlCi0JCWFkcGEgfD0gQURQQV9QSVBFX0JfU0VMRUNUOwor CQlhZHBhIHw9IEFEUEFfUElQRV9TRUwoY3J0Yy0+cGlwZSk7CiAKIAlpZiAoIUhBU19QQ0hfU1BM SVQoZGV2X3ByaXYpKQogCQlJOTE1X1dSSVRFKEJDTFJQQVQoY3J0Yy0+cGlwZSksIDApOwpkaWZm IC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCmluZGV4IDc0MGE5MThlZTU3OC4uNTQ1ZDg5MTUy ZTliIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKKysr IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCkBAIC0xMzE3LDIxICsxMzE3 LDYgQEAgc3RhdGljIGJvb2wgbHZkc19waXBlX2VuYWJsZWQoc3RydWN0IGRybV9pOTE1X3ByaXZh dGUgKmRldl9wcml2LAogCXJldHVybiB0cnVlOwogfQogCi1zdGF0aWMgYm9vbCBhZHBhX3BpcGVf ZW5hYmxlZChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCi0JCQkgICAgICBlbnVt IHBpcGUgcGlwZSwgdTMyIHZhbCkKLXsKLQlpZiAoKHZhbCAmIEFEUEFfREFDX0VOQUJMRSkgPT0g MCkKLQkJcmV0dXJuIGZhbHNlOwotCWlmIChIQVNfUENIX0NQVChkZXZfcHJpdikpIHsKLQkJaWYg KCh2YWwgJiBQT1JUX1RSQU5TX1NFTF9NQVNLKSAhPSBQT1JUX1RSQU5TX1NFTF9DUFQocGlwZSkp Ci0JCQlyZXR1cm4gZmFsc2U7Ci0JfSBlbHNlIHsKLQkJaWYgKCh2YWwgJiBBRFBBX1BJUEVfU0VM RUNUX01BU0spICE9IEFEUEFfUElQRV9TRUxFQ1QocGlwZSkpCi0JCQlyZXR1cm4gZmFsc2U7Ci0J fQotCXJldHVybiB0cnVlOwotfQotCiBzdGF0aWMgdm9pZCBhc3NlcnRfcGNoX2RwX2Rpc2FibGVk KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAkJCQkgICBlbnVtIHBpcGUgcGlw ZSwgaTkxNV9yZWdfdCByZWcsCiAJCQkJICAgdTMyIHBvcnRfc2VsKQpAQCAtMTM2MiwxNiArMTM0 NywxNyBAQCBzdGF0aWMgdm9pZCBhc3NlcnRfcGNoX2hkbWlfZGlzYWJsZWQoc3RydWN0IGRybV9p OTE1X3ByaXZhdGUgKmRldl9wcml2LAogc3RhdGljIHZvaWQgYXNzZXJ0X3BjaF9wb3J0c19kaXNh YmxlZChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAJCQkJICAgICAgZW51bSBw aXBlIHBpcGUpCiB7CisJZW51bSBwaXBlIHBvcnRfcGlwZTsKIAl1MzIgdmFsOwogCiAJYXNzZXJ0 X3BjaF9kcF9kaXNhYmxlZChkZXZfcHJpdiwgcGlwZSwgUENIX0RQX0IsIFRSQU5TX0RQX1BPUlRf U0VMX0IpOwogCWFzc2VydF9wY2hfZHBfZGlzYWJsZWQoZGV2X3ByaXYsIHBpcGUsIFBDSF9EUF9D LCBUUkFOU19EUF9QT1JUX1NFTF9DKTsKIAlhc3NlcnRfcGNoX2RwX2Rpc2FibGVkKGRldl9wcml2 LCBwaXBlLCBQQ0hfRFBfRCwgVFJBTlNfRFBfUE9SVF9TRUxfRCk7CiAKLQl2YWwgPSBJOTE1X1JF QUQoUENIX0FEUEEpOwotCUk5MTVfU1RBVEVfV0FSTihhZHBhX3BpcGVfZW5hYmxlZChkZXZfcHJp diwgcGlwZSwgdmFsKSwKLQkgICAgICJQQ0ggVkdBIGVuYWJsZWQgb24gdHJhbnNjb2RlciAlYywg c2hvdWxkIGJlIGRpc2FibGVkXG4iLAotCSAgICAgcGlwZV9uYW1lKHBpcGUpKTsKKwlJOTE1X1NU QVRFX1dBUk4oaW50ZWxfY3J0X3BvcnRfZW5hYmxlZChkZXZfcHJpdiwgUENIX0FEUEEsICZwb3J0 X3BpcGUpICYmCisJCQlwb3J0X3BpcGUgPT0gcGlwZSwKKwkJCSJQQ0ggVkdBIGVuYWJsZWQgb24g dHJhbnNjb2RlciAlYywgc2hvdWxkIGJlIGRpc2FibGVkXG4iLAorCQkJcGlwZV9uYW1lKHBpcGUp KTsKIAogCXZhbCA9IEk5MTVfUkVBRChQQ0hfTFZEUyk7CiAJSTkxNV9TVEFURV9XQVJOKGx2ZHNf cGlwZV9lbmFibGVkKGRldl9wcml2LCBwaXBlLCB2YWwpLApkaWZmIC0tZ2l0IGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYu aAppbmRleCA2NTJiMTFlNzg4Y2MuLjc5ZTc0MTg0NWUxNiAxMDA2NDQKLS0tIGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf ZHJ2LmgKQEAgLTEzNTUsNiArMTM1NSw4IEBAIHZvaWQgZ2VuOV9lbmFibGVfZ3VjX2ludGVycnVw dHMoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KTsKIHZvaWQgZ2VuOV9kaXNhYmxl X2d1Y19pbnRlcnJ1cHRzKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdik7CiAKIC8q IGludGVsX2NydC5jICovCitib29sIGludGVsX2NydF9wb3J0X2VuYWJsZWQoc3RydWN0IGRybV9p OTE1X3ByaXZhdGUgKmRldl9wcml2LAorCQkJICAgIGk5MTVfcmVnX3QgYWRwYV9yZWcsIGVudW0g cGlwZSAqcGlwZSk7CiB2b2lkIGludGVsX2NydF9pbml0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRl ICpkZXZfcHJpdik7CiB2b2lkIGludGVsX2NydF9yZXNldChzdHJ1Y3QgZHJtX2VuY29kZXIgKmVu Y29kZXIpOwogCi0tIAoyLjEzLjYKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVk ZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZv L2ludGVsLWdmeAo=