> Date: Sat, 14 Oct 2017 13:17:33 +1100 > From: Jonathan Gray <j...@jsg.id.au> > > >From linux 4.4.y/v4.4.92
Sure. > > commit 33d1fa43aad4ca11f5d01ede363c1dbdd2010540 > Author: Jani Nikula <jani.nik...@intel.com> > AuthorDate: Thu Sep 21 17:19:20 2017 +0300 > Commit: Greg Kroah-Hartman <gre...@linuxfoundation.org> > CommitDate: Thu Oct 12 11:27:35 2017 +0200 > > drm/i915/bios: ignore HDMI on port A > > commit 2ba7d7e0437127314864238f8bfcb8369d81075c upstream. > > 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: Imre Deak <imre.d...@intel.com> > Reviewed-by: Ville Syrj<C3><A4>l<C3><A4> <ville.syrj...@linux.intel.com> > Tested-by: Daniel Drake <d...@reactivated.net> > Signed-off-by: Jani Nikula <jani.nik...@intel.com> > Link: > https://patchwork.freedesktop.org/patch/msgid/20170921141920.18172-1-jani.nik...@intel.com > (cherry picked from commit d27ffc1d00327c29b3aa97f941b42f0949f9e99f) > Signed-off-by: Rodrigo Vivi <rodrigo.v...@intel.com> > Signed-off-by: Greg Kroah-Hartman <gre...@linuxfoundation.org> > > drivers/gpu/drm/i915/intel_bios.c | 7 +++++++ > 1 file changed, 7 insertions(+) > > Index: intel_bios.c > =================================================================== > RCS file: /cvs/src/sys/dev/pci/drm/i915/intel_bios.c,v > retrieving revision 1.13 > diff -u -p -r1.13 intel_bios.c > --- intel_bios.c 2 Jul 2017 20:58:55 -0000 1.13 > +++ intel_bios.c 14 Oct 2017 02:00:30 -0000 > @@ -963,6 +963,13 @@ static void parse_ddi_port(struct drm_i9 > is_hdmi = is_dvi && (child->common.device_type & > DEVICE_TYPE_NOT_HDMI_OUTPUT) == 0; > is_edp = is_dp && (child->common.device_type & > DEVICE_TYPE_INTERNAL_CONNECTOR); > > + if (port == PORT_A && is_dvi) { > + 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; > >
