From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= Subject: Re: [PATCH 2/4] drm/i915: Respect alternate_ddc_pin for all DDI ports Date: Wed, 12 Oct 2016 13:57:22 +0300 Message-ID: <20161012105722.GV4329@intel.com> References: <1476208368-5710-1-git-send-email-ville.syrjala@linux.intel.com> <1476208368-5710-3-git-send-email-ville.syrjala@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTPS id 733A76E079 for ; Wed, 12 Oct 2016 10:57:25 +0000 (UTC) Content-Disposition: inline In-Reply-To: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Maarten Maathuis Cc: intel-gfx , stable@vger.kernel.org List-Id: intel-gfx@lists.freedesktop.org T24gVHVlLCBPY3QgMTEsIDIwMTYgYXQgMTA6MDQ6MDBQTSArMDIwMCwgTWFhcnRlbiBNYWF0aHVp cyB3cm90ZToKPiBNeSBuYW1lIGRvZXMgbm90IGluY2x1ZGUgdGhlIHdvcmQgInNob3ciIChUZXN0 ZWQtYnkgdGFnKS4KClNvcnJ5IGFib3V0IHRoYXQuIFNvbWUgY29weS1wYXN0ZSBmYWlsIEkgc3Vz cGVjdC4gSSdsbCBmaXggaXQgdXAuCgpBbmQgeW91IGFjdHVhbGx5IHRlc3RlZCB0aGUgdjEgcGF0 Y2hlcywgc28gSSB0b3RhbGx5IGZvcmdvdCB0byBub3RlIHRoYXQKaW4gdGhlIHRlc3RlZC1ieSB0 YWdzIDooIENhcmUgdG8gcmUtdGVzdCB0aGVzZSB2MiB2ZXJzaW9ucywganVzdCB0byBtYWtlCnN1 cmUgSSBkaWRuJ3Qgc2VyaW91c2x5IGZ1bWJsZSBhbnl0aGluZz8KCj4gCj4gT24gVHVlLCBPY3Qg MTEsIDIwMTYgYXQgNzo1MiBQTSwgPHZpbGxlLnN5cmphbGFAbGludXguaW50ZWwuY29tPiB3cm90 ZToKPiAKPiA+IEZyb206IFZpbGxlIFN5cmrDpGzDpCA8dmlsbGUuc3lyamFsYUBsaW51eC5pbnRl bC5jb20+Cj4gPgo+ID4gVGhlIFZCVCBwcm92aWRlcyB0aGUgcGxhdGZvcm0gYSB3YXkgdG8gbWl4 IGFuZCBtYXRjaCB0aGUgRERJIHBvcnRzIHZzLgo+ID4gR01CVVMgcGlucy4gQ3VycmVudGx5IHdl IG9ubHkgdHJ1c3QgdGhlIFZCVCBmb3IgRERJIEUsIHdoaWNoIEkgc3VwcG9zZQo+ID4gaGFzIG5v IHN0YW5kYXJkIEdNQlVTIHBpbiBhc3NpZ25tZW50LiBIb3dldmVyLCB0aGVyZSBhcmUgbWFjaGlu ZXMgb3V0Cj4gPiB0aGVyZSB0aGF0IHVzZSBhIG5vbi1zdGFuZGFyZCBtYXBwaW5nIGZvciB0aGUg b3RoZXIgcG9ydHMgYXMgd2VsbC4KPiA+IExldCdzIHN0YXJ0IHRydXN0aW5nIHRoZSBWQlQgb24g dGhpcyBvbmUgZm9yIGFsbCBwb3J0cyBvbiBEREkgcGxhdGZvcm1zLgo+ID4KPiA+IEkndmUgc3Ry dWN0dXJlZCB0aGUgY29kZSBzdWNoIHRoYXQgb3RoZXIgcGxhdGZvcm1zIGNvdWxkIGVhc2lseSBz dGFydAo+ID4gdXNpbmcgdGhpcyBhcyB3ZWxsLCBieSBzaW1wbHkgZmlsbGluZyBpbiB0aGUgZGRp X3BvcnRfaW5mby4gSUlSQyB0aGVyZQo+ID4gbWF5IGJlIENIViBzeXN0ZW0gdGhhdCBtaWdodCBh Y3R1YWxseSBuZWVkIHRoaXMuCj4gPgo+ID4gdjI6IEluY2x1ZGUgYSBjb21taXQgbWVzc2FnZSwg aW5jbHVkZSBhIGRlYnVnIG1lc3NhZ2UgZHVyaW5nIGluaXQKPiA+Cj4gPiBDYzogc3RhYmxlQHZn ZXIua2VybmVsLm9yZwo+ID4gQ2M6IE1hYXJ0ZW4gTWFhdGh1aXMgPG1hZG1hbjIwMDNAZ21haWwu Y29tPgo+ID4gVGVzdGVkLWJ5OiBNYWFydGVuIE1hYXR0IHNob3cgaHVpcyA8bWFkbWFuMjAwM0Bn bWFpbC5jb20+Cj4gPiBCdWd6aWxsYTogaHR0cHM6Ly9idWdzLmZyZWVkZXNrdG9wLm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9OTc4NzcKPiA+IFNpZ25lZC1vZmYtYnk6IFZpbGxlIFN5cmrDpGzDpCA8dmls bGUuc3lyamFsYUBsaW51eC5pbnRlbC5jb20+Cj4gPiAtLS0KPiA+ICBkcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9oZG1pLmMgfCA4NCArKysrKysrKysrKysrKysrKysrKysrLS0tLS0tLS0KPiA+ IC0tLS0tLS0tLQo+ID4gIDEgZmlsZSBjaGFuZ2VkLCA0OCBpbnNlcnRpb25zKCspLCAzNiBkZWxl dGlvbnMoLSkKPiA+Cj4gPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf aGRtaS5jCj4gPiBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2hkbWkuYwo+ID4gaW5kZXgg OGQ0NmY1ODM2NzQ2Li45Y2E4NmU5MDFmYzggMTAwNjQ0Cj4gPiAtLS0gYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9oZG1pLmMKPiA+ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X2hkbWkuYwo+ID4gQEAgLTE3OTksNiArMTc5OSw1MCBAQCBpbnRlbF9oZG1pX2FkZF9wcm9wZXJ0 aWVzKHN0cnVjdCBpbnRlbF9oZG1pCj4gPiAqaW50ZWxfaGRtaSwgc3RydWN0IGRybV9jb25uZWN0 b3IgKmMKPiA+ICAgICAgICAgaW50ZWxfaGRtaS0+YXNwZWN0X3JhdGlvID0gSERNSV9QSUNUVVJF X0FTUEVDVF9OT05FOwo+ID4gIH0KPiA+Cj4gPiArc3RhdGljIHU4IGludGVsX2hkbWlfZGRjX3Bp bihzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCj4gPiArICAgICAgICAgICAgICAg ICAgICAgICAgICAgIGVudW0gcG9ydCBwb3J0KQo+ID4gK3sKPiA+ICsgICAgICAgY29uc3Qgc3Ry dWN0IGRkaV92YnRfcG9ydF9pbmZvICppbmZvID0KPiA+ICsgICAgICAgICAgICAgICAmZGV2X3By aXYtPnZidC5kZGlfcG9ydF9pbmZvW3BvcnRdOwo+ID4gKyAgICAgICB1OCBkZGNfcGluOwo+ID4g Kwo+ID4gKyAgICAgICBpZiAoaW5mby0+YWx0ZXJuYXRlX2RkY19waW4pIHsKPiA+ICsgICAgICAg ICAgICAgICBEUk1fREVCVUdfS01TKCJVc2luZyBEREMgcGluIDB4JXggZm9yIHBvcnQgJWMgKFZC VClcbiIsCj4gPiArICAgICAgICAgICAgICAgICAgICAgICAgICAgICBpbmZvLT5hbHRlcm5hdGVf ZGRjX3BpbiwgcG9ydF9uYW1lKHBvcnQpKTsKPiA+ICsgICAgICAgICAgICAgICByZXR1cm4gaW5m by0+YWx0ZXJuYXRlX2RkY19waW47Cj4gPiArICAgICAgIH0KPiA+ICsKPiA+ICsgICAgICAgc3dp dGNoIChwb3J0KSB7Cj4gPiArICAgICAgIGNhc2UgUE9SVF9COgo+ID4gKyAgICAgICAgICAgICAg IGlmIChJU19CUk9YVE9OKGRldl9wcml2KSkKPiA+ICsgICAgICAgICAgICAgICAgICAgICAgIGRk Y19waW4gPSBHTUJVU19QSU5fMV9CWFQ7Cj4gPiArICAgICAgICAgICAgICAgZWxzZQo+ID4gKyAg ICAgICAgICAgICAgICAgICAgICAgZGRjX3BpbiA9IEdNQlVTX1BJTl9EUEI7Cj4gPiArICAgICAg ICAgICAgICAgYnJlYWs7Cj4gPiArICAgICAgIGNhc2UgUE9SVF9DOgo+ID4gKyAgICAgICAgICAg ICAgIGlmIChJU19CUk9YVE9OKGRldl9wcml2KSkKPiA+ICsgICAgICAgICAgICAgICAgICAgICAg IGRkY19waW4gPSBHTUJVU19QSU5fMl9CWFQ7Cj4gPiArICAgICAgICAgICAgICAgZWxzZQo+ID4g KyAgICAgICAgICAgICAgICAgICAgICAgZGRjX3BpbiA9IEdNQlVTX1BJTl9EUEM7Cj4gPiArICAg ICAgICAgICAgICAgYnJlYWs7Cj4gPiArICAgICAgIGNhc2UgUE9SVF9EOgo+ID4gKyAgICAgICAg ICAgICAgIGlmIChJU19DSEVSUllWSUVXKGRldl9wcml2KSkKPiA+ICsgICAgICAgICAgICAgICAg ICAgICAgIGRkY19waW4gPSBHTUJVU19QSU5fRFBEX0NIVjsKPiA+ICsgICAgICAgICAgICAgICBl bHNlCj4gPiArICAgICAgICAgICAgICAgICAgICAgICBkZGNfcGluID0gR01CVVNfUElOX0RQRDsK PiA+ICsgICAgICAgICAgICAgICBicmVhazsKPiA+ICsgICAgICAgZGVmYXVsdDoKPiA+ICsgICAg ICAgICAgICAgICBNSVNTSU5HX0NBU0UocG9ydCk7Cj4gPiArICAgICAgICAgICAgICAgZGRjX3Bp biA9IEdNQlVTX1BJTl9EUEI7Cj4gPiArICAgICAgICAgICAgICAgYnJlYWs7Cj4gPiArICAgICAg IH0KPiA+ICsKPiA+ICsgICAgICAgRFJNX0RFQlVHX0tNUygiVXNpbmcgRERDIHBpbiAweCV4IGZv ciBwb3J0ICVjIChwbGF0Zm9ybQo+ID4gZGVmYXVsdClcbiIsCj4gPiArICAgICAgICAgICAgICAg ICAgICAgZGRjX3BpbiwgcG9ydF9uYW1lKHBvcnQpKTsKPiA+ICsKPiA+ICsgICAgICAgcmV0dXJu IGRkY19waW47Cj4gPiArfQo+ID4gKwo+ID4gIHZvaWQgaW50ZWxfaGRtaV9pbml0X2Nvbm5lY3Rv cihzdHJ1Y3QgaW50ZWxfZGlnaXRhbF9wb3J0ICppbnRlbF9kaWdfcG9ydCwKPiA+ICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICBzdHJ1Y3QgaW50ZWxfY29ubmVjdG9yICppbnRlbF9jb25u ZWN0b3IpCj4gPiAgewo+ID4gQEAgLTE4MDgsNyArMTg1Miw2IEBAIHZvaWQgaW50ZWxfaGRtaV9p bml0X2Nvbm5lY3RvcihzdHJ1Y3QKPiA+IGludGVsX2RpZ2l0YWxfcG9ydCAqaW50ZWxfZGlnX3Bv cnQsCj4gPiAgICAgICAgIHN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBpbnRlbF9lbmNvZGVyLT5i YXNlLmRldjsKPiA+ICAgICAgICAgc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0g dG9faTkxNShkZXYpOwo+ID4gICAgICAgICBlbnVtIHBvcnQgcG9ydCA9IGludGVsX2RpZ19wb3J0 LT5wb3J0Owo+ID4gLSAgICAgICB1aW50OF90IGFsdGVybmF0ZV9kZGNfcGluOwo+ID4KPiA+ICAg ICAgICAgRFJNX0RFQlVHX0tNUygiQWRkaW5nIEhETUkgY29ubmVjdG9yIG9uIHBvcnQgJWNcbiIs Cj4gPiAgICAgICAgICAgICAgICAgICAgICAgcG9ydF9uYW1lKHBvcnQpKTsKPiA+IEBAIC0xODI2 LDEyICsxODY5LDEwIEBAIHZvaWQgaW50ZWxfaGRtaV9pbml0X2Nvbm5lY3RvcihzdHJ1Y3QKPiA+ IGludGVsX2RpZ2l0YWxfcG9ydCAqaW50ZWxfZGlnX3BvcnQsCj4gPiAgICAgICAgIGNvbm5lY3Rv ci0+ZG91Ymxlc2Nhbl9hbGxvd2VkID0gMDsKPiA+ICAgICAgICAgY29ubmVjdG9yLT5zdGVyZW9f YWxsb3dlZCA9IDE7Cj4gPgo+ID4gKyAgICAgICBpbnRlbF9oZG1pLT5kZGNfYnVzID0gaW50ZWxf aGRtaV9kZGNfcGluKGRldl9wcml2LCBwb3J0KTsKPiA+ICsKPiA+ICAgICAgICAgc3dpdGNoIChw b3J0KSB7Cj4gPiAgICAgICAgIGNhc2UgUE9SVF9COgo+ID4gLSAgICAgICAgICAgICAgIGlmIChJ U19CUk9YVE9OKGRldl9wcml2KSkKPiA+IC0gICAgICAgICAgICAgICAgICAgICAgIGludGVsX2hk bWktPmRkY19idXMgPSBHTUJVU19QSU5fMV9CWFQ7Cj4gPiAtICAgICAgICAgICAgICAgZWxzZQo+ ID4gLSAgICAgICAgICAgICAgICAgICAgICAgaW50ZWxfaGRtaS0+ZGRjX2J1cyA9IEdNQlVTX1BJ Tl9EUEI7Cj4gPiAgICAgICAgICAgICAgICAgLyoKPiA+ICAgICAgICAgICAgICAgICAgKiBPbiBC WFQgQTAvQTEsIHN3IG5lZWRzIHRvIGFjdGl2YXRlIERESUEgSFBEIGxvZ2ljIGFuZAo+ID4gICAg ICAgICAgICAgICAgICAqIGludGVycnVwdHMgdG8gY2hlY2sgdGhlIGV4dGVybmFsIHBhbmVsIGNv bm5lY3Rpb24uCj4gPiBAQCAtMTg0Miw0NiArMTg4MywxNyBAQCB2b2lkIGludGVsX2hkbWlfaW5p dF9jb25uZWN0b3Ioc3RydWN0Cj4gPiBpbnRlbF9kaWdpdGFsX3BvcnQgKmludGVsX2RpZ19wb3J0 LAo+ID4gICAgICAgICAgICAgICAgICAgICAgICAgaW50ZWxfZW5jb2Rlci0+aHBkX3BpbiA9IEhQ RF9QT1JUX0I7Cj4gPiAgICAgICAgICAgICAgICAgYnJlYWs7Cj4gPiAgICAgICAgIGNhc2UgUE9S VF9DOgo+ID4gLSAgICAgICAgICAgICAgIGlmIChJU19CUk9YVE9OKGRldl9wcml2KSkKPiA+IC0g ICAgICAgICAgICAgICAgICAgICAgIGludGVsX2hkbWktPmRkY19idXMgPSBHTUJVU19QSU5fMl9C WFQ7Cj4gPiAtICAgICAgICAgICAgICAgZWxzZQo+ID4gLSAgICAgICAgICAgICAgICAgICAgICAg aW50ZWxfaGRtaS0+ZGRjX2J1cyA9IEdNQlVTX1BJTl9EUEM7Cj4gPiAgICAgICAgICAgICAgICAg aW50ZWxfZW5jb2Rlci0+aHBkX3BpbiA9IEhQRF9QT1JUX0M7Cj4gPiAgICAgICAgICAgICAgICAg YnJlYWs7Cj4gPiAgICAgICAgIGNhc2UgUE9SVF9EOgo+ID4gLSAgICAgICAgICAgICAgIGlmIChX QVJOX09OKElTX0JST1hUT04oZGV2X3ByaXYpKSkKPiA+IC0gICAgICAgICAgICAgICAgICAgICAg IGludGVsX2hkbWktPmRkY19idXMgPSBHTUJVU19QSU5fRElTQUJMRUQ7Cj4gPiAtICAgICAgICAg ICAgICAgZWxzZSBpZiAoSVNfQ0hFUlJZVklFVyhkZXZfcHJpdikpCj4gPiAtICAgICAgICAgICAg ICAgICAgICAgICBpbnRlbF9oZG1pLT5kZGNfYnVzID0gR01CVVNfUElOX0RQRF9DSFY7Cj4gPiAt ICAgICAgICAgICAgICAgZWxzZQo+ID4gLSAgICAgICAgICAgICAgICAgICAgICAgaW50ZWxfaGRt aS0+ZGRjX2J1cyA9IEdNQlVTX1BJTl9EUEQ7Cj4gPiAgICAgICAgICAgICAgICAgaW50ZWxfZW5j b2Rlci0+aHBkX3BpbiA9IEhQRF9QT1JUX0Q7Cj4gPiAgICAgICAgICAgICAgICAgYnJlYWs7Cj4g PiAgICAgICAgIGNhc2UgUE9SVF9FOgo+ID4gLSAgICAgICAgICAgICAgIC8qIE9uIFNLTCBQT1JU IEUgZG9lc24ndCBoYXZlIHNlcGVyYXRlIEdNQlVTIHBpbgo+ID4gLSAgICAgICAgICAgICAgICAq ICBXZSByZWx5IG9uIFZCVCB0byBzZXQgYSBwcm9wZXIgYWx0ZXJuYXRlIEdNQlVTIHBpbi4gKi8K PiA+IC0gICAgICAgICAgICAgICBhbHRlcm5hdGVfZGRjX3BpbiA9Cj4gPiAtICAgICAgICAgICAg ICAgICAgICAgICBkZXZfcHJpdi0+dmJ0LmRkaV9wb3J0X2luZm9bCj4gPiBQT1JUX0VdLmFsdGVy bmF0ZV9kZGNfcGluOwo+ID4gLSAgICAgICAgICAgICAgIHN3aXRjaCAoYWx0ZXJuYXRlX2RkY19w aW4pIHsKPiA+IC0gICAgICAgICAgICAgICBjYXNlIEREQ19QSU5fQjoKPiA+IC0gICAgICAgICAg ICAgICAgICAgICAgIGludGVsX2hkbWktPmRkY19idXMgPSBHTUJVU19QSU5fRFBCOwo+ID4gLSAg ICAgICAgICAgICAgICAgICAgICAgYnJlYWs7Cj4gPiAtICAgICAgICAgICAgICAgY2FzZSBERENf UElOX0M6Cj4gPiAtICAgICAgICAgICAgICAgICAgICAgICBpbnRlbF9oZG1pLT5kZGNfYnVzID0g R01CVVNfUElOX0RQQzsKPiA+IC0gICAgICAgICAgICAgICAgICAgICAgIGJyZWFrOwo+ID4gLSAg ICAgICAgICAgICAgIGNhc2UgRERDX1BJTl9EOgo+ID4gLSAgICAgICAgICAgICAgICAgICAgICAg aW50ZWxfaGRtaS0+ZGRjX2J1cyA9IEdNQlVTX1BJTl9EUEQ7Cj4gPiAtICAgICAgICAgICAgICAg ICAgICAgICBicmVhazsKPiA+IC0gICAgICAgICAgICAgICBkZWZhdWx0Ogo+ID4gLSAgICAgICAg ICAgICAgICAgICAgICAgTUlTU0lOR19DQVNFKGFsdGVybmF0ZV9kZGNfcGluKTsKPiA+IC0gICAg ICAgICAgICAgICB9Cj4gPiAgICAgICAgICAgICAgICAgaW50ZWxfZW5jb2Rlci0+aHBkX3BpbiA9 IEhQRF9QT1JUX0U7Cj4gPiAgICAgICAgICAgICAgICAgYnJlYWs7Cj4gPiAtICAgICAgIGNhc2Ug UE9SVF9BOgo+ID4gLSAgICAgICAgICAgICAgIGludGVsX2VuY29kZXItPmhwZF9waW4gPSBIUERf UE9SVF9BOwo+ID4gLSAgICAgICAgICAgICAgIC8qIEludGVybmFsIHBvcnQgb25seSBmb3IgZURQ LiAqLwo+ID4gICAgICAgICBkZWZhdWx0Ogo+ID4gLSAgICAgICAgICAgICAgIEJVRygpOwo+ID4g KyAgICAgICAgICAgICAgIE1JU1NJTkdfQ0FTRShwb3J0KTsKPiA+ICsgICAgICAgICAgICAgICBy ZXR1cm47Cj4gPiAgICAgICAgIH0KPiA+Cj4gPiAgICAgICAgIGlmIChJU19WQUxMRVlWSUVXKGRl dikgfHwgSVNfQ0hFUlJZVklFVyhkZXYpKSB7Cj4gPiAtLQo+ID4gMi43LjQKPiA+Cj4gPgo+IAo+ IAo+IC0tIAo+IEZhciBhd2F5IGZyb20gdGhlIHByaW1hbCBpbnN0aW5jdCwgdGhlIHNvbmcgc2Vl bXMgdG8gZmFkZSBhd2F5LCB0aGUgcml2ZXIKPiBnZXQgd2lkZXIgYmV0d2VlbiB5b3VyIHRob3Vn aHRzIGFuZCB0aGUgdGhpbmdzIHdlIGRvIGFuZCBzYXkuCgotLSAKVmlsbGUgU3lyasOkbMOkCklu dGVsIE9UQwpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJ bnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0 cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga01.intel.com ([192.55.52.88]:22448 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932589AbcJLLAk (ORCPT ); Wed, 12 Oct 2016 07:00:40 -0400 Date: Wed, 12 Oct 2016 13:57:22 +0300 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= To: Maarten Maathuis Cc: intel-gfx , stable@vger.kernel.org Subject: Re: [PATCH 2/4] drm/i915: Respect alternate_ddc_pin for all DDI ports Message-ID: <20161012105722.GV4329@intel.com> References: <1476208368-5710-1-git-send-email-ville.syrjala@linux.intel.com> <1476208368-5710-3-git-send-email-ville.syrjala@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: Sender: stable-owner@vger.kernel.org List-ID: On Tue, Oct 11, 2016 at 10:04:00PM +0200, Maarten Maathuis wrote: > My name does not include the word "show" (Tested-by tag). Sorry about that. Some copy-paste fail I suspect. I'll fix it up. And you actually tested the v1 patches, so I totally forgot to note that in the tested-by tags :( Care to re-test these v2 versions, just to make sure I didn't seriously fumble anything? > > On Tue, Oct 11, 2016 at 7:52 PM, wrote: > > > From: Ville Syrj�l� > > > > The VBT provides the platform a way to mix and match the DDI ports vs. > > GMBUS pins. Currently we only trust the VBT for DDI E, which I suppose > > has no standard GMBUS pin assignment. However, there are machines out > > there that use a non-standard mapping for the other ports as well. > > Let's start trusting the VBT on this one for all ports on DDI platforms. > > > > I've structured the code such that other platforms could easily start > > using this as well, by simply filling in the ddi_port_info. IIRC there > > may be CHV system that might actually need this. > > > > v2: Include a commit message, include a debug message during init > > > > Cc: stable@vger.kernel.org > > Cc: Maarten Maathuis > > Tested-by: Maarten Maatt show huis > > Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=97877 > > Signed-off-by: Ville Syrj�l� > > --- > > drivers/gpu/drm/i915/intel_hdmi.c | 84 ++++++++++++++++++++++-------- > > --------- > > 1 file changed, 48 insertions(+), 36 deletions(-) > > > > diff --git a/drivers/gpu/drm/i915/intel_hdmi.c > > b/drivers/gpu/drm/i915/intel_hdmi.c > > index 8d46f5836746..9ca86e901fc8 100644 > > --- a/drivers/gpu/drm/i915/intel_hdmi.c > > +++ b/drivers/gpu/drm/i915/intel_hdmi.c > > @@ -1799,6 +1799,50 @@ intel_hdmi_add_properties(struct intel_hdmi > > *intel_hdmi, struct drm_connector *c > > intel_hdmi->aspect_ratio = HDMI_PICTURE_ASPECT_NONE; > > } > > > > +static u8 intel_hdmi_ddc_pin(struct drm_i915_private *dev_priv, > > + enum port port) > > +{ > > + const struct ddi_vbt_port_info *info = > > + &dev_priv->vbt.ddi_port_info[port]; > > + u8 ddc_pin; > > + > > + if (info->alternate_ddc_pin) { > > + DRM_DEBUG_KMS("Using DDC pin 0x%x for port %c (VBT)\n", > > + info->alternate_ddc_pin, port_name(port)); > > + return info->alternate_ddc_pin; > > + } > > + > > + switch (port) { > > + case PORT_B: > > + if (IS_BROXTON(dev_priv)) > > + ddc_pin = GMBUS_PIN_1_BXT; > > + else > > + ddc_pin = GMBUS_PIN_DPB; > > + break; > > + case PORT_C: > > + if (IS_BROXTON(dev_priv)) > > + ddc_pin = GMBUS_PIN_2_BXT; > > + else > > + ddc_pin = GMBUS_PIN_DPC; > > + break; > > + case PORT_D: > > + if (IS_CHERRYVIEW(dev_priv)) > > + ddc_pin = GMBUS_PIN_DPD_CHV; > > + else > > + ddc_pin = GMBUS_PIN_DPD; > > + break; > > + default: > > + MISSING_CASE(port); > > + ddc_pin = GMBUS_PIN_DPB; > > + break; > > + } > > + > > + DRM_DEBUG_KMS("Using DDC pin 0x%x for port %c (platform > > default)\n", > > + ddc_pin, port_name(port)); > > + > > + return ddc_pin; > > +} > > + > > void intel_hdmi_init_connector(struct intel_digital_port *intel_dig_port, > > struct intel_connector *intel_connector) > > { > > @@ -1808,7 +1852,6 @@ void intel_hdmi_init_connector(struct > > intel_digital_port *intel_dig_port, > > struct drm_device *dev = intel_encoder->base.dev; > > struct drm_i915_private *dev_priv = to_i915(dev); > > enum port port = intel_dig_port->port; > > - uint8_t alternate_ddc_pin; > > > > DRM_DEBUG_KMS("Adding HDMI connector on port %c\n", > > port_name(port)); > > @@ -1826,12 +1869,10 @@ void intel_hdmi_init_connector(struct > > intel_digital_port *intel_dig_port, > > connector->doublescan_allowed = 0; > > connector->stereo_allowed = 1; > > > > + intel_hdmi->ddc_bus = intel_hdmi_ddc_pin(dev_priv, port); > > + > > switch (port) { > > case PORT_B: > > - if (IS_BROXTON(dev_priv)) > > - intel_hdmi->ddc_bus = GMBUS_PIN_1_BXT; > > - else > > - intel_hdmi->ddc_bus = GMBUS_PIN_DPB; > > /* > > * On BXT A0/A1, sw needs to activate DDIA HPD logic and > > * interrupts to check the external panel connection. > > @@ -1842,46 +1883,17 @@ void intel_hdmi_init_connector(struct > > intel_digital_port *intel_dig_port, > > intel_encoder->hpd_pin = HPD_PORT_B; > > break; > > case PORT_C: > > - if (IS_BROXTON(dev_priv)) > > - intel_hdmi->ddc_bus = GMBUS_PIN_2_BXT; > > - else > > - intel_hdmi->ddc_bus = GMBUS_PIN_DPC; > > intel_encoder->hpd_pin = HPD_PORT_C; > > break; > > case PORT_D: > > - if (WARN_ON(IS_BROXTON(dev_priv))) > > - intel_hdmi->ddc_bus = GMBUS_PIN_DISABLED; > > - else if (IS_CHERRYVIEW(dev_priv)) > > - intel_hdmi->ddc_bus = GMBUS_PIN_DPD_CHV; > > - else > > - intel_hdmi->ddc_bus = GMBUS_PIN_DPD; > > intel_encoder->hpd_pin = HPD_PORT_D; > > break; > > case PORT_E: > > - /* On SKL PORT E doesn't have seperate GMBUS pin > > - * We rely on VBT to set a proper alternate GMBUS pin. */ > > - alternate_ddc_pin = > > - dev_priv->vbt.ddi_port_info[ > > PORT_E].alternate_ddc_pin; > > - switch (alternate_ddc_pin) { > > - case DDC_PIN_B: > > - intel_hdmi->ddc_bus = GMBUS_PIN_DPB; > > - break; > > - case DDC_PIN_C: > > - intel_hdmi->ddc_bus = GMBUS_PIN_DPC; > > - break; > > - case DDC_PIN_D: > > - intel_hdmi->ddc_bus = GMBUS_PIN_DPD; > > - break; > > - default: > > - MISSING_CASE(alternate_ddc_pin); > > - } > > intel_encoder->hpd_pin = HPD_PORT_E; > > break; > > - case PORT_A: > > - intel_encoder->hpd_pin = HPD_PORT_A; > > - /* Internal port only for eDP. */ > > default: > > - BUG(); > > + MISSING_CASE(port); > > + return; > > } > > > > if (IS_VALLEYVIEW(dev) || IS_CHERRYVIEW(dev)) { > > -- > > 2.7.4 > > > > > > > -- > Far away from the primal instinct, the song seems to fade away, the river > get wider between your thoughts and the things we do and say. -- Ville Syrj�l� Intel OTC