Skip to content

Commit 33d1fa4

Browse files
jnikulagregkh
authored andcommitted
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.deak@intel.com> Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Tested-by: Daniel Drake <dan@reactivated.net> Signed-off-by: Jani Nikula <jani.nikula@intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20170921141920.18172-1-jani.nikula@intel.com (cherry picked from commit d27ffc1d00327c29b3aa97f941b42f0949f9e99f) Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent b8af446 commit 33d1fa4

1 file changed

Lines changed: 7 additions & 0 deletions

File tree

drivers/gpu/drm/i915/intel_bios.c

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -957,6 +957,13 @@ static void parse_ddi_port(struct drm_i915_private *dev_priv, enum port port,
957957
is_hdmi = is_dvi && (child->common.device_type & DEVICE_TYPE_NOT_HDMI_OUTPUT) == 0;
958958
is_edp = is_dp && (child->common.device_type & DEVICE_TYPE_INTERNAL_CONNECTOR);
959959

960+
if (port == PORT_A && is_dvi) {
961+
DRM_DEBUG_KMS("VBT claims port A supports DVI%s, ignoring\n",
962+
is_hdmi ? "/HDMI" : "");
963+
is_dvi = false;
964+
is_hdmi = false;
965+
}
966+
960967
info->supports_dvi = is_dvi;
961968
info->supports_hdmi = is_hdmi;
962969
info->supports_dp = is_dp;

0 commit comments

Comments
 (0)