summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorling.ma@intel.com2009-06-25 05:55:57 +0200
committerEric Anholt2009-07-07 20:49:01 +0200
commitfebc7694a55277b70cd662de05ed8a957685959c (patch)
tree4ff9f4049404d8c25571ec11b2a47e51325bd78b
parentdrm/i915: crt fetch EDID by DVI-I converter on G4x platform (diff)
downloadkernel-qcow2-linux-febc7694a55277b70cd662de05ed8a957685959c.tar.gz
kernel-qcow2-linux-febc7694a55277b70cd662de05ed8a957685959c.tar.xz
kernel-qcow2-linux-febc7694a55277b70cd662de05ed8a957685959c.zip
drm/i915: Disable VGA output when doing DRM_MODE_DPMS_OFF.
Signed-off-by: Ma Ling <ling.ma@intel.com> Signed-off-by: Eric Anholt <eric@anholt.net>
-rw-r--r--drivers/gpu/drm/i915/intel_crt.c2
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 af26028c2514..954b8599fc76 100644
--- a/drivers/gpu/drm/i915/intel_crt.c
+++ b/drivers/gpu/drm/i915/intel_crt.c
@@ -46,7 +46,7 @@ static void intel_crt_dpms(struct drm_encoder *encoder, int mode)
temp = I915_READ(reg);
temp &= ~(ADPA_HSYNC_CNTL_DISABLE | ADPA_VSYNC_CNTL_DISABLE);
- temp |= ADPA_DAC_ENABLE;
+ temp &= ~ADPA_DAC_ENABLE;
switch(mode) {
case DRM_MODE_DPMS_ON: