drm/i915: Turn off hsync and vsync on ADPA when disabling crt
authorPatrik Jakobsson <patrik.r.jakobsson@gmail.com>
Tue, 5 Mar 2013 13:24:48 +0000 (14:24 +0100)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Wed, 6 Mar 2013 17:03:07 +0000 (18:03 +0100)
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>
drivers/gpu/drm/i915/intel_crt.c

index cfc96878d74283714255802bcd4f2fe356b55a45..da1f176a40b74b6f37b27643849ac07b14ecf791 100644 (file)
@@ -88,7 +88,7 @@ static void intel_disable_crt(struct intel_encoder *encoder)
        u32 temp;
 
        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;
        I915_WRITE(crt->adpa_reg, temp);
 }