From: Patrik Jakobsson Date: Tue, 5 Mar 2013 13:24:48 +0000 (+0100) Subject: drm/i915: Turn off hsync and vsync on ADPA when disabling crt X-Git-Tag: v3.8.3~47 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=aaf4a8519e2582203e6de1f2e2b21954c68dca7a;p=users%2Fjedix%2Flinux-maple.git drm/i915: Turn off hsync and vsync on ADPA when disabling crt commit f40ebd6bcbbd0d30591f42dc16be52b5086a366b upstream. 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 Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=56359 Tested-by: max Signed-off-by: Daniel Vetter Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/gpu/drm/i915/intel_crt.c b/drivers/gpu/drm/i915/intel_crt.c index 06b17865ed94..b52ed095a746 100644 --- a/drivers/gpu/drm/i915/intel_crt.c +++ b/drivers/gpu/drm/i915/intel_crt.c @@ -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); }