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