From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jim Bride Subject: Re: [PATCH 2/4] drm/i915: Respect alternate_ddc_pin for all DDI ports Date: Thu, 13 Oct 2016 11:06:55 -0700 Message-ID: <20161013180654.GE4042@shiv> 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 AAFA76E028 for ; Thu, 13 Oct 2016 18:08:00 +0000 (UTC) Content-Disposition: inline In-Reply-To: <1476208368-5710-3-git-send-email-ville.syrjala@linux.intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: ville.syrjala@linux.intel.com Cc: intel-gfx@lists.freedesktop.org, Maarten Maathuis , stable@vger.kernel.org List-Id: intel-gfx@lists.freedesktop.org T24gVHVlLCBPY3QgMTEsIDIwMTYgYXQgMDg6NTI6NDZQTSArMDMwMCwgdmlsbGUuc3lyamFsYUBs aW51eC5pbnRlbC5jb20gd3JvdGU6Cj4gRnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJq YWxhQGxpbnV4LmludGVsLmNvbT4KPiAKPiBUaGUgVkJUIHByb3ZpZGVzIHRoZSBwbGF0Zm9ybSBh IHdheSB0byBtaXggYW5kIG1hdGNoIHRoZSBEREkgcG9ydHMgdnMuCj4gR01CVVMgcGlucy4gQ3Vy cmVudGx5IHdlIG9ubHkgdHJ1c3QgdGhlIFZCVCBmb3IgRERJIEUsIHdoaWNoIEkgc3VwcG9zZQo+ IGhhcyBubyBzdGFuZGFyZCBHTUJVUyBwaW4gYXNzaWdubWVudC4gSG93ZXZlciwgdGhlcmUgYXJl IG1hY2hpbmVzIG91dAo+IHRoZXJlIHRoYXQgdXNlIGEgbm9uLXN0YW5kYXJkIG1hcHBpbmcgZm9y IHRoZSBvdGhlciBwb3J0cyBhcyB3ZWxsLgo+IExldCdzIHN0YXJ0IHRydXN0aW5nIHRoZSBWQlQg b24gdGhpcyBvbmUgZm9yIGFsbCBwb3J0cyBvbiBEREkgcGxhdGZvcm1zLgo+IAo+IEkndmUgc3Ry dWN0dXJlZCB0aGUgY29kZSBzdWNoIHRoYXQgb3RoZXIgcGxhdGZvcm1zIGNvdWxkIGVhc2lseSBz dGFydAo+IHVzaW5nIHRoaXMgYXMgd2VsbCwgYnkgc2ltcGx5IGZpbGxpbmcgaW4gdGhlIGRkaV9w b3J0X2luZm8uIElJUkMgdGhlcmUKPiBtYXkgYmUgQ0hWIHN5c3RlbSB0aGF0IG1pZ2h0IGFjdHVh bGx5IG5lZWQgdGhpcy4KPiAKPiB2MjogSW5jbHVkZSBhIGNvbW1pdCBtZXNzYWdlLCBpbmNsdWRl IGEgZGVidWcgbWVzc2FnZSBkdXJpbmcgaW5pdAo+IAo+IENjOiBzdGFibGVAdmdlci5rZXJuZWwu b3JnCj4gQ2M6IE1hYXJ0ZW4gTWFhdGh1aXMgPG1hZG1hbjIwMDNAZ21haWwuY29tPgo+IFRlc3Rl ZC1ieTogTWFhcnRlbiBNYWF0dCBzaG93IGh1aXMgPG1hZG1hbjIwMDNAZ21haWwuY29tPgo+IEJ1 Z3ppbGxhOiBodHRwczovL2J1Z3MuZnJlZWRlc2t0b3Aub3JnL3Nob3dfYnVnLmNnaT9pZD05Nzg3 Nwo+IFNpZ25lZC1vZmYtYnk6IFZpbGxlIFN5cmrDpGzDpCA8dmlsbGUuc3lyamFsYUBsaW51eC5p bnRlbC5jb20+Cj4gLS0tCj4gIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2hkbWkuYyB8IDg0 ICsrKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLQo+ICAxIGZpbGUgY2hhbmdl ZCwgNDggaW5zZXJ0aW9ucygrKSwgMzYgZGVsZXRpb25zKC0pCj4gCj4gZGlmZiAtLWdpdCBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2hkbWkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2hkbWkuYwo+IGluZGV4IDhkNDZmNTgzNjc0Ni4uOWNhODZlOTAxZmM4IDEwMDY0NAo+IC0t LSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2hkbWkuYwo+ICsrKyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2hkbWkuYwo+IEBAIC0xNzk5LDYgKzE3OTksNTAgQEAgaW50ZWxfaGRt aV9hZGRfcHJvcGVydGllcyhzdHJ1Y3QgaW50ZWxfaGRtaSAqaW50ZWxfaGRtaSwgc3RydWN0IGRy bV9jb25uZWN0b3IgKmMKPiAgCWludGVsX2hkbWktPmFzcGVjdF9yYXRpbyA9IEhETUlfUElDVFVS RV9BU1BFQ1RfTk9ORTsKPiAgfQo+ICAKPiArc3RhdGljIHU4IGludGVsX2hkbWlfZGRjX3Bpbihz dHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCj4gKwkJCSAgICAgZW51bSBwb3J0IHBv cnQpCj4gK3sKPiArCWNvbnN0IHN0cnVjdCBkZGlfdmJ0X3BvcnRfaW5mbyAqaW5mbyA9Cj4gKwkJ JmRldl9wcml2LT52YnQuZGRpX3BvcnRfaW5mb1twb3J0XTsKPiArCXU4IGRkY19waW47Cj4gKwo+ ICsJaWYgKGluZm8tPmFsdGVybmF0ZV9kZGNfcGluKSB7Cj4gKwkJRFJNX0RFQlVHX0tNUygiVXNp bmcgRERDIHBpbiAweCV4IGZvciBwb3J0ICVjIChWQlQpXG4iLAo+ICsJCQkgICAgICBpbmZvLT5h bHRlcm5hdGVfZGRjX3BpbiwgcG9ydF9uYW1lKHBvcnQpKTsKPiArCQlyZXR1cm4gaW5mby0+YWx0 ZXJuYXRlX2RkY19waW47Cj4gKwl9Cj4gKwo+ICsJc3dpdGNoIChwb3J0KSB7Cj4gKwljYXNlIFBP UlRfQjoKPiArCQlpZiAoSVNfQlJPWFRPTihkZXZfcHJpdikpCj4gKwkJCWRkY19waW4gPSBHTUJV U19QSU5fMV9CWFQ7Cj4gKwkJZWxzZQo+ICsJCQlkZGNfcGluID0gR01CVVNfUElOX0RQQjsKPiAr CQlicmVhazsKPiArCWNhc2UgUE9SVF9DOgo+ICsJCWlmIChJU19CUk9YVE9OKGRldl9wcml2KSkK PiArCQkJZGRjX3BpbiA9IEdNQlVTX1BJTl8yX0JYVDsKPiArCQllbHNlCj4gKwkJCWRkY19waW4g PSBHTUJVU19QSU5fRFBDOwo+ICsJCWJyZWFrOwo+ICsJY2FzZSBQT1JUX0Q6Cj4gKwkJaWYgKElT X0NIRVJSWVZJRVcoZGV2X3ByaXYpKQo+ICsJCQlkZGNfcGluID0gR01CVVNfUElOX0RQRF9DSFY7 Cj4gKwkJZWxzZQo+ICsJCQlkZGNfcGluID0gR01CVVNfUElOX0RQRDsKCkluIHRoZSBjb2RlIHJl bW92ZWQgYmVsb3cgdGhlcmUncyBhIHNwZWNpZmljIGNhc2UgY292ZXJpbmcgQnJveHRvbiB0aGF0 Cmlzbid0IGFjY291bnRlZCBmb3IgaGVyZS4gIEFyZSB3ZSBzdXJlIHRoYXQgd2UgZG9uJ3QgbmVl ZCB0aGF0IGxvZ2ljIGhlcmU/CgpKaW0KCj4gKwkJYnJlYWs7Cj4gKwlkZWZhdWx0Ogo+ICsJCU1J U1NJTkdfQ0FTRShwb3J0KTsKPiArCQlkZGNfcGluID0gR01CVVNfUElOX0RQQjsKPiArCQlicmVh azsKPiArCX0KPiArCj4gKwlEUk1fREVCVUdfS01TKCJVc2luZyBEREMgcGluIDB4JXggZm9yIHBv cnQgJWMgKHBsYXRmb3JtIGRlZmF1bHQpXG4iLAo+ICsJCSAgICAgIGRkY19waW4sIHBvcnRfbmFt ZShwb3J0KSk7Cj4gKwo+ICsJcmV0dXJuIGRkY19waW47Cj4gK30KPiArCj4gIHZvaWQgaW50ZWxf aGRtaV9pbml0X2Nvbm5lY3RvcihzdHJ1Y3QgaW50ZWxfZGlnaXRhbF9wb3J0ICppbnRlbF9kaWdf cG9ydCwKPiAgCQkJICAgICAgIHN0cnVjdCBpbnRlbF9jb25uZWN0b3IgKmludGVsX2Nvbm5lY3Rv cikKPiAgewo+IEBAIC0xODA4LDcgKzE4NTIsNiBAQCB2b2lkIGludGVsX2hkbWlfaW5pdF9jb25u ZWN0b3Ioc3RydWN0IGludGVsX2RpZ2l0YWxfcG9ydCAqaW50ZWxfZGlnX3BvcnQsCj4gIAlzdHJ1 Y3QgZHJtX2RldmljZSAqZGV2ID0gaW50ZWxfZW5jb2Rlci0+YmFzZS5kZXY7Cj4gIAlzdHJ1Y3Qg ZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGRldik7Cj4gIAllbnVtIHBvcnQg cG9ydCA9IGludGVsX2RpZ19wb3J0LT5wb3J0Owo+IC0JdWludDhfdCBhbHRlcm5hdGVfZGRjX3Bp bjsKPiAgCj4gIAlEUk1fREVCVUdfS01TKCJBZGRpbmcgSERNSSBjb25uZWN0b3Igb24gcG9ydCAl Y1xuIiwKPiAgCQkgICAgICBwb3J0X25hbWUocG9ydCkpOwo+IEBAIC0xODI2LDEyICsxODY5LDEw IEBAIHZvaWQgaW50ZWxfaGRtaV9pbml0X2Nvbm5lY3RvcihzdHJ1Y3QgaW50ZWxfZGlnaXRhbF9w b3J0ICppbnRlbF9kaWdfcG9ydCwKPiAgCWNvbm5lY3Rvci0+ZG91Ymxlc2Nhbl9hbGxvd2VkID0g MDsKPiAgCWNvbm5lY3Rvci0+c3RlcmVvX2FsbG93ZWQgPSAxOwo+ICAKPiArCWludGVsX2hkbWkt PmRkY19idXMgPSBpbnRlbF9oZG1pX2RkY19waW4oZGV2X3ByaXYsIHBvcnQpOwo+ICsKPiAgCXN3 aXRjaCAocG9ydCkgewo+ICAJY2FzZSBQT1JUX0I6Cj4gLQkJaWYgKElTX0JST1hUT04oZGV2X3By aXYpKQo+IC0JCQlpbnRlbF9oZG1pLT5kZGNfYnVzID0gR01CVVNfUElOXzFfQlhUOwo+IC0JCWVs c2UKPiAtCQkJaW50ZWxfaGRtaS0+ZGRjX2J1cyA9IEdNQlVTX1BJTl9EUEI7Cj4gIAkJLyoKPiAg CQkgKiBPbiBCWFQgQTAvQTEsIHN3IG5lZWRzIHRvIGFjdGl2YXRlIERESUEgSFBEIGxvZ2ljIGFu ZAo+ICAJCSAqIGludGVycnVwdHMgdG8gY2hlY2sgdGhlIGV4dGVybmFsIHBhbmVsIGNvbm5lY3Rp b24uCj4gQEAgLTE4NDIsNDYgKzE4ODMsMTcgQEAgdm9pZCBpbnRlbF9oZG1pX2luaXRfY29ubmVj dG9yKHN0cnVjdCBpbnRlbF9kaWdpdGFsX3BvcnQgKmludGVsX2RpZ19wb3J0LAo+ICAJCQlpbnRl bF9lbmNvZGVyLT5ocGRfcGluID0gSFBEX1BPUlRfQjsKPiAgCQlicmVhazsKPiAgCWNhc2UgUE9S VF9DOgo+IC0JCWlmIChJU19CUk9YVE9OKGRldl9wcml2KSkKPiAtCQkJaW50ZWxfaGRtaS0+ZGRj X2J1cyA9IEdNQlVTX1BJTl8yX0JYVDsKPiAtCQllbHNlCj4gLQkJCWludGVsX2hkbWktPmRkY19i dXMgPSBHTUJVU19QSU5fRFBDOwo+ICAJCWludGVsX2VuY29kZXItPmhwZF9waW4gPSBIUERfUE9S VF9DOwo+ICAJCWJyZWFrOwo+ICAJY2FzZSBQT1JUX0Q6Cj4gLQkJaWYgKFdBUk5fT04oSVNfQlJP WFRPTihkZXZfcHJpdikpKQo+IC0JCQlpbnRlbF9oZG1pLT5kZGNfYnVzID0gR01CVVNfUElOX0RJ U0FCTEVEOwo+IC0JCWVsc2UgaWYgKElTX0NIRVJSWVZJRVcoZGV2X3ByaXYpKQo+IC0JCQlpbnRl bF9oZG1pLT5kZGNfYnVzID0gR01CVVNfUElOX0RQRF9DSFY7Cj4gLQkJZWxzZQo+IC0JCQlpbnRl bF9oZG1pLT5kZGNfYnVzID0gR01CVVNfUElOX0RQRDsKPiAgCQlpbnRlbF9lbmNvZGVyLT5ocGRf cGluID0gSFBEX1BPUlRfRDsKPiAgCQlicmVhazsKPiAgCWNhc2UgUE9SVF9FOgo+IC0JCS8qIE9u IFNLTCBQT1JUIEUgZG9lc24ndCBoYXZlIHNlcGVyYXRlIEdNQlVTIHBpbgo+IC0JCSAqICBXZSBy ZWx5IG9uIFZCVCB0byBzZXQgYSBwcm9wZXIgYWx0ZXJuYXRlIEdNQlVTIHBpbi4gKi8KPiAtCQlh bHRlcm5hdGVfZGRjX3BpbiA9Cj4gLQkJCWRldl9wcml2LT52YnQuZGRpX3BvcnRfaW5mb1tQT1JU X0VdLmFsdGVybmF0ZV9kZGNfcGluOwo+IC0JCXN3aXRjaCAoYWx0ZXJuYXRlX2RkY19waW4pIHsK PiAtCQljYXNlIEREQ19QSU5fQjoKPiAtCQkJaW50ZWxfaGRtaS0+ZGRjX2J1cyA9IEdNQlVTX1BJ Tl9EUEI7Cj4gLQkJCWJyZWFrOwo+IC0JCWNhc2UgRERDX1BJTl9DOgo+IC0JCQlpbnRlbF9oZG1p LT5kZGNfYnVzID0gR01CVVNfUElOX0RQQzsKPiAtCQkJYnJlYWs7Cj4gLQkJY2FzZSBERENfUElO X0Q6Cj4gLQkJCWludGVsX2hkbWktPmRkY19idXMgPSBHTUJVU19QSU5fRFBEOwo+IC0JCQlicmVh azsKPiAtCQlkZWZhdWx0Ogo+IC0JCQlNSVNTSU5HX0NBU0UoYWx0ZXJuYXRlX2RkY19waW4pOwo+ IC0JCX0KPiAgCQlpbnRlbF9lbmNvZGVyLT5ocGRfcGluID0gSFBEX1BPUlRfRTsKPiAgCQlicmVh azsKPiAtCWNhc2UgUE9SVF9BOgo+IC0JCWludGVsX2VuY29kZXItPmhwZF9waW4gPSBIUERfUE9S VF9BOwo+IC0JCS8qIEludGVybmFsIHBvcnQgb25seSBmb3IgZURQLiAqLwo+ICAJZGVmYXVsdDoK PiAtCQlCVUcoKTsKPiArCQlNSVNTSU5HX0NBU0UocG9ydCk7Cj4gKwkJcmV0dXJuOwo+ICAJfQo+ ICAKPiAgCWlmIChJU19WQUxMRVlWSUVXKGRldikgfHwgSVNfQ0hFUlJZVklFVyhkZXYpKSB7Cj4g LS0gCj4gMi43LjQKPiAKPiBfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fXwo+IEludGVsLWdmeCBtYWlsaW5nIGxpc3QKPiBJbnRlbC1nZnhAbGlzdHMuZnJlZWRl c2t0b3Aub3JnCj4gaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5m by9pbnRlbC1nZngKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3Jn Cmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4 Cg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga06.intel.com ([134.134.136.31]:44335 "EHLO mga06.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934754AbcJMSPQ (ORCPT ); Thu, 13 Oct 2016 14:15:16 -0400 Date: Thu, 13 Oct 2016 11:06:55 -0700 From: Jim Bride To: ville.syrjala@linux.intel.com Cc: intel-gfx@lists.freedesktop.org, Maarten Maathuis , stable@vger.kernel.org Subject: Re: [Intel-gfx] [PATCH 2/4] drm/i915: Respect alternate_ddc_pin for all DDI ports Message-ID: <20161013180654.GE4042@shiv> 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: <1476208368-5710-3-git-send-email-ville.syrjala@linux.intel.com> Sender: stable-owner@vger.kernel.org List-ID: On Tue, Oct 11, 2016 at 08:52:46PM +0300, ville.syrjala@linux.intel.com 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; In the code removed below there's a specific case covering Broxton that isn't accounted for here. Are we sure that we don't need that logic here? Jim > + 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 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/intel-gfx