From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jani Nikula Subject: Re: [PATCH v2] drm/i915/bios: ignore HDMI on port A Date: Mon, 25 Sep 2017 10:50:44 +0300 Message-ID: <87k20n5i97.fsf@nikula.org> References: <20170921131149.25872-1-jani.nikula@intel.com> <20170921141920.18172-1-jani.nikula@intel.com> <20170921145113.GK4914@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by gabe.freedesktop.org (Postfix) with ESMTPS id DE36D6E270 for ; Mon, 25 Sep 2017 07:51:12 +0000 (UTC) In-Reply-To: <20170921145113.GK4914@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 =?utf-8?B?U3lyasOkbMOk?= Cc: intel-gfx@lists.freedesktop.org, stable@vger.kernel.org List-Id: intel-gfx@lists.freedesktop.org T24gVGh1LCAyMSBTZXAgMjAxNywgVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4 LmludGVsLmNvbT4gd3JvdGU6Cj4gT24gVGh1LCBTZXAgMjEsIDIwMTcgYXQgMDU6MTk6MjBQTSAr MDMwMCwgSmFuaSBOaWt1bGEgd3JvdGU6Cj4+IFRoZSBoYXJkd2FyZSBzdGF0ZSByZWFkb3V0IG9v cHNlcyBhZnRlciBzZXZlcmFsIHdhcm5pbmdzIHdoZW4gdHJ5aW5nIHRvCj4+IHVzZSBIRE1JIG9u IHBvcnQgQSwgaWYgc3VjaCBhIGNvbWJpbmF0aW9uIGlzIGNvbmZpZ3VyZWQgaW4gVkJULiBGaWx0 ZXIKPj4gdGhlIGNvbWJvIG91dCBhbHJlYWR5IGF0IHRoZSBWQlQgcGFyc2luZyBwaGFzZS4KPj4g Cj4+IHYyOiBhbHNvIGlnbm9yZSBEVkkgKFZpbGxlKQo+PiAKPj4gQnVnemlsbGE6IGh0dHBzOi8v YnVncy5mcmVlZGVza3RvcC5vcmcvc2hvd19idWcuY2dpP2lkPTEwMjg4OQo+PiBDYzogc3RhYmxl QHZnZXIua2VybmVsLm9yZwo+PiBDYzogSW1yZSBEZWFrIDxpbXJlLmRlYWtAaW50ZWwuY29tPgo+ PiBTaWduZWQtb2ZmLWJ5OiBKYW5pIE5pa3VsYSA8amFuaS5uaWt1bGFAaW50ZWwuY29tPgo+PiAt LS0KPj4gIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Jpb3MuYyB8IDcgKysrKysrKwo+PiAg MSBmaWxlIGNoYW5nZWQsIDcgaW5zZXJ0aW9ucygrKQo+PiAKPj4gZGlmZiAtLWdpdCBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2Jpb3MuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X2Jpb3MuYwo+PiBpbmRleCA1OTQ5NzUwYTM1ZWUuLjk3OTMxYjI5NGY5YSAxMDA2NDQKPj4gLS0t IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfYmlvcy5jCj4+ICsrKyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2Jpb3MuYwo+PiBAQCAtMTE2Miw2ICsxMTYyLDEzIEBAIHN0YXRpYyB2 b2lkIHBhcnNlX2RkaV9wb3J0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwgZW51 bSBwb3J0IHBvcnQsCj4+ICAJaXNfaGRtaSA9IGlzX2R2aSAmJiAoY2hpbGQtPmRldmljZV90eXBl ICYgREVWSUNFX1RZUEVfTk9UX0hETUlfT1VUUFVUKSA9PSAwOwo+PiAgCWlzX2VkcCA9IGlzX2Rw ICYmIChjaGlsZC0+ZGV2aWNlX3R5cGUgJiBERVZJQ0VfVFlQRV9JTlRFUk5BTF9DT05ORUNUT1Ip Owo+PiAgCj4+ICsJaWYgKHBvcnQgPT0gUE9SVF9BICYmIGlzX2R2aSkgewo+Cj4gV2UgbWF5IHdh bnQgdG8gZG8gdGhlIHNhbWUgZm9yIFBPUlRfRS4gQWx0aG91Z2ggaW4gdGhhdCBjYXNlIHdlIHdv dWxkCj4gYWxyZWFkeSByZWplY3QgaXQgaW4gaW50ZWxfaGRtaV9pbml0X2Nvbm5lY3RvcigpIHNp bmNlIFBPUlRfRSBjYW4gaGF2ZQo+IG1heCAyIGxhbmVzIGFuZCBIRE1JIG5lZWRzIDQuIEJ1dCBs b29rcyBsaWtlIHRoYXQgd291bGQgcmVzdWx0IGluIGEgV0FSTi4KPiBHaXZlbiB0aGF0IHdlJ3Zl IG5vdyBzZWVuIGEgYm9ndXMgVkJUIGZvciBwb3J0IEEgSSB3b3VsZG4ndCBwdXQgaXQgcGFzdAo+ IHRoZW0gdG8gY29vayBvbmUgdXAgZm9yIHBvcnQgRSBhcyB3ZWxsLgo+Cj4gRWl0aGVyIHdheQo+ IFJldmlld2VkLWJ5OiBWaWxsZSBTeXJqw6Rsw6QgPHZpbGxlLnN5cmphbGFAbGludXguaW50ZWwu Y29tPgoKUHVzaGVkIHRvIGRpbnEgd2l0aCBUZXN0ZWQtYnkgZnJvbSB0aGUgYnVnLCB0aGFua3Mg Zm9yIHRoZSByZXZpZXcuCgpCUiwKSmFuaS4KCgo+Cj4+ICsJCURSTV9ERUJVR19LTVMoIlZCVCBj bGFpbXMgcG9ydCBBIHN1cHBvcnRzIERWSSVzLCBpZ25vcmluZ1xuIiwKPj4gKwkJCSAgICAgIGlz X2hkbWkgPyAiL0hETUkiIDogIiIpOwo+PiArCQlpc19kdmkgPSBmYWxzZTsKPj4gKwkJaXNfaGRt aSA9IGZhbHNlOwo+PiArCX0KPj4gKwo+PiAgCWluZm8tPnN1cHBvcnRzX2R2aSA9IGlzX2R2aTsK Pj4gIAlpbmZvLT5zdXBwb3J0c19oZG1pID0gaXNfaGRtaTsKPj4gIAlpbmZvLT5zdXBwb3J0c19k cCA9IGlzX2RwOwo+PiAtLSAKPj4gMi4xMS4wCj4+IAo+PiBfX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fXwo+PiBJbnRlbC1nZnggbWFpbGluZyBsaXN0Cj4+IElu dGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKPj4gaHR0cHM6Ly9saXN0cy5mcmVlZGVza3Rv cC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngKCi0tIApKYW5pIE5pa3VsYSwgSW50ZWwg T3BlbiBTb3VyY2UgVGVjaG5vbG9neSBDZW50ZXIKX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlz dHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4v bGlzdGluZm8vaW50ZWwtZ2Z4Cg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga05.intel.com ([192.55.52.43]:21678 "EHLO mga05.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933447AbdIYHvM (ORCPT ); Mon, 25 Sep 2017 03:51:12 -0400 From: Jani Nikula To: Ville =?utf-8?B?U3lyasOkbMOk?= Cc: intel-gfx@lists.freedesktop.org, stable@vger.kernel.org Subject: Re: [Intel-gfx] [PATCH v2] drm/i915/bios: ignore HDMI on port A In-Reply-To: <20170921145113.GK4914@intel.com> References: <20170921131149.25872-1-jani.nikula@intel.com> <20170921141920.18172-1-jani.nikula@intel.com> <20170921145113.GK4914@intel.com> Date: Mon, 25 Sep 2017 10:50:44 +0300 Message-ID: <87k20n5i97.fsf@nikula.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8BIT Sender: stable-owner@vger.kernel.org List-ID: On Thu, 21 Sep 2017, Ville Syrjälä wrote: > 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ä Pushed to dinq with Tested-by from the bug, thanks for the review. BR, Jani. > >> + 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 -- Jani Nikula, Intel Open Source Technology Center