diff options
| author | Eric Anholt <eric@anholt.net> | 2010-04-09 17:18:55 -0400 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2010-04-12 12:23:36 -0400 |
| commit | d275f6614e160fa71d6e2201eb34c9b41fd8473c (patch) | |
| tree | 9c9b53ecaf921b23544cddd58cfe117280b0de64 | |
| parent | 0f3ee801b332d6ff22285386675fe5aaedf035c3 (diff) | |
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>
| -rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index eb4a265861ec..9b59979729c4 100644 --- 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, | |||
| 3306 | lvds |= LVDS_PORT_EN | LVDS_A0A2_CLKA_POWER_UP; | 3306 | lvds |= LVDS_PORT_EN | LVDS_A0A2_CLKA_POWER_UP; |
| 3307 | if (pipe == 1) | 3307 | if (pipe == 1) |
| 3308 | lvds |= LVDS_PIPEB_SELECT; | 3308 | lvds |= LVDS_PIPEB_SELECT; |
| 3309 | else | ||
| 3310 | lvds &= ~LVDS_PIPEB_SELECT; | ||
| 3309 | /* set the corresponsding LVDS_BORDER bit */ | 3311 | /* set the corresponsding LVDS_BORDER bit */ |
| 3310 | lvds |= dev_priv->lvds_border_bits; | 3312 | lvds |= dev_priv->lvds_border_bits; |
| 3311 | /* Set the B0-B3 data pairs corresponding to whether we're going to | 3313 | /* Set the B0-B3 data pairs corresponding to whether we're going to |