---

yaml --- r: 360921 b: refs/heads/master c: f40ebd6 h: refs/heads/master i: 360919: d4d3a01 v: v3
git-mirror · Mar 6, 2013 · 4fa499c · 4fa499c
1 parent 516a8e2
commit 4fa499c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 60222c0c2b4d813c72296b55f07d46b19ef83e44
+refs/heads/master: f40ebd6bcbbd0d30591f42dc16be52b5086a366b
diff --git a/trunk/drivers/gpu/drm/i915/intel_crt.c b/trunk/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);
 }