drm/i915: Clear the LVDS pipe B select bit when moving the LVDS to pipe A.

Based on a patch by Zhao Yakui.

Signed-off-by: Eric Anholt <eric@anholt.net>

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index eb4a265861ec0bb8f9c6e816eb1d44380c3228af..9b59979729c492a123990990b4337b62f0508e7e 100644 (file)
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -3306,6 +3306,8 @@ static int intel_crtc_mode_set(struct drm_crtc *crtc,
                lvds |= LVDS_PORT_EN | LVDS_A0A2_CLKA_POWER_UP;
                if (pipe == 1)
                        lvds |= LVDS_PIPEB_SELECT;
+               else
+                       lvds &= ~LVDS_PIPEB_SELECT;
                /* set the corresponsding LVDS_BORDER bit */
                lvds |= dev_priv->lvds_border_bits;
                /* Set the B0-B3 data pairs corresponding to whether we're going to