Commit f40ebd6b authored Mar 05, 2013 by Patrik Jakobsson Committed by Daniel Vetter Mar 06, 2013

drm/i915: Turn off hsync and vsync on ADPA when disabling crt



According to PRM we need to disable hsync and vsync even though ADPA is
disabled. The previous code did infact do the opposite so we fix it.

Signed-off-by: Patrik Jakobsson <patrik.r.jakobsson@gmail.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=56359


Tested-by: max <manikulin@gmail.com>
Cc: stable@vger.kernel.org
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

parent 60222c0c

drivers/gpu/drm/i915/intel_crt.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -88,7 +88,7 @@ static void intel_disable_crt(struct intel_encoder *encoder)
	u32 temp;		u32 temp;

	temp = I915_READ(crt->adpa_reg);		temp = I915_READ(crt->adpa_reg);
	temp &= ~(ADPA_HSYNC_CNTL_DISABLE \| ADPA_VSYNC_CNTL_DISABLE);		temp \|= ADPA_HSYNC_CNTL_DISABLE \| ADPA_VSYNC_CNTL_DISABLE;
	temp &= ~ADPA_DAC_ENABLE;		temp &= ~ADPA_DAC_ENABLE;
	I915_WRITE(crt->adpa_reg, temp);		I915_WRITE(crt->adpa_reg, temp);
	}		}