From mboxrd@z Thu Jan 1 00:00:00 1970 From: Lucas De Marchi Subject: Re: [RFC 2/8] drm/i915: Use the ddi_ports info to kill ugly CNL_WITH_PORT_F. Date: Fri, 19 Oct 2018 09:46:13 -0700 Message-ID: <20181019164612.GA4548@ldmartin-desk.jf.intel.com> 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 mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTPS id 0BCDF6E4E3 for ; Fri, 19 Oct 2018 16:46:14 +0000 (UTC) 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, 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 dXQgc29tZXRpbWVzIG11dGFibGUiLgoKSSBhZ3JlZSB3aXRoIHRoaXMuIEknZCBhbHNvIGxpa2Ug dG8gaGF2ZSBhIGNvbnN0IGRldl9pbmZvLiBXaGF0IEkgdGhpbmsgd2UgbmVlZCBpcyB0byBzcGxp dAppbiB3aGF0IGlzIGNvbnN0IHdoYXQgY2FuIGJlIGNoYW5nZWQgaW4gcnVudGltZS9pbml0aWFs aXphdGlvbi4KCkhvd2V2ZXIsIEknbSBub3QgZm9uZCBvbiB1c2luZyB0aGUgbnVtYmVyIG9mIGRk aSBwb3J0cyB0byB0YWtlIGRlY2lzaW9ucyBpbiB0aGUgY29kZSBub3QKcmVsYXRlZCB0byB0aGUg bnVtYmVyIG9mIHBvcnRzLCBidXQgcmF0aGVyIHdpdGggb3RoZXIgdGhpbmdzIG9mIHRoYXQgc2t1 LiBTZWUgYmVsb3cuCgo+IAo+IEkgdGhpbmsgSSd2ZSBjaGF0dGVkIGFib3V0IHRoaXMgd2l0aCBD aHJpcyB0b28uCj4gCj4gQlIsCj4gSmFuaS4KPiAKPiA+ICsKPiA+ICBzdGF0aWMgdm9pZCBpbnRl bF9kZXRlY3RfcGNoKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKPiA+ICB7Cj4g PiAgCXN0cnVjdCBwY2lfZGV2ICpwY2ggPSBOVUxMOwo+ID4gQEAgLTkwNCw2ICs5MTIsOCBAQCBz dGF0aWMgaW50IGk5MTVfZHJpdmVyX2luaXRfZWFybHkoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUg KmRldl9wcml2KQo+ID4gIAlpZiAocmV0IDwgMCkKPiA+ICAJCWdvdG8gZXJyX3dvcmtxdWV1ZXM7 Cj4gPiAgCj4gPiArCWludGVsX2FkanVzdF9za3VzX2RpZmZlcmVuY2VzKGRldl9wcml2KTsKPiA+ ICsKPiA+ICAJLyogVGhpcyBtdXN0IGJlIGNhbGxlZCBiZWZvcmUgYW55IGNhbGxzIHRvIEhBU19Q Q0hfKiAqLwo+ID4gIAlpbnRlbF9kZXRlY3RfcGNoKGRldl9wcml2KTsKPiA+ICAKPiA+IGRpZmYg LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9kcnYuaAo+ID4gaW5kZXggN2FkMjMyODQ5MjY4Li45OWU0MmRmNzllZDggMTAw NjQ0Cj4gPiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCj4gPiArKysgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCj4gPiBAQCAtMjQ4NSw4ICsyNDg1LDYgQEAg aW50ZWxfaW5mbyhjb25zdCBzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCj4gPiAg CQkJCSAoZGV2X3ByaXYpLT5pbmZvLmd0ID09IDIpCj4gPiAgI2RlZmluZSBJU19DRkxfR1QzKGRl dl9wcml2KQkoSVNfQ09GRkVFTEFLRShkZXZfcHJpdikgJiYgXAo+ID4gIAkJCQkgKGRldl9wcml2 KS0+aW5mby5ndCA9PSAzKQo+ID4gLSNkZWZpbmUgSVNfQ05MX1dJVEhfUE9SVF9GKGRldl9wcml2 KSAgIChJU19DQU5OT05MQUtFKGRldl9wcml2KSAmJiBcCj4gPiAtCQkJCQkoSU5URUxfREVWSUQo ZGV2X3ByaXYpICYgMHgwMDA0KSA9PSAweDAwMDQpCj4gPiAgCj4gPiAgI2RlZmluZSBJU19BTFBI QV9TVVBQT1JUKGludGVsX2luZm8pICgoaW50ZWxfaW5mbyktPmlzX2FscGhhX3N1cHBvcnQpCj4g PiAgCj4gPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9pcnEuYyBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfaXJxLmMKPiA+IGluZGV4IDVkMWY1MzcyMzM4OC4uNjNk Njc2ZGUzODQwIDEwMDY0NAo+ID4gLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9pcnEu Ywo+ID4gKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9pcnEuYwo+ID4gQEAgLTI3ODIs OCArMjc4Miw3IEBAIGdlbjhfZGVfaXJxX2hhbmRsZXIoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUg KmRldl9wcml2LCB1MzIgbWFzdGVyX2N0bCkKPiA+ICAJCQlpZiAoSU5URUxfR0VOKGRldl9wcml2 KSA+PSAxMSkKPiA+ICAJCQkJdG1wX21hc2sgfD0gSUNMX0FVWF9DSEFOTkVMX0U7Cj4gPiAgCj4g PiAtCQkJaWYgKElTX0NOTF9XSVRIX1BPUlRfRihkZXZfcHJpdikgfHwKPiA+IC0JCQkgICAgSU5U RUxfR0VOKGRldl9wcml2KSA+PSAxMSkKPiA+ICsJCQlpZiAoSU5URUxfSU5GTyhkZXZfcHJpdikt PmRkaV9wb3J0cyA+PSA2KQo+ID4gIAkJCQl0bXBfbWFzayB8PSBDTkxfQVVYX0NIQU5ORUxfRjsK Cm9rLCB0aGlzIGlzIGRpcmVjdGx5IHJlbGF0ZWQgdG8gdGhlIG51bWJlciBvZiBwb3J0cwoKPiA+ ICAKPiA+ICAJCQlpZiAoaWlyICYgdG1wX21hc2spIHsKPiA+IEBAIC00MjIwLDcgKzQyMTksNyBA QCBzdGF0aWMgdm9pZCBnZW44X2RlX2lycV9wb3N0aW5zdGFsbChzdHJ1Y3QgZHJtX2k5MTVfcHJp dmF0ZSAqZGV2X3ByaXYpCj4gPiAgCWlmIChJTlRFTF9HRU4oZGV2X3ByaXYpID49IDExKQo+ID4g IAkJZGVfcG9ydF9tYXNrZWQgfD0gSUNMX0FVWF9DSEFOTkVMX0U7Cj4gPiAgCj4gPiAtCWlmIChJ U19DTkxfV0lUSF9QT1JUX0YoZGV2X3ByaXYpIHx8IElOVEVMX0dFTihkZXZfcHJpdikgPj0gMTEp Cj4gPiArCWlmIChJTlRFTF9JTkZPKGRldl9wcml2KS0+ZGRpX3BvcnRzID49IDYpCj4gPiAgCQlk ZV9wb3J0X21hc2tlZCB8PSBDTkxfQVVYX0NIQU5ORUxfRjsKPiA+ICAKPiA+ICAJZGVfcGlwZV9l bmFibGVzID0gZGVfcGlwZV9tYXNrZWQgfCBHRU44X1BJUEVfVkJMQU5LIHwKPiA+IGRpZmYgLS1n aXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcC5jIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfZHAuYwo+ID4gaW5kZXggMzM4NGE5YmJkYWZkLi4wZWEwNDE0Y2NlZjQgMTAwNjQ0 Cj4gPiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcC5jCj4gPiArKysgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcC5jCj4gPiBAQCAtNDAyLDcgKzQwMiw3IEBAIHN0YXRp YyBpbnQgY25sX21heF9zb3VyY2VfcmF0ZShzdHJ1Y3QgaW50ZWxfZHAgKmludGVsX2RwKQo+ID4g IAkJcmV0dXJuIDU0MDAwMDsKPiA+ICAKPiA+ICAJLyogRm9yIHRoaXMgU0tVIDguMUcgaXMgc3Vw cG9ydGVkIGluIGFsbCBwb3J0cyAqLwo+ID4gLQlpZiAoSVNfQ05MX1dJVEhfUE9SVF9GKGRldl9w cml2KSkKPiA+ICsJaWYgKElOVEVMX0lORk8oZGV2X3ByaXYpLT5kZGlfcG9ydHMgPT0gNikKCnRo aXMgaXMgbm90LiBBbmQgYW55b25lIHJlYWRpbmcgdGhpcyB3aWxsIGhhdmUgdG8gY2hhc2UgYmFj ayB3aGF0IGl0IG1lYW5zIHRvIGhhdmUgNiBkZGkgcG9ydHMgaGVyZS4KU28gd2UgbWF5IG5lZWQg dG8gY3JlYXRlIGEgbW9yZSB1c2VmdWwgbWFjcm8gKHRoYXQgY2FuIGluIGZhY3QgY2hlY2sgYnkg dGhlIG51bWJlciBvZiBwb3J0cykuClBsYWNlcyBpbiB3aGljaCB0aGUgbnVtYmVyIG9mIHBvcnRz IGlzIG5vdCByZWxhdGVkIHRvIHdoYXQncyBiZWluZyBjaGVja2VkIHdpbGwgYmUgbXVjaCBtb3Jl CmRpZmZpY3VsdCB0byBjaGVjayB0byBzdXBwb3J0IG5ld2VyIHBsYXRmb3Jtcy4gRXhwbGljaXQg dmFyaWFibGVzIGluIGRldl9pbmZvIHdvbid0LgoKCj4gPiAgCQlyZXR1cm4gODEwMDAwOwo+ID4g IAo+ID4gIAkvKiBGb3Igb3RoZXIgU0tVcywgbWF4IHJhdGUgb24gcG9ydHMgQSBhbmQgRCBpcyA1 LjRHICovCj4gPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfaG90cGx1 Zy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfaG90cGx1Zy5jCj4gPiBpbmRleCA2NDhh MTNjNjA0M2MuLjA1ZDFmYWY3NzA0OCAxMDA2NDQKPiA+IC0tLSBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2hvdHBsdWcuYwo+ID4gKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf aG90cGx1Zy5jCj4gPiBAQCAtMTAxLDcgKzEwMSw3IEBAIGVudW0gaHBkX3BpbiBpbnRlbF9ocGRf cGluX2RlZmF1bHQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAo+ID4gIAljYXNl IFBPUlRfRToKPiA+ICAJCXJldHVybiBIUERfUE9SVF9FOwo+ID4gIAljYXNlIFBPUlRfRjoKPiA+ IC0JCWlmIChJU19DTkxfV0lUSF9QT1JUX0YoZGV2X3ByaXYpKQo+ID4gKwkJaWYgKElTX0dFTjEw KGRldl9wcml2KSkKCnRoaXMgc2VlbXMgd3JvbmcsIG5vPyBtaXNzaW5nIGEgJiYgZGRpX3BvcnRz ID09IDY/CgpMdWNhcyBEZSBNYXJjaGkKCj4gPiAgCQkJcmV0dXJuIEhQRF9QT1JUX0U7Cj4gPiAg CQlyZXR1cm4gSFBEX1BPUlRfRjsKPiA+ICAJZGVmYXVsdDoKPiA+IGRpZmYgLS1naXQgYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ydW50aW1lX3BtLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9ydW50aW1lX3BtLmMKPiA+IGluZGV4IDMxYTQ5YmRjZjE5My4uODBlMTRiZTExMjc5 IDEwMDY0NAo+ID4gLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcnVudGltZV9wbS5j Cj4gPiArKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ydW50aW1lX3BtLmMKPiA+IEBA IC0zMDk5LDcgKzMwOTksNyBAQCBpbnQgaW50ZWxfcG93ZXJfZG9tYWluc19pbml0KHN0cnVjdCBk cm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKPiA+ICAJCSAqIHRpbWVvdXRzLCBsZXRzIHJlbW92 ZSB0aGVtIGZyb20gdGhlIGxpc3QKPiA+ICAJCSAqIGZvciB0aGUgU0tVcyB3aXRob3V0IHBvcnQg Ri4KPiA+ICAJCSAqLwo+ID4gLQkJaWYgKCFJU19DTkxfV0lUSF9QT1JUX0YoZGV2X3ByaXYpKQo+ ID4gKwkJaWYgKElOVEVMX0lORk8oZGV2X3ByaXYpLT5kZGlfcG9ydHMgPT0gNSkKPiA+ICAJCQlw b3dlcl9kb21haW5zLT5wb3dlcl93ZWxsX2NvdW50IC09IDI7Cj4gPiAgCj4gPiAgCX0gZWxzZSBp ZiAoSVNfQlJPWFRPTihkZXZfcHJpdikpIHsKPiAKPiAtLSAKPiBKYW5pIE5pa3VsYSwgSW50ZWwg T3BlbiBTb3VyY2UgR3JhcGhpY3MgQ2VudGVyCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3Rz LmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xp c3RpbmZvL2ludGVsLWdmeAo=