diff options
| author | Patrik Jakobsson <patrik.r.jakobsson@gmail.com> | 2013-03-05 14:24:48 +0100 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-03-06 18:03:07 +0100 |
| commit | f40ebd6bcbbd0d30591f42dc16be52b5086a366b (patch) | |
| tree | ce7377f66636082ae85bb686663d0c4d478dca09 /drivers/gpu | |
| parent | 60222c0c2b4d813c72296b55f07d46b19ef83e44 (diff) | |
| download | linux-3.10-f40ebd6bcbbd0d30591f42dc16be52b5086a366b.tar.gz linux-3.10-f40ebd6bcbbd0d30591f42dc16be52b5086a366b.tar.bz2 linux-3.10-f40ebd6bcbbd0d30591f42dc16be52b5086a366b.zip | |
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>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_crt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_crt.c b/drivers/gpu/drm/i915/intel_crt.c index cfc96878d74..da1f176a40b 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); } |