From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= Subject: Re: [PATCH v2] drm/i915/bios: ignore HDMI on port A Date: Thu, 21 Sep 2017 17:51:13 +0300 Message-ID: <20170921145113.GK4914@intel.com> References: <20170921131149.25872-1-jani.nikula@intel.com> <20170921141920.18172-1-jani.nikula@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 D44FD89144 for ; Thu, 21 Sep 2017 14:51:17 +0000 (UTC) Content-Disposition: inline In-Reply-To: <20170921141920.18172-1-jani.nikula@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, stable@vger.kernel.org List-Id: intel-gfx@lists.freedesktop.org T24gVGh1LCBTZXAgMjEsIDIwMTcgYXQgMDU6MTk6MjBQTSArMDMwMCwgSmFuaSBOaWt1bGEgd3Jv dGU6Cj4gVGhlIGhhcmR3YXJlIHN0YXRlIHJlYWRvdXQgb29wc2VzIGFmdGVyIHNldmVyYWwgd2Fy bmluZ3Mgd2hlbiB0cnlpbmcgdG8KPiB1c2UgSERNSSBvbiBwb3J0IEEsIGlmIHN1Y2ggYSBjb21i aW5hdGlvbiBpcyBjb25maWd1cmVkIGluIFZCVC4gRmlsdGVyCj4gdGhlIGNvbWJvIG91dCBhbHJl YWR5IGF0IHRoZSBWQlQgcGFyc2luZyBwaGFzZS4KPiAKPiB2MjogYWxzbyBpZ25vcmUgRFZJIChW aWxsZSkKPiAKPiBCdWd6aWxsYTogaHR0cHM6Ly9idWdzLmZyZWVkZXNrdG9wLm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTAyODg5Cj4gQ2M6IHN0YWJsZUB2Z2VyLmtlcm5lbC5vcmcKPiBDYzogSW1yZSBE ZWFrIDxpbXJlLmRlYWtAaW50ZWwuY29tPgo+IFNpZ25lZC1vZmYtYnk6IEphbmkgTmlrdWxhIDxq YW5pLm5pa3VsYUBpbnRlbC5jb20+Cj4gLS0tCj4gIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X2Jpb3MuYyB8IDcgKysrKysrKwo+ICAxIGZpbGUgY2hhbmdlZCwgNyBpbnNlcnRpb25zKCspCj4g Cj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Jpb3MuYyBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2Jpb3MuYwo+IGluZGV4IDU5NDk3NTBhMzVlZS4uOTc5MzFi Mjk0ZjlhIDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Jpb3MuYwo+ ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Jpb3MuYwo+IEBAIC0xMTYyLDYgKzEx NjIsMTMgQEAgc3RhdGljIHZvaWQgcGFyc2VfZGRpX3BvcnQoc3RydWN0IGRybV9pOTE1X3ByaXZh dGUgKmRldl9wcml2LCBlbnVtIHBvcnQgcG9ydCwKPiAgCWlzX2hkbWkgPSBpc19kdmkgJiYgKGNo aWxkLT5kZXZpY2VfdHlwZSAmIERFVklDRV9UWVBFX05PVF9IRE1JX09VVFBVVCkgPT0gMDsKPiAg CWlzX2VkcCA9IGlzX2RwICYmIChjaGlsZC0+ZGV2aWNlX3R5cGUgJiBERVZJQ0VfVFlQRV9JTlRF Uk5BTF9DT05ORUNUT1IpOwo+ICAKPiArCWlmIChwb3J0ID09IFBPUlRfQSAmJiBpc19kdmkpIHsK CldlIG1heSB3YW50IHRvIGRvIHRoZSBzYW1lIGZvciBQT1JUX0UuIEFsdGhvdWdoIGluIHRoYXQg Y2FzZSB3ZSB3b3VsZAphbHJlYWR5IHJlamVjdCBpdCBpbiBpbnRlbF9oZG1pX2luaXRfY29ubmVj dG9yKCkgc2luY2UgUE9SVF9FIGNhbiBoYXZlCm1heCAyIGxhbmVzIGFuZCBIRE1JIG5lZWRzIDQu IEJ1dCBsb29rcyBsaWtlIHRoYXQgd291bGQgcmVzdWx0IGluIGEgV0FSTi4KR2l2ZW4gdGhhdCB3 ZSd2ZSBub3cgc2VlbiBhIGJvZ3VzIFZCVCBmb3IgcG9ydCBBIEkgd291bGRuJ3QgcHV0IGl0IHBh c3QKdGhlbSB0byBjb29rIG9uZSB1cCBmb3IgcG9ydCBFIGFzIHdlbGwuCgpFaXRoZXIgd2F5ClJl dmlld2VkLWJ5OiBWaWxsZSBTeXJqw6Rsw6QgPHZpbGxlLnN5cmphbGFAbGludXguaW50ZWwuY29t PgoKPiArCQlEUk1fREVCVUdfS01TKCJWQlQgY2xhaW1zIHBvcnQgQSBzdXBwb3J0cyBEVkklcywg aWdub3JpbmdcbiIsCj4gKwkJCSAgICAgIGlzX2hkbWkgPyAiL0hETUkiIDogIiIpOwo+ICsJCWlz X2R2aSA9IGZhbHNlOwo+ICsJCWlzX2hkbWkgPSBmYWxzZTsKPiArCX0KPiArCj4gIAlpbmZvLT5z dXBwb3J0c19kdmkgPSBpc19kdmk7Cj4gIAlpbmZvLT5zdXBwb3J0c19oZG1pID0gaXNfaGRtaTsK PiAgCWluZm8tPnN1cHBvcnRzX2RwID0gaXNfZHA7Cj4gLS0gCj4gMi4xMS4wCj4gCj4gX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KPiBJbnRlbC1nZnggbWFp bGluZyBsaXN0Cj4gSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwo+IGh0dHBzOi8vbGlz dHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4CgotLSAKVmlsbGUg U3lyasOkbMOkCkludGVsIE9UQwpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVz a3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9p bnRlbC1nZngK From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga04.intel.com ([192.55.52.120]:18978 "EHLO mga04.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751754AbdIUOvR (ORCPT ); Thu, 21 Sep 2017 10:51:17 -0400 Date: Thu, 21 Sep 2017 17:51:13 +0300 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= To: Jani Nikula Cc: intel-gfx@lists.freedesktop.org, stable@vger.kernel.org Subject: Re: [Intel-gfx] [PATCH v2] drm/i915/bios: ignore HDMI on port A Message-ID: <20170921145113.GK4914@intel.com> References: <20170921131149.25872-1-jani.nikula@intel.com> <20170921141920.18172-1-jani.nikula@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20170921141920.18172-1-jani.nikula@intel.com> Sender: stable-owner@vger.kernel.org List-ID: On Thu, Sep 21, 2017 at 05:19:20PM +0300, Jani Nikula wrote: > The hardware state readout oopses after several warnings when trying to > use HDMI on port A, if such a combination is configured in VBT. Filter > the combo out already at the VBT parsing phase. > > v2: also ignore DVI (Ville) > > Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=102889 > Cc: stable@vger.kernel.org > Cc: Imre Deak > Signed-off-by: Jani Nikula > --- > drivers/gpu/drm/i915/intel_bios.c | 7 +++++++ > 1 file changed, 7 insertions(+) > > diff --git a/drivers/gpu/drm/i915/intel_bios.c b/drivers/gpu/drm/i915/intel_bios.c > index 5949750a35ee..97931b294f9a 100644 > --- a/drivers/gpu/drm/i915/intel_bios.c > +++ b/drivers/gpu/drm/i915/intel_bios.c > @@ -1162,6 +1162,13 @@ static void parse_ddi_port(struct drm_i915_private *dev_priv, enum port port, > is_hdmi = is_dvi && (child->device_type & DEVICE_TYPE_NOT_HDMI_OUTPUT) == 0; > is_edp = is_dp && (child->device_type & DEVICE_TYPE_INTERNAL_CONNECTOR); > > + if (port == PORT_A && is_dvi) { We may want to do the same for PORT_E. Although in that case we would already reject it in intel_hdmi_init_connector() since PORT_E can have max 2 lanes and HDMI needs 4. But looks like that would result in a WARN. Given that we've now seen a bogus VBT for port A I wouldn't put it past them to cook one up for port E as well. Either way Reviewed-by: Ville Syrj�l� > + DRM_DEBUG_KMS("VBT claims port A supports DVI%s, ignoring\n", > + is_hdmi ? "/HDMI" : ""); > + is_dvi = false; > + is_hdmi = false; > + } > + > info->supports_dvi = is_dvi; > info->supports_hdmi = is_hdmi; > info->supports_dp = is_dp; > -- > 2.11.0 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Ville Syrj�l� Intel OTC