diff options
| author | Jesse Barnes | 2012-01-12 23:51:17 +0100 |
|---|---|---|
| committer | Keith Packard | 2012-01-13 06:36:38 +0100 |
| commit | 7885d2052bd94395e337709cfba093a41f273ff1 (patch) | |
| tree | 1bbfc9465d5573198cca8214f14415d5a8371c33 /drivers/gpu | |
| parent | Merge branch 'drm-intel-next-fixes' into drm-intel-fixes (diff) | |
| download | kernel-qcow2-linux-7885d2052bd94395e337709cfba093a41f273ff1.tar.gz kernel-qcow2-linux-7885d2052bd94395e337709cfba093a41f273ff1.tar.xz kernel-qcow2-linux-7885d2052bd94395e337709cfba093a41f273ff1.zip | |
drm/i915: mask transcoder select bits before setting them on LVDS
The transcoder port may changed from mode set to mode set, so make sure
to mask out the selection bits before setting the right ones or we'll
get black screens when going from transcoder B to A.
Tested-by: Vincent Vanackere <vincent.vanackere@gmail.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 2a3f707caab8..96cea08b10ce 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -5808,12 +5808,15 @@ static int ironlake_crtc_mode_set(struct drm_crtc *crtc, if (is_lvds) { temp = I915_READ(PCH_LVDS); temp |= LVDS_PORT_EN | LVDS_A0A2_CLKA_POWER_UP; - if (HAS_PCH_CPT(dev)) + if (HAS_PCH_CPT(dev)) { + temp &= ~PORT_TRANS_SEL_MASK; temp |= PORT_TRANS_SEL_CPT(pipe); - else if (pipe == 1) - temp |= LVDS_PIPEB_SELECT; - else - temp &= ~LVDS_PIPEB_SELECT; + } else { + if (pipe == 1) + temp |= LVDS_PIPEB_SELECT; + else + temp &= ~LVDS_PIPEB_SELECT; + } /* set the corresponsding LVDS_BORDER bit */ temp |= dev_priv->lvds_border_bits; |