Commit 7885d205 authored Jan 12, 2012 by Jesse Barnes Committed by Keith Packard Jan 12, 2012

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>

parent a190d703

drivers/gpu/drm/i915/intel_display.c

+8 −5

Original line number	Diff line number	Diff line
		@@ -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)
		} 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;

Admin message