>From linux 4.4.y/v4.4.92
commit 33d1fa43aad4ca11f5d01ede363c1dbdd2010540
Author: Jani Nikula <[email protected]>
AuthorDate: Thu Sep 21 17:19:20 2017 +0300
Commit: Greg Kroah-Hartman <[email protected]>
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 <[email protected]>
Reviewed-by: Ville Syrj<C3><A4>l<C3><A4> <[email protected]>
Tested-by: Daniel Drake <[email protected]>
Signed-off-by: Jani Nikula <[email protected]>
Link:
https://patchwork.freedesktop.org/patch/msgid/[email protected]
(cherry picked from commit d27ffc1d00327c29b3aa97f941b42f0949f9e99f)
Signed-off-by: Rodrigo Vivi <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
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;
