From 86ce894b1a09a7a5cc97de15b43ed0414bdffdce Mon Sep 17 00:00:00 2001 From: "ling.ma@intel.com" Date: Thu, 25 Jun 2009 11:55:57 +0800 Subject: [PATCH] --- yaml --- r: 155259 b: refs/heads/master c: febc7694a55277b70cd662de05ed8a957685959c h: refs/heads/master i: 155257: 1a58c0ae4d3b223429e7281d8ae600891e3620e2 155255: 87b2394d05f6d2f8a72daca557857e1dadcabfbb v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/i915/intel_crt.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index b4586569bcdc..b2210053d7c6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8e4d36b993898b344f9176147f1dfeca583f81fd +refs/heads/master: febc7694a55277b70cd662de05ed8a957685959c diff --git a/trunk/drivers/gpu/drm/i915/intel_crt.c b/trunk/drivers/gpu/drm/i915/intel_crt.c index af26028c2514..954b8599fc76 100644 --- a/trunk/drivers/gpu/drm/i915/intel_crt.c +++ b/trunk/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: