From mboxrd@z Thu Jan  1 00:00:00 1970
From: Rodrigo Vivi <rodrigo.vivi@intel.com>
Subject: [RFC 2/8] drm/i915: Use the ddi_ports info to kill ugly
 CNL_WITH_PORT_F.
Date: Thu, 18 Oct 2018 16:34:41 -0700
Message-ID: <20181018233447.5187-3-rodrigo.vivi@intel.com>
References: <20181018233447.5187-1-rodrigo.vivi@intel.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64
Return-path: <intel-gfx-bounces@lists.freedesktop.org>
Received: from mga12.intel.com (mga12.intel.com [192.55.52.136])
 by gabe.freedesktop.org (Postfix) with ESMTPS id AF6B86E12C
 for <intel-gfx@lists.freedesktop.org>; Thu, 18 Oct 2018 23:34:59 +0000 (UTC)
In-Reply-To: <20181018233447.5187-1-rodrigo.vivi@intel.com>
List-Unsubscribe: <https://lists.freedesktop.org/mailman/options/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <https://lists.freedesktop.org/archives/intel-gfx>
List-Post: <mailto:intel-gfx@lists.freedesktop.org>
List-Help: <mailto:intel-gfx-request@lists.freedesktop.org?subject=help>
List-Subscribe: <https://lists.freedesktop.org/mailman/listinfo/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=subscribe>
Errors-To: intel-gfx-bounces@lists.freedesktop.org
Sender: "Intel-gfx" <intel-gfx-bounces@lists.freedesktop.org>
To: intel-gfx@lists.freedesktop.org
Cc: lucas.demarchi@intel.com, Rodrigo Vivi <rodrigo.vivi@intel.com>
List-Id: intel-gfx@lists.freedesktop.org

Tm93IHRoYXQgd2UgaGF2ZSB0aGUgbnVtYmVyIG9mIGRkaSBwb3J0cyBpbmZvcm1hdGlvbiBhdmFp
bGFibGUKbGV0J3MgdXNlIGl0IGluc3RlYWQgb2YgdGhhdCB1Z2x5IHBsYXRmb3JtIG1hY3JvLgoK
U2lnbmVkLW9mZi1ieTogUm9kcmlnbyBWaXZpIDxyb2RyaWdvLnZpdmlAaW50ZWwuY29tPgotLS0K
IGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMgICAgICAgICB8IDEwICsrKysrKysrKysK
IGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggICAgICAgICB8ICAyIC0tCiBkcml2ZXJz
L2dwdS9kcm0vaTkxNS9pOTE1X2lycS5jICAgICAgICAgfCAgNSArKy0tLQogZHJpdmVycy9ncHUv
ZHJtL2k5MTUvaW50ZWxfZHAuYyAgICAgICAgIHwgIDIgKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1
L2ludGVsX2hvdHBsdWcuYyAgICB8ICAyICstCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9y
dW50aW1lX3BtLmMgfCAgMiArLQogNiBmaWxlcyBjaGFuZ2VkLCAxNSBpbnNlcnRpb25zKCspLCA4
IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2
LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5jCmluZGV4IGJhYWMzNWY2OThmOS4u
ODNhYjMyNWM2Njc1IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5j
CisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMKQEAgLTIzOSw2ICsyMzksMTQg
QEAgaW50ZWxfdmlydF9kZXRlY3RfcGNoKGNvbnN0IHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpk
ZXZfcHJpdikKIAlyZXR1cm4gaWQ7CiB9CiAKK3N0YXRpYyB2b2lkIGludGVsX2FkanVzdF9za3Vz
X2RpZmZlcmVuY2VzKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKK3sKKwkvKiBT
b21lIENhbm5vbmxha2UgU0tVcyBoYXZlIFBvcnQgRiAqLworCWlmIChJU19DQU5OT05MQUtFKGRl
dl9wcml2KSAmJgorCSAgICAoSU5URUxfREVWSUQoZGV2X3ByaXYpICYgMHgwMDA0KSA9PSAweDAw
MDQpCisJCW1rd3JpdGVfZGV2aWNlX2luZm8oZGV2X3ByaXYpLT5kZGlfcG9ydHMgPSA2OworfQor
CiBzdGF0aWMgdm9pZCBpbnRlbF9kZXRlY3RfcGNoKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpk
ZXZfcHJpdikKIHsKIAlzdHJ1Y3QgcGNpX2RldiAqcGNoID0gTlVMTDsKQEAgLTkwNCw2ICs5MTIs
OCBAQCBzdGF0aWMgaW50IGk5MTVfZHJpdmVyX2luaXRfZWFybHkoc3RydWN0IGRybV9pOTE1X3By
aXZhdGUgKmRldl9wcml2KQogCWlmIChyZXQgPCAwKQogCQlnb3RvIGVycl93b3JrcXVldWVzOwog
CisJaW50ZWxfYWRqdXN0X3NrdXNfZGlmZmVyZW5jZXMoZGV2X3ByaXYpOworCiAJLyogVGhpcyBt
dXN0IGJlIGNhbGxlZCBiZWZvcmUgYW55IGNhbGxzIHRvIEhBU19QQ0hfKiAqLwogCWludGVsX2Rl
dGVjdF9wY2goZGV2X3ByaXYpOwogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p
OTE1X2Rydi5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAppbmRleCA3YWQyMzI4
NDkyNjguLjk5ZTQyZGY3OWVkOCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx
NV9kcnYuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCkBAIC0yNDg1LDgg
KzI0ODUsNiBAQCBpbnRlbF9pbmZvKGNvbnN0IHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZf
cHJpdikKIAkJCQkgKGRldl9wcml2KS0+aW5mby5ndCA9PSAyKQogI2RlZmluZSBJU19DRkxfR1Qz
KGRldl9wcml2KQkoSVNfQ09GRkVFTEFLRShkZXZfcHJpdikgJiYgXAogCQkJCSAoZGV2X3ByaXYp
LT5pbmZvLmd0ID09IDMpCi0jZGVmaW5lIElTX0NOTF9XSVRIX1BPUlRfRihkZXZfcHJpdikgICAo
SVNfQ0FOTk9OTEFLRShkZXZfcHJpdikgJiYgXAotCQkJCQkoSU5URUxfREVWSUQoZGV2X3ByaXYp
ICYgMHgwMDA0KSA9PSAweDAwMDQpCiAKICNkZWZpbmUgSVNfQUxQSEFfU1VQUE9SVChpbnRlbF9p
bmZvKSAoKGludGVsX2luZm8pLT5pc19hbHBoYV9zdXBwb3J0KQogCmRpZmYgLS1naXQgYS9kcml2
ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2lycS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9p
cnEuYwppbmRleCA1ZDFmNTM3MjMzODguLjYzZDY3NmRlMzg0MCAxMDA2NDQKLS0tIGEvZHJpdmVy
cy9ncHUvZHJtL2k5MTUvaTkxNV9pcnEuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1
X2lycS5jCkBAIC0yNzgyLDggKzI3ODIsNyBAQCBnZW44X2RlX2lycV9oYW5kbGVyKHN0cnVjdCBk
cm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwgdTMyIG1hc3Rlcl9jdGwpCiAJCQlpZiAoSU5URUxf
R0VOKGRldl9wcml2KSA+PSAxMSkKIAkJCQl0bXBfbWFzayB8PSBJQ0xfQVVYX0NIQU5ORUxfRTsK
IAotCQkJaWYgKElTX0NOTF9XSVRIX1BPUlRfRihkZXZfcHJpdikgfHwKLQkJCSAgICBJTlRFTF9H
RU4oZGV2X3ByaXYpID49IDExKQorCQkJaWYgKElOVEVMX0lORk8oZGV2X3ByaXYpLT5kZGlfcG9y
dHMgPj0gNikKIAkJCQl0bXBfbWFzayB8PSBDTkxfQVVYX0NIQU5ORUxfRjsKIAogCQkJaWYgKGlp
ciAmIHRtcF9tYXNrKSB7CkBAIC00MjIwLDcgKzQyMTksNyBAQCBzdGF0aWMgdm9pZCBnZW44X2Rl
X2lycV9wb3N0aW5zdGFsbChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJaWYg
KElOVEVMX0dFTihkZXZfcHJpdikgPj0gMTEpCiAJCWRlX3BvcnRfbWFza2VkIHw9IElDTF9BVVhf
Q0hBTk5FTF9FOwogCi0JaWYgKElTX0NOTF9XSVRIX1BPUlRfRihkZXZfcHJpdikgfHwgSU5URUxf
R0VOKGRldl9wcml2KSA+PSAxMSkKKwlpZiAoSU5URUxfSU5GTyhkZXZfcHJpdiktPmRkaV9wb3J0
cyA+PSA2KQogCQlkZV9wb3J0X21hc2tlZCB8PSBDTkxfQVVYX0NIQU5ORUxfRjsKIAogCWRlX3Bp
cGVfZW5hYmxlcyA9IGRlX3BpcGVfbWFza2VkIHwgR0VOOF9QSVBFX1ZCTEFOSyB8CmRpZmYgLS1n
aXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcC5jIGIvZHJpdmVycy9ncHUvZHJtL2k5
MTUvaW50ZWxfZHAuYwppbmRleCAzMzg0YTliYmRhZmQuLjBlYTA0MTRjY2VmNCAxMDA2NDQKLS0t
IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHAuYworKysgYi9kcml2ZXJzL2dwdS9kcm0v
aTkxNS9pbnRlbF9kcC5jCkBAIC00MDIsNyArNDAyLDcgQEAgc3RhdGljIGludCBjbmxfbWF4X3Nv
dXJjZV9yYXRlKHN0cnVjdCBpbnRlbF9kcCAqaW50ZWxfZHApCiAJCXJldHVybiA1NDAwMDA7CiAK
IAkvKiBGb3IgdGhpcyBTS1UgOC4xRyBpcyBzdXBwb3J0ZWQgaW4gYWxsIHBvcnRzICovCi0JaWYg
KElTX0NOTF9XSVRIX1BPUlRfRihkZXZfcHJpdikpCisJaWYgKElOVEVMX0lORk8oZGV2X3ByaXYp
LT5kZGlfcG9ydHMgPT0gNikKIAkJcmV0dXJuIDgxMDAwMDsKIAogCS8qIEZvciBvdGhlciBTS1Vz
LCBtYXggcmF0ZSBvbiBwb3J0cyBBIGFuZCBEIGlzIDUuNEcgKi8KZGlmZiAtLWdpdCBhL2RyaXZl
cnMvZ3B1L2RybS9pOTE1L2ludGVsX2hvdHBsdWcuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu
dGVsX2hvdHBsdWcuYwppbmRleCA2NDhhMTNjNjA0M2MuLjA1ZDFmYWY3NzA0OCAxMDA2NDQKLS0t
IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfaG90cGx1Zy5jCisrKyBiL2RyaXZlcnMvZ3B1
L2RybS9pOTE1L2ludGVsX2hvdHBsdWcuYwpAQCAtMTAxLDcgKzEwMSw3IEBAIGVudW0gaHBkX3Bp
biBpbnRlbF9ocGRfcGluX2RlZmF1bHQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2
LAogCWNhc2UgUE9SVF9FOgogCQlyZXR1cm4gSFBEX1BPUlRfRTsKIAljYXNlIFBPUlRfRjoKLQkJ
aWYgKElTX0NOTF9XSVRIX1BPUlRfRihkZXZfcHJpdikpCisJCWlmIChJU19HRU4xMChkZXZfcHJp
dikpCiAJCQlyZXR1cm4gSFBEX1BPUlRfRTsKIAkJcmV0dXJuIEhQRF9QT1JUX0Y7CiAJZGVmYXVs
dDoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3J1bnRpbWVfcG0uYyBi
L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3J1bnRpbWVfcG0uYwppbmRleCAzMWE0OWJkY2Yx
OTMuLjgwZTE0YmUxMTI3OSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf
cnVudGltZV9wbS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3J1bnRpbWVfcG0u
YwpAQCAtMzA5OSw3ICszMDk5LDcgQEAgaW50IGludGVsX3Bvd2VyX2RvbWFpbnNfaW5pdChzdHJ1
Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJCSAqIHRpbWVvdXRzLCBsZXRzIHJlbW92
ZSB0aGVtIGZyb20gdGhlIGxpc3QKIAkJICogZm9yIHRoZSBTS1VzIHdpdGhvdXQgcG9ydCBGLgog
CQkgKi8KLQkJaWYgKCFJU19DTkxfV0lUSF9QT1JUX0YoZGV2X3ByaXYpKQorCQlpZiAoSU5URUxf
SU5GTyhkZXZfcHJpdiktPmRkaV9wb3J0cyA9PSA1KQogCQkJcG93ZXJfZG9tYWlucy0+cG93ZXJf
d2VsbF9jb3VudCAtPSAyOwogCiAJfSBlbHNlIGlmIChJU19CUk9YVE9OKGRldl9wcml2KSkgewot
LSAKMi4xOS4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f
XwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcK
aHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK