From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [RFC 2/8] drm/i915: Use the ddi_ports info to kill ugly CNL_WITH_PORT_F. Date: Fri, 19 Oct 2018 10:27:22 +0200 Message-ID: <20181019082722.GV31561@phenom.ffwll.local> References: <20181018233447.5187-1-rodrigo.vivi@intel.com> <20181018233447.5187-3-rodrigo.vivi@intel.com> <87woqegzb1.fsf@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-ed1-x544.google.com (mail-ed1-x544.google.com [IPv6:2a00:1450:4864:20::544]) by gabe.freedesktop.org (Postfix) with ESMTPS id E7E246E15C for ; Fri, 19 Oct 2018 08:27:26 +0000 (UTC) Received: by mail-ed1-x544.google.com with SMTP id x31-v6so30662641edd.8 for ; Fri, 19 Oct 2018 01:27:26 -0700 (PDT) Content-Disposition: inline In-Reply-To: <87woqegzb1.fsf@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Jani Nikula Cc: intel-gfx@lists.freedesktop.org, lucas.demarchi@intel.com, Rodrigo Vivi List-Id: intel-gfx@lists.freedesktop.org T24gRnJpLCBPY3QgMTksIDIwMTggYXQgMTA6Mzk6NDZBTSArMDMwMCwgSmFuaSBOaWt1bGEgd3Jv dGU6Cj4gT24gVGh1LCAxOCBPY3QgMjAxOCwgUm9kcmlnbyBWaXZpIDxyb2RyaWdvLnZpdmlAaW50 ZWwuY29tPiB3cm90ZToKPiA+IE5vdyB0aGF0IHdlIGhhdmUgdGhlIG51bWJlciBvZiBkZGkgcG9y dHMgaW5mb3JtYXRpb24gYXZhaWxhYmxlCj4gPiBsZXQncyB1c2UgaXQgaW5zdGVhZCBvZiB0aGF0 IHVnbHkgcGxhdGZvcm0gbWFjcm8uCj4gPgo+ID4gU2lnbmVkLW9mZi1ieTogUm9kcmlnbyBWaXZp IDxyb2RyaWdvLnZpdmlAaW50ZWwuY29tPgo+ID4gLS0tCj4gPiAgZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9kcnYuYyAgICAgICAgIHwgMTAgKysrKysrKysrKwo+ID4gIGRyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZHJ2LmggICAgICAgICB8ICAyIC0tCj4gPiAgZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9pcnEuYyAgICAgICAgIHwgIDUgKystLS0KPiA+ICBkcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9kcC5jICAgICAgICAgfCAgMiArLQo+ID4gIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2hvdHBsdWcuYyAgICB8ICAyICstCj4gPiAgZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf cnVudGltZV9wbS5jIHwgIDIgKy0KPiA+ICA2IGZpbGVzIGNoYW5nZWQsIDE1IGluc2VydGlvbnMo KyksIDggZGVsZXRpb25zKC0pCj4gPgo+ID4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfZHJ2LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5jCj4gPiBpbmRl eCBiYWFjMzVmNjk4ZjkuLjgzYWIzMjVjNjY3NSAxMDA2NDQKPiA+IC0tLSBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZHJ2LmMKPiA+ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf ZHJ2LmMKPiA+IEBAIC0yMzksNiArMjM5LDE0IEBAIGludGVsX3ZpcnRfZGV0ZWN0X3BjaChjb25z dCBzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCj4gPiAgCXJldHVybiBpZDsKPiA+ ICB9Cj4gPiAgCj4gPiArc3RhdGljIHZvaWQgaW50ZWxfYWRqdXN0X3NrdXNfZGlmZmVyZW5jZXMo c3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQo+ID4gK3sKPiA+ICsJLyogU29tZSBD YW5ub25sYWtlIFNLVXMgaGF2ZSBQb3J0IEYgKi8KPiA+ICsJaWYgKElTX0NBTk5PTkxBS0UoZGV2 X3ByaXYpICYmCj4gPiArCSAgICAoSU5URUxfREVWSUQoZGV2X3ByaXYpICYgMHgwMDA0KSA9PSAw eDAwMDQpCj4gPiArCQlta3dyaXRlX2RldmljZV9pbmZvKGRldl9wcml2KS0+ZGRpX3BvcnRzID0g NjsKPiA+ICt9Cj4gCj4gSSdkIGxpa2UgcmVkdWNlIHRoZSBhbW91bnQgb2YgZGV2aWNlIGluZm8g c3R1ZmYgd2UgYWRqdXN0IGF0IHByb2JlLCBub3QKPiBpbmNyZWFzZS4KPiAKPiBMb25nIHRlcm0s IEknZCBsaWtlIHRvIG1ha2UgZGV2X3ByaXYtPmluZm8gYSBjb25zdCBwb2ludGVyIHRvIHRoZSBj b25zdAo+IGRhdGEgaW4gaTkxNV9wY2kuYywgYW5kIG1ha2UgaXQgdHJ1bHkgaW1tdXRhYmxlLiBX ZSBjb3VsZCBoYXZlIGFuCj4gYWRkaXRpb25hbCBydW50aW1lIGRldmljZSBpbmZvIHRvIGNvbXBs ZW1lbnQgdGhhdCwgYnV0IHRoaXMgYXBwcm9hY2gKPiBjYWxscyBmb3IgYSBtb3JlIGNvbmNyZXRl IHNwbGl0IGluIGNvbnN0IGFuZCBub24tY29uc3QgZGF0YSwgbm90ICJtb3N0bHkKPiBjb25zdCBi dXQgc29tZXRpbWVzIG11dGFibGUiLgo+IAo+IEkgdGhpbmsgSSd2ZSBjaGF0dGVkIGFib3V0IHRo aXMgd2l0aCBDaHJpcyB0b28uCgpUaGlzIHNob3VsZCBiZSBlYXN5IHRvIGZpeCBzaW5jZSBpdCdz IGVuY29kZWQgaW4gdGhlIHBjaSBpZC4gSnVzdCBuZWVkIGEKbmV3IHNlcGFyYXRlIGVudHJ5IGp1 c3QgZm9yIHRoaXMgb25lLgotRGFuaWVsCgo+IAo+IEJSLAo+IEphbmkuCj4gCj4gPiArCj4gPiAg c3RhdGljIHZvaWQgaW50ZWxfZGV0ZWN0X3BjaChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2 X3ByaXYpCj4gPiAgewo+ID4gIAlzdHJ1Y3QgcGNpX2RldiAqcGNoID0gTlVMTDsKPiA+IEBAIC05 MDQsNiArOTEyLDggQEAgc3RhdGljIGludCBpOTE1X2RyaXZlcl9pbml0X2Vhcmx5KHN0cnVjdCBk cm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKPiA+ICAJaWYgKHJldCA8IDApCj4gPiAgCQlnb3Rv IGVycl93b3JrcXVldWVzOwo+ID4gIAo+ID4gKwlpbnRlbF9hZGp1c3Rfc2t1c19kaWZmZXJlbmNl cyhkZXZfcHJpdik7Cj4gPiArCj4gPiAgCS8qIFRoaXMgbXVzdCBiZSBjYWxsZWQgYmVmb3JlIGFu eSBjYWxscyB0byBIQVNfUENIXyogKi8KPiA+ICAJaW50ZWxfZGV0ZWN0X3BjaChkZXZfcHJpdik7 Cj4gPiAgCj4gPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKPiA+IGluZGV4IDdhZDIzMjg0OTI2OC4u OTllNDJkZjc5ZWQ4IDEwMDY0NAo+ID4gLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9k cnYuaAo+ID4gKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAo+ID4gQEAgLTI0 ODUsOCArMjQ4NSw2IEBAIGludGVsX2luZm8oY29uc3Qgc3RydWN0IGRybV9pOTE1X3ByaXZhdGUg KmRldl9wcml2KQo+ID4gIAkJCQkgKGRldl9wcml2KS0+aW5mby5ndCA9PSAyKQo+ID4gICNkZWZp bmUgSVNfQ0ZMX0dUMyhkZXZfcHJpdikJKElTX0NPRkZFRUxBS0UoZGV2X3ByaXYpICYmIFwKPiA+ ICAJCQkJIChkZXZfcHJpdiktPmluZm8uZ3QgPT0gMykKPiA+IC0jZGVmaW5lIElTX0NOTF9XSVRI X1BPUlRfRihkZXZfcHJpdikgICAoSVNfQ0FOTk9OTEFLRShkZXZfcHJpdikgJiYgXAo+ID4gLQkJ CQkJKElOVEVMX0RFVklEKGRldl9wcml2KSAmIDB4MDAwNCkgPT0gMHgwMDA0KQo+ID4gIAo+ID4g ICNkZWZpbmUgSVNfQUxQSEFfU1VQUE9SVChpbnRlbF9pbmZvKSAoKGludGVsX2luZm8pLT5pc19h bHBoYV9zdXBwb3J0KQo+ID4gIAo+ID4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfaXJxLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2lycS5jCj4gPiBpbmRleCA1 ZDFmNTM3MjMzODguLjYzZDY3NmRlMzg0MCAxMDA2NDQKPiA+IC0tLSBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfaXJxLmMKPiA+ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfaXJx LmMKPiA+IEBAIC0yNzgyLDggKzI3ODIsNyBAQCBnZW44X2RlX2lycV9oYW5kbGVyKHN0cnVjdCBk cm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwgdTMyIG1hc3Rlcl9jdGwpCj4gPiAgCQkJaWYgKElO VEVMX0dFTihkZXZfcHJpdikgPj0gMTEpCj4gPiAgCQkJCXRtcF9tYXNrIHw9IElDTF9BVVhfQ0hB Tk5FTF9FOwo+ID4gIAo+ID4gLQkJCWlmIChJU19DTkxfV0lUSF9QT1JUX0YoZGV2X3ByaXYpIHx8 Cj4gPiAtCQkJICAgIElOVEVMX0dFTihkZXZfcHJpdikgPj0gMTEpCj4gPiArCQkJaWYgKElOVEVM X0lORk8oZGV2X3ByaXYpLT5kZGlfcG9ydHMgPj0gNikKPiA+ICAJCQkJdG1wX21hc2sgfD0gQ05M X0FVWF9DSEFOTkVMX0Y7Cj4gPiAgCj4gPiAgCQkJaWYgKGlpciAmIHRtcF9tYXNrKSB7Cj4gPiBA QCAtNDIyMCw3ICs0MjE5LDcgQEAgc3RhdGljIHZvaWQgZ2VuOF9kZV9pcnFfcG9zdGluc3RhbGwo c3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQo+ID4gIAlpZiAoSU5URUxfR0VOKGRl dl9wcml2KSA+PSAxMSkKPiA+ICAJCWRlX3BvcnRfbWFza2VkIHw9IElDTF9BVVhfQ0hBTk5FTF9F Owo+ID4gIAo+ID4gLQlpZiAoSVNfQ05MX1dJVEhfUE9SVF9GKGRldl9wcml2KSB8fCBJTlRFTF9H RU4oZGV2X3ByaXYpID49IDExKQo+ID4gKwlpZiAoSU5URUxfSU5GTyhkZXZfcHJpdiktPmRkaV9w b3J0cyA+PSA2KQo+ID4gIAkJZGVfcG9ydF9tYXNrZWQgfD0gQ05MX0FVWF9DSEFOTkVMX0Y7Cj4g PiAgCj4gPiAgCWRlX3BpcGVfZW5hYmxlcyA9IGRlX3BpcGVfbWFza2VkIHwgR0VOOF9QSVBFX1ZC TEFOSyB8Cj4gPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHAuYyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwLmMKPiA+IGluZGV4IDMzODRhOWJiZGFmZC4u MGVhMDQxNGNjZWY0IDEwMDY0NAo+ID4gLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf ZHAuYwo+ID4gKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHAuYwo+ID4gQEAgLTQw Miw3ICs0MDIsNyBAQCBzdGF0aWMgaW50IGNubF9tYXhfc291cmNlX3JhdGUoc3RydWN0IGludGVs X2RwICppbnRlbF9kcCkKPiA+ICAJCXJldHVybiA1NDAwMDA7Cj4gPiAgCj4gPiAgCS8qIEZvciB0 aGlzIFNLVSA4LjFHIGlzIHN1cHBvcnRlZCBpbiBhbGwgcG9ydHMgKi8KPiA+IC0JaWYgKElTX0NO TF9XSVRIX1BPUlRfRihkZXZfcHJpdikpCj4gPiArCWlmIChJTlRFTF9JTkZPKGRldl9wcml2KS0+ ZGRpX3BvcnRzID09IDYpCj4gPiAgCQlyZXR1cm4gODEwMDAwOwo+ID4gIAo+ID4gIAkvKiBGb3Ig b3RoZXIgU0tVcywgbWF4IHJhdGUgb24gcG9ydHMgQSBhbmQgRCBpcyA1LjRHICovCj4gPiBkaWZm IC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfaG90cGx1Zy5jIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfaG90cGx1Zy5jCj4gPiBpbmRleCA2NDhhMTNjNjA0M2MuLjA1ZDFm YWY3NzA0OCAxMDA2NDQKPiA+IC0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2hvdHBs dWcuYwo+ID4gKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfaG90cGx1Zy5jCj4gPiBA QCAtMTAxLDcgKzEwMSw3IEBAIGVudW0gaHBkX3BpbiBpbnRlbF9ocGRfcGluX2RlZmF1bHQoc3Ry dWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAo+ID4gIAljYXNlIFBPUlRfRToKPiA+ICAJ CXJldHVybiBIUERfUE9SVF9FOwo+ID4gIAljYXNlIFBPUlRfRjoKPiA+IC0JCWlmIChJU19DTkxf V0lUSF9QT1JUX0YoZGV2X3ByaXYpKQo+ID4gKwkJaWYgKElTX0dFTjEwKGRldl9wcml2KSkKPiA+ ICAJCQlyZXR1cm4gSFBEX1BPUlRfRTsKPiA+ICAJCXJldHVybiBIUERfUE9SVF9GOwo+ID4gIAlk ZWZhdWx0Ogo+ID4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3J1bnRp bWVfcG0uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3J1bnRpbWVfcG0uYwo+ID4gaW5k ZXggMzFhNDliZGNmMTkzLi44MGUxNGJlMTEyNzkgMTAwNjQ0Cj4gPiAtLS0gYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9ydW50aW1lX3BtLmMKPiA+ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX3J1bnRpbWVfcG0uYwo+ID4gQEAgLTMwOTksNyArMzA5OSw3IEBAIGludCBpbnRl bF9wb3dlcl9kb21haW5zX2luaXQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQo+ ID4gIAkJICogdGltZW91dHMsIGxldHMgcmVtb3ZlIHRoZW0gZnJvbSB0aGUgbGlzdAo+ID4gIAkJ ICogZm9yIHRoZSBTS1VzIHdpdGhvdXQgcG9ydCBGLgo+ID4gIAkJICovCj4gPiAtCQlpZiAoIUlT X0NOTF9XSVRIX1BPUlRfRihkZXZfcHJpdikpCj4gPiArCQlpZiAoSU5URUxfSU5GTyhkZXZfcHJp diktPmRkaV9wb3J0cyA9PSA1KQo+ID4gIAkJCXBvd2VyX2RvbWFpbnMtPnBvd2VyX3dlbGxfY291 bnQgLT0gMjsKPiA+ICAKPiA+ICAJfSBlbHNlIGlmIChJU19CUk9YVE9OKGRldl9wcml2KSkgewo+ IAo+IC0tIAo+IEphbmkgTmlrdWxhLCBJbnRlbCBPcGVuIFNvdXJjZSBHcmFwaGljcyBDZW50ZXIK PiBfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwo+IEludGVs LWdmeCBtYWlsaW5nIGxpc3QKPiBJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCj4gaHR0 cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngKCi0t IApEYW5pZWwgVmV0dGVyClNvZnR3YXJlIEVuZ2luZWVyLCBJbnRlbCBDb3Jwb3JhdGlvbgpodHRw Oi8vYmxvZy5mZndsbC5jaApfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3Rv cC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRl bC1nZngK