drm/i915: fix pipe DDI mode select

Mask the value before changing it and also select DVI when needed.

DVI was working in cases where the BIOS was setting the correct value
because we were not masking the value before changing it.

Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

1 files changed, 6 insertions, 1 deletions

diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c
index 32604ac80204..0d7acd76c1b4 100644
--- a/drivers/gpu/drm/i915/intel_ddi.c
+++ b/drivers/gpu/drm/i915/intel_ddi.c
@@ -726,13 +726,18 @@ void intel_ddi_mode_set(struct drm_encoder *encoder,
         temp = I915_READ(DDI_FUNC_CTL(pipe));
         temp &= ~PIPE_DDI_PORT_MASK;
         temp &= ~PIPE_DDI_BPC_12;
+        temp &= ~PIPE_DDI_MODE_SELECT_MASK;
         temp |= PIPE_DDI_SELECT_PORT(port) |
-                        PIPE_DDI_MODE_SELECT_HDMI |
                         ((intel_crtc->bpp > 24) ?
                                 PIPE_DDI_BPC_12 :
                                 PIPE_DDI_BPC_8) |
                         PIPE_DDI_FUNC_ENABLE;
 
+        if (intel_hdmi->has_hdmi_sink)
+                temp |= PIPE_DDI_MODE_SELECT_HDMI;
+        else
+                temp |= PIPE_DDI_MODE_SELECT_DVI;
+
         I915_WRITE(DDI_FUNC_CTL(pipe), temp);
 
         intel_hdmi->set_infoframes(encoder, adjusted_mode);