From: Rodrigo Vivi Subject: [PATCH 3/3] drm/i915: Use the ddi_ports info to kill ugly CNL_WITH_PORT_F. Date: Fri, 19 Oct 2018 13:19:45 -0700 Message-ID: <20181019201945.9792-3-rodrigo.vivi@intel.com> References: <20181019201945.9792-1-rodrigo.vivi@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2104A6E53C for ; Fri, 19 Oct 2018 20:19:48 +0000 (UTC) In-Reply-To: <20181019201945.9792-1-rodrigo.vivi@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 Cc: Jani Nikula , Daniel Vetter , Lucas De Marchi , Rodrigo Vivi List-Id: intel-gfx@lists.freedesktop.org Tm93IHRoYXQgd2UgaGF2ZSB0aGUgbnVtYmVyIG9mIGRkaSBwb3J0cyBpbmZvcm1hdGlvbiBhdmFp bGFibGUKbGV0J3MgdXNlIGl0IGluc3RlYWQgb2YgdGhhdCB1Z2x5IHBsYXRmb3JtIG1hY3JvLgoK djI6IC0gRG9uJ3Qgb3ZlcnJpZGUgcGxhdGZvcm0gaW5mbyAoSmFuaSkgQnV0IHVzZSBwbGF0Zm9y bSBpbmZvIChEYW5pZWwpCiAgICAtIERvbid0IHVzZSBkZGlfcG9ydHMgd2hlbiBpdCBkb2Vzbid0 IG1ha2Ugc2Vuc2UgKEx1Y2FzKQogICAgLSBBZGQgYSBjb21tZW50IHRvIGxldCBjbGVhciB0aGF0 IHBvcnQgRSBpcyBmdXNlZCBvZmYuIChSb2RyaWdvKQoKQ2M6IERhbmllbCBWZXR0ZXIgPGRhbmll bC52ZXR0ZXJAZmZ3bGwuY2g+CkNjOiBKYW5pIE5pa3VsYSA8amFuaS5uaWt1bGFAaW50ZWwuY29t PgpDYzogTHVjYXMgRGUgTWFyY2hpIDxsdWNhcy5kZW1hcmNoaUBpbnRlbC5jb20+ClNpZ25lZC1v ZmYtYnk6IFJvZHJpZ28gVml2aSA8cm9kcmlnby52aXZpQGludGVsLmNvbT4KLS0tCiBkcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oICAgICAgICAgfCAyIC0tCiBkcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2lycS5jICAgICAgICAgfCA1ICsrLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X3BjaS5jICAgICAgICAgfCA4ICsrKysrKysrCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9kcC5jICAgICAgICAgfCAyICstCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ydW50aW1l X3BtLmMgfCAyICstCiBpbmNsdWRlL2RybS9pOTE1X3BjaWlkcy5oICAgICAgICAgICAgICAgfCA0 ICsrKy0KIDYgZmlsZXMgY2hhbmdlZCwgMTUgaW5zZXJ0aW9ucygrKSwgOCBkZWxldGlvbnMoLSkK CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9kcnYuaAppbmRleCA3YWQyMzI4NDkyNjguLjk5ZTQyZGY3OWVkOCAx MDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAorKysgYi9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCkBAIC0yNDg1LDggKzI0ODUsNiBAQCBpbnRlbF9pbmZv KGNvbnN0IHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAkJCQkgKGRldl9wcml2 KS0+aW5mby5ndCA9PSAyKQogI2RlZmluZSBJU19DRkxfR1QzKGRldl9wcml2KQkoSVNfQ09GRkVF TEFLRShkZXZfcHJpdikgJiYgXAogCQkJCSAoZGV2X3ByaXYpLT5pbmZvLmd0ID09IDMpCi0jZGVm aW5lIElTX0NOTF9XSVRIX1BPUlRfRihkZXZfcHJpdikgICAoSVNfQ0FOTk9OTEFLRShkZXZfcHJp dikgJiYgXAotCQkJCQkoSU5URUxfREVWSUQoZGV2X3ByaXYpICYgMHgwMDA0KSA9PSAweDAwMDQp CiAKICNkZWZpbmUgSVNfQUxQSEFfU1VQUE9SVChpbnRlbF9pbmZvKSAoKGludGVsX2luZm8pLT5p c19hbHBoYV9zdXBwb3J0KQogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2lycS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9pcnEuYwppbmRleCA1ZDFmNTM3MjMz ODguLjYzZDY3NmRlMzg0MCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9p cnEuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2lycS5jCkBAIC0yNzgyLDggKzI3 ODIsNyBAQCBnZW44X2RlX2lycV9oYW5kbGVyKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZf cHJpdiwgdTMyIG1hc3Rlcl9jdGwpCiAJCQlpZiAoSU5URUxfR0VOKGRldl9wcml2KSA+PSAxMSkK IAkJCQl0bXBfbWFzayB8PSBJQ0xfQVVYX0NIQU5ORUxfRTsKIAotCQkJaWYgKElTX0NOTF9XSVRI X1BPUlRfRihkZXZfcHJpdikgfHwKLQkJCSAgICBJTlRFTF9HRU4oZGV2X3ByaXYpID49IDExKQor CQkJaWYgKElOVEVMX0lORk8oZGV2X3ByaXYpLT5kZGlfcG9ydHMgPj0gNikKIAkJCQl0bXBfbWFz ayB8PSBDTkxfQVVYX0NIQU5ORUxfRjsKIAogCQkJaWYgKGlpciAmIHRtcF9tYXNrKSB7CkBAIC00 MjIwLDcgKzQyMTksNyBAQCBzdGF0aWMgdm9pZCBnZW44X2RlX2lycV9wb3N0aW5zdGFsbChzdHJ1 Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJaWYgKElOVEVMX0dFTihkZXZfcHJpdikg Pj0gMTEpCiAJCWRlX3BvcnRfbWFza2VkIHw9IElDTF9BVVhfQ0hBTk5FTF9FOwogCi0JaWYgKElT X0NOTF9XSVRIX1BPUlRfRihkZXZfcHJpdikgfHwgSU5URUxfR0VOKGRldl9wcml2KSA+PSAxMSkK KwlpZiAoSU5URUxfSU5GTyhkZXZfcHJpdiktPmRkaV9wb3J0cyA+PSA2KQogCQlkZV9wb3J0X21h c2tlZCB8PSBDTkxfQVVYX0NIQU5ORUxfRjsKIAogCWRlX3BpcGVfZW5hYmxlcyA9IGRlX3BpcGVf bWFza2VkIHwgR0VOOF9QSVBFX1ZCTEFOSyB8CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X3BjaS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9wY2kuYwppbmRleCAw NDI3NDg2ZjYzZDAuLmRjNzhkYWNhMTQ1ZiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9wY2kuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3BjaS5jCkBAIC01 OTMsNiArNTkzLDEzIEBAIHN0YXRpYyBjb25zdCBzdHJ1Y3QgaW50ZWxfZGV2aWNlX2luZm8gaW50 ZWxfY2Fubm9ubGFrZV9pbmZvID0gewogCS5ndCA9IDIsCiB9OwogCitzdGF0aWMgY29uc3Qgc3Ry dWN0IGludGVsX2RldmljZV9pbmZvIGludGVsX2Nhbm5vbmxha2VfcG9ydGZfaW5mbyA9IHsKKwlH RU4xMF9GRUFUVVJFUywKKwlQTEFURk9STShJTlRFTF9DQU5OT05MQUtFKSwKKwkuZ3QgPSAyLAor CS5kZGlfcG9ydHMgPSA2LCAvKiBBbHRob3VnaCBwb3J0IEUgaXMgZnVzZWQgb2ZmLCBmdWxsIHBv cnQgRiBpcyBhZGRlZCAqLworfTsKKwogI2RlZmluZSBHRU4xMV9GRUFUVVJFUyBcCiAJR0VOMTBf RkVBVFVSRVMsIFwKIAlHRU4oMTEpLCBcCkBAIC02NzIsNiArNjc5LDcgQEAgc3RhdGljIGNvbnN0 IHN0cnVjdCBwY2lfZGV2aWNlX2lkIHBjaWlkbGlzdFtdID0gewogCUlOVEVMX0FNTF9DRkxfR1Qy X0lEUygmaW50ZWxfY29mZmVlbGFrZV9ndDJfaW5mbyksCiAJSU5URUxfV0hMX1VfR1QzX0lEUygm aW50ZWxfY29mZmVlbGFrZV9ndDNfaW5mbyksCiAJSU5URUxfQ05MX0lEUygmaW50ZWxfY2Fubm9u bGFrZV9pbmZvKSwKKwlJTlRFTF9DTkxfUE9SVEZfSURTKCZpbnRlbF9jYW5ub25sYWtlX3BvcnRm X2luZm8pLAogCUlOVEVMX0lDTF8xMV9JRFMoJmludGVsX2ljZWxha2VfMTFfaW5mbyksCiAJezAs IDAsIDB9CiB9OwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHAuYyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwLmMKaW5kZXggMzM4NGE5YmJkYWZkLi4wZWEw NDE0Y2NlZjQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwLmMKKysr IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHAuYwpAQCAtNDAyLDcgKzQwMiw3IEBAIHN0 YXRpYyBpbnQgY25sX21heF9zb3VyY2VfcmF0ZShzdHJ1Y3QgaW50ZWxfZHAgKmludGVsX2RwKQog CQlyZXR1cm4gNTQwMDAwOwogCiAJLyogRm9yIHRoaXMgU0tVIDguMUcgaXMgc3VwcG9ydGVkIGlu IGFsbCBwb3J0cyAqLwotCWlmIChJU19DTkxfV0lUSF9QT1JUX0YoZGV2X3ByaXYpKQorCWlmIChJ TlRFTF9JTkZPKGRldl9wcml2KS0+ZGRpX3BvcnRzID09IDYpCiAJCXJldHVybiA4MTAwMDA7CiAK IAkvKiBGb3Igb3RoZXIgU0tVcywgbWF4IHJhdGUgb24gcG9ydHMgQSBhbmQgRCBpcyA1LjRHICov CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ydW50aW1lX3BtLmMgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ydW50aW1lX3BtLmMKaW5kZXggMzFhNDliZGNmMTkz Li44MGUxNGJlMTEyNzkgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3J1 bnRpbWVfcG0uYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ydW50aW1lX3BtLmMK QEAgLTMwOTksNyArMzA5OSw3IEBAIGludCBpbnRlbF9wb3dlcl9kb21haW5zX2luaXQoc3RydWN0 IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogCQkgKiB0aW1lb3V0cywgbGV0cyByZW1vdmUg dGhlbSBmcm9tIHRoZSBsaXN0CiAJCSAqIGZvciB0aGUgU0tVcyB3aXRob3V0IHBvcnQgRi4KIAkJ ICovCi0JCWlmICghSVNfQ05MX1dJVEhfUE9SVF9GKGRldl9wcml2KSkKKwkJaWYgKElOVEVMX0lO Rk8oZGV2X3ByaXYpLT5kZGlfcG9ydHMgPT0gNSkKIAkJCXBvd2VyX2RvbWFpbnMtPnBvd2VyX3dl bGxfY291bnQgLT0gMjsKIAogCX0gZWxzZSBpZiAoSVNfQlJPWFRPTihkZXZfcHJpdikpIHsKZGlm ZiAtLWdpdCBhL2luY2x1ZGUvZHJtL2k5MTVfcGNpaWRzLmggYi9pbmNsdWRlL2RybS9pOTE1X3Bj aWlkcy5oCmluZGV4IDE5MjY2NzE0NDY5My4uNDg2ODIyMjA1MTUxIDEwMDY0NAotLS0gYS9pbmNs dWRlL2RybS9pOTE1X3BjaWlkcy5oCisrKyBiL2luY2x1ZGUvZHJtL2k5MTVfcGNpaWRzLmgKQEAg LTQ0NSw3ICs0NDUsOSBAQAogCUlOVEVMX1ZHQV9ERVZJQ0UoMHg1QTQyLCBpbmZvKSwgXAogCUlO VEVMX1ZHQV9ERVZJQ0UoMHg1QTRBLCBpbmZvKSwgXAogCUlOVEVMX1ZHQV9ERVZJQ0UoMHg1QTUw LCBpbmZvKSwgXAotCUlOVEVMX1ZHQV9ERVZJQ0UoMHg1QTQwLCBpbmZvKSwgXAorCUlOVEVMX1ZH QV9ERVZJQ0UoMHg1QTQwLCBpbmZvKQorCisjZGVmaW5lIElOVEVMX0NOTF9QT1JURl9JRFMoaW5m bykgXAogCUlOVEVMX1ZHQV9ERVZJQ0UoMHg1QTU0LCBpbmZvKSwgXAogCUlOVEVMX1ZHQV9ERVZJ Q0UoMHg1QTVDLCBpbmZvKSwgXAogCUlOVEVMX1ZHQV9ERVZJQ0UoMHg1QTQ0LCBpbmZvKSwgXAot LSAKMi4xOS4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f XwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcK aHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK