From: Ville Syrjala Subject: [PATCH 1/5] drm/i915: Clean up ADPA pipe select bits Date: Mon, 14 May 2018 20:24:19 +0300 Message-ID: <20180514172423.9302-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 mga05.intel.com (mga05.intel.com [192.55.52.43]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9C3B989D4D for ; Mon, 14 May 2018 17:24:26 +0000 (UTC) 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 ZXR3ZWVuIC5nZXRfaHdfc3RhdGUoKQphbmQgdGhlIHBvcnQgc3RhdGUgYXNzZXJ0cy4KCnYyOiBP cmRlciB0aGUgZGVmaW5lcyBzaGlmdCxtYXNrLHZhbHVlIChKYW5pKQoKUmV2aWV3ZWQtYnk6IEph bmkgTmlrdWxhIDxqYW5pLm5pa3VsYUBpbnRlbC5jb20+ClNpZ25lZC1vZmYtYnk6IFZpbGxlIFN5 cmrDpGzDpCA8dmlsbGUuc3lyamFsYUBsaW51eC5pbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9yZWcuaCAgICAgIHwgMTEgKysrKystLS0tLQogZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfY3J0LmMgICAgIHwgNDAgKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0t LS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgfCAyNCArKysrKy0t LS0tLS0tLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaCAgICAgfCAg MiArKwogNCBmaWxlcyBjaGFuZ2VkLCAzMyBpbnNlcnRpb25zKCspLCA0NCBkZWxldGlvbnMoLSkK CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3JlZy5oIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9yZWcuaAppbmRleCBmMTFiYjIxM2VjMDcuLmFlM2MyNjIxNjk5NiAx MDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9yZWcuaAorKysgYi9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X3JlZy5oCkBAIC00MTMzLDExICs0MTMzLDEyIEBAIGVudW0gewog CiAjZGVmaW5lICAgQURQQV9EQUNfRU5BQkxFCSgxPDwzMSkKICNkZWZpbmUgICBBRFBBX0RBQ19E SVNBQkxFCTAKLSNkZWZpbmUgICBBRFBBX1BJUEVfU0VMRUNUX01BU0sJKDE8PDMwKQotI2RlZmlu ZSAgIEFEUEFfUElQRV9BX1NFTEVDVAkwCi0jZGVmaW5lICAgQURQQV9QSVBFX0JfU0VMRUNUCSgx PDwzMCkKLSNkZWZpbmUgICBBRFBBX1BJUEVfU0VMRUNUKHBpcGUpICgocGlwZSkgPDwgMzApCi0v KiBDUFQgdXNlcyBiaXRzIDI5OjMwIGZvciBwY2ggdHJhbnNjb2RlciBzZWxlY3QgKi8KKyNkZWZp bmUgICBBRFBBX1BJUEVfU0VMX1NISUZUCQkzMAorI2RlZmluZSAgIEFEUEFfUElQRV9TRUxfTUFT SwkJKDE8PDMwKQorI2RlZmluZSAgIEFEUEFfUElQRV9TRUwocGlwZSkJCSgocGlwZSkgPDwgMzAp CisjZGVmaW5lICAgQURQQV9QSVBFX1NFTF9TSElGVF9DUFQJMjkKKyNkZWZpbmUgICBBRFBBX1BJ UEVfU0VMX01BU0tfQ1BUCSgzPDwyOSkKKyNkZWZpbmUgICBBRFBBX1BJUEVfU0VMX0NQVChwaXBl KQkoKHBpcGUpIDw8IDI5KQogI2RlZmluZSAgIEFEUEFfQ1JUX0hPVFBMVUdfTUFTSyAgMHgwM2Zm MDAwMCAvKiBiaXQgMjUtMTYgKi8KICNkZWZpbmUgICBBRFBBX0NSVF9IT1RQTFVHX01PTklUT1Jf Tk9ORSAgKDA8PDI0KQogI2RlZmluZSAgIEFEUEFfQ1JUX0hPVFBMVUdfTU9OSVRPUl9NQVNLICAo Mzw8MjQpCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9jcnQuYyBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2NydC5jCmluZGV4IGRlMGUyMjMyMmM3Ni4uMjExZDYw MWNkMWIxIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9jcnQuYworKysg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9jcnQuYwpAQCAtNjMsMzMgKzYzLDM1IEBAIHN0 YXRpYyBzdHJ1Y3QgaW50ZWxfY3J0ICppbnRlbF9hdHRhY2hlZF9jcnQoc3RydWN0IGRybV9jb25u ZWN0b3IgKmNvbm5lY3RvcikKIAlyZXR1cm4gaW50ZWxfZW5jb2Rlcl90b19jcnQoaW50ZWxfYXR0 YWNoZWRfZW5jb2Rlcihjb25uZWN0b3IpKTsKIH0KIAorYm9vbCBpbnRlbF9jcnRfcG9ydF9lbmFi bGVkKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKKwkJCSAgICBpOTE1X3JlZ190 IGFkcGFfcmVnLCBlbnVtIHBpcGUgKnBpcGUpCit7CisJdTMyIHZhbDsKKworCXZhbCA9IEk5MTVf UkVBRChhZHBhX3JlZyk7CisKKwkvKiBhc3NlcnRzIHdhbnQgdG8ga25vdyB0aGUgcGlwZSBldmVu IGlmIHRoZSBwb3J0IGlzIGRpc2FibGVkICovCisJaWYgKEhBU19QQ0hfQ1BUKGRldl9wcml2KSkK KwkJKnBpcGUgPSAodmFsICYgQURQQV9QSVBFX1NFTF9NQVNLX0NQVCkgPj4gQURQQV9QSVBFX1NF TF9TSElGVF9DUFQ7CisJZWxzZQorCQkqcGlwZSA9ICh2YWwgJiBBRFBBX1BJUEVfU0VMX01BU0sp ID4+IEFEUEFfUElQRV9TRUxfU0hJRlQ7CisKKwlyZXR1cm4gdmFsICYgQURQQV9EQUNfRU5BQkxF OworfQorCiBzdGF0aWMgYm9vbCBpbnRlbF9jcnRfZ2V0X2h3X3N0YXRlKHN0cnVjdCBpbnRlbF9l bmNvZGVyICplbmNvZGVyLAogCQkJCSAgIGVudW0gcGlwZSAqcGlwZSkKIHsKLQlzdHJ1Y3QgZHJt X2RldmljZSAqZGV2ID0gZW5jb2Rlci0+YmFzZS5kZXY7Ci0Jc3RydWN0IGRybV9pOTE1X3ByaXZh dGUgKmRldl9wcml2ID0gdG9faTkxNShkZXYpOworCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpk ZXZfcHJpdiA9IHRvX2k5MTUoZW5jb2Rlci0+YmFzZS5kZXYpOwogCXN0cnVjdCBpbnRlbF9jcnQg KmNydCA9IGludGVsX2VuY29kZXJfdG9fY3J0KGVuY29kZXIpOwotCXUzMiB0bXA7CiAJYm9vbCBy ZXQ7CiAKIAlpZiAoIWludGVsX2Rpc3BsYXlfcG93ZXJfZ2V0X2lmX2VuYWJsZWQoZGV2X3ByaXYs CiAJCQkJCQllbmNvZGVyLT5wb3dlcl9kb21haW4pKQogCQlyZXR1cm4gZmFsc2U7CiAKLQlyZXQg PSBmYWxzZTsKLQotCXRtcCA9IEk5MTVfUkVBRChjcnQtPmFkcGFfcmVnKTsKLQotCWlmICghKHRt cCAmIEFEUEFfREFDX0VOQUJMRSkpCi0JCWdvdG8gb3V0OworCXJldCA9IGludGVsX2NydF9wb3J0 X2VuYWJsZWQoZGV2X3ByaXYsIGNydC0+YWRwYV9yZWcsIHBpcGUpOwogCi0JaWYgKEhBU19QQ0hf Q1BUKGRldl9wcml2KSkKLQkJKnBpcGUgPSBQT1JUX1RPX1BJUEVfQ1BUKHRtcCk7Ci0JZWxzZQot CQkqcGlwZSA9IFBPUlRfVE9fUElQRSh0bXApOwotCi0JcmV0ID0gdHJ1ZTsKLW91dDoKIAlpbnRl bF9kaXNwbGF5X3Bvd2VyX3B1dChkZXZfcHJpdiwgZW5jb2Rlci0+cG93ZXJfZG9tYWluKTsKIAog CXJldHVybiByZXQ7CkBAIC0xNjgsMTEgKzE3MCw5IEBAIHN0YXRpYyB2b2lkIGludGVsX2NydF9z ZXRfZHBtcyhzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqZW5jb2RlciwKIAlpZiAoSEFTX1BDSF9MUFQo ZGV2X3ByaXYpKQogCQk7IC8qIFRob3NlIGJpdHMgZG9uJ3QgZXhpc3QgaGVyZSAqLwogCWVsc2Ug aWYgKEhBU19QQ0hfQ1BUKGRldl9wcml2KSkKLQkJYWRwYSB8PSBQT1JUX1RSQU5TX1NFTF9DUFQo Y3J0Yy0+cGlwZSk7Ci0JZWxzZSBpZiAoY3J0Yy0+cGlwZSA9PSAwKQotCQlhZHBhIHw9IEFEUEFf UElQRV9BX1NFTEVDVDsKKwkJYWRwYSB8PSBBRFBBX1BJUEVfU0VMX0NQVChjcnRjLT5waXBlKTsK IAllbHNlCi0JCWFkcGEgfD0gQURQQV9QSVBFX0JfU0VMRUNUOworCQlhZHBhIHw9IEFEUEFfUElQ RV9TRUwoY3J0Yy0+cGlwZSk7CiAKIAlpZiAoIUhBU19QQ0hfU1BMSVQoZGV2X3ByaXYpKQogCQlJ OTE1X1dSSVRFKEJDTFJQQVQoY3J0Yy0+cGlwZSksIDApOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf ZGlzcGxheS5jCmluZGV4IGFkNTg4ZDU2NDE5OC4uNmRhYThkOTdhMGFhIDEwMDY0NAotLS0gYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKKysrIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfZGlzcGxheS5jCkBAIC0xMzYwLDIxICsxMzYwLDYgQEAgc3RhdGljIGJvb2wg bHZkc19waXBlX2VuYWJsZWQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogCXJl dHVybiB0cnVlOwogfQogCi1zdGF0aWMgYm9vbCBhZHBhX3BpcGVfZW5hYmxlZChzdHJ1Y3QgZHJt X2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCi0JCQkgICAgICBlbnVtIHBpcGUgcGlwZSwgdTMyIHZh bCkKLXsKLQlpZiAoKHZhbCAmIEFEUEFfREFDX0VOQUJMRSkgPT0gMCkKLQkJcmV0dXJuIGZhbHNl OwotCWlmIChIQVNfUENIX0NQVChkZXZfcHJpdikpIHsKLQkJaWYgKCh2YWwgJiBQT1JUX1RSQU5T X1NFTF9NQVNLKSAhPSBQT1JUX1RSQU5TX1NFTF9DUFQocGlwZSkpCi0JCQlyZXR1cm4gZmFsc2U7 Ci0JfSBlbHNlIHsKLQkJaWYgKCh2YWwgJiBBRFBBX1BJUEVfU0VMRUNUX01BU0spICE9IEFEUEFf UElQRV9TRUxFQ1QocGlwZSkpCi0JCQlyZXR1cm4gZmFsc2U7Ci0JfQotCXJldHVybiB0cnVlOwot fQotCiBzdGF0aWMgdm9pZCBhc3NlcnRfcGNoX2RwX2Rpc2FibGVkKHN0cnVjdCBkcm1faTkxNV9w cml2YXRlICpkZXZfcHJpdiwKIAkJCQkgICBlbnVtIHBpcGUgcGlwZSwgaTkxNV9yZWdfdCByZWcs CiAJCQkJICAgdTMyIHBvcnRfc2VsKQpAQCAtMTQwNSwxNiArMTM5MCwxNyBAQCBzdGF0aWMgdm9p ZCBhc3NlcnRfcGNoX2hkbWlfZGlzYWJsZWQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9w cml2LAogc3RhdGljIHZvaWQgYXNzZXJ0X3BjaF9wb3J0c19kaXNhYmxlZChzdHJ1Y3QgZHJtX2k5 MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAJCQkJICAgICAgZW51bSBwaXBlIHBpcGUpCiB7CisJZW51 bSBwaXBlIHBvcnRfcGlwZTsKIAl1MzIgdmFsOwogCiAJYXNzZXJ0X3BjaF9kcF9kaXNhYmxlZChk ZXZfcHJpdiwgcGlwZSwgUENIX0RQX0IsIFRSQU5TX0RQX1BPUlRfU0VMX0IpOwogCWFzc2VydF9w Y2hfZHBfZGlzYWJsZWQoZGV2X3ByaXYsIHBpcGUsIFBDSF9EUF9DLCBUUkFOU19EUF9QT1JUX1NF TF9DKTsKIAlhc3NlcnRfcGNoX2RwX2Rpc2FibGVkKGRldl9wcml2LCBwaXBlLCBQQ0hfRFBfRCwg VFJBTlNfRFBfUE9SVF9TRUxfRCk7CiAKLQl2YWwgPSBJOTE1X1JFQUQoUENIX0FEUEEpOwotCUk5 MTVfU1RBVEVfV0FSTihhZHBhX3BpcGVfZW5hYmxlZChkZXZfcHJpdiwgcGlwZSwgdmFsKSwKLQkg ICAgICJQQ0ggVkdBIGVuYWJsZWQgb24gdHJhbnNjb2RlciAlYywgc2hvdWxkIGJlIGRpc2FibGVk XG4iLAotCSAgICAgcGlwZV9uYW1lKHBpcGUpKTsKKwlJOTE1X1NUQVRFX1dBUk4oaW50ZWxfY3J0 X3BvcnRfZW5hYmxlZChkZXZfcHJpdiwgUENIX0FEUEEsICZwb3J0X3BpcGUpICYmCisJCQlwb3J0 X3BpcGUgPT0gcGlwZSwKKwkJCSJQQ0ggVkdBIGVuYWJsZWQgb24gdHJhbnNjb2RlciAlYywgc2hv dWxkIGJlIGRpc2FibGVkXG4iLAorCQkJcGlwZV9uYW1lKHBpcGUpKTsKIAogCXZhbCA9IEk5MTVf UkVBRChQQ0hfTFZEUyk7CiAJSTkxNV9TVEFURV9XQVJOKGx2ZHNfcGlwZV9lbmFibGVkKGRldl9w cml2LCBwaXBlLCB2YWwpLApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf ZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaAppbmRleCBkN2RiY2ExYWFi ZmYuLjQyMzc5NTA1MDk3MCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf ZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKQEAgLTEzNzcsNiAr MTM3Nyw4IEBAIHZvaWQgZ2VuOV9lbmFibGVfZ3VjX2ludGVycnVwdHMoc3RydWN0IGRybV9pOTE1 X3ByaXZhdGUgKmRldl9wcml2KTsKIHZvaWQgZ2VuOV9kaXNhYmxlX2d1Y19pbnRlcnJ1cHRzKHN0 cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdik7CiAKIC8qIGludGVsX2NydC5jICovCiti b29sIGludGVsX2NydF9wb3J0X2VuYWJsZWQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9w cml2LAorCQkJICAgIGk5MTVfcmVnX3QgYWRwYV9yZWcsIGVudW0gcGlwZSAqcGlwZSk7CiB2b2lk IGludGVsX2NydF9pbml0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdik7CiB2b2lk IGludGVsX2NydF9yZXNldChzdHJ1Y3QgZHJtX2VuY29kZXIgKmVuY29kZXIpOwogCi0tIAoyLjE2 LjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVs LWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczov L2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=