---

yaml --- r: 358081 b: refs/heads/master c: 209d521 h: refs/heads/master i: 358079: 61f88f7 v: v3
git-mirror · Jan 31, 2013 · 3efac7c · 3efac7c
1 parent c77c6a6
commit 3efac7c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fe31b574fb2563f3aaa24dec302ddd0a033cda0f
+refs/heads/master: 209d52110a32c2069b5d870504e73fdb0e30fc51
diff --git a/trunk/drivers/gpu/drm/i915/intel_display.c b/trunk/drivers/gpu/drm/i915/intel_display.c
@@ -8936,8 +8936,7 @@ void i915_redisable_vga(struct drm_device *dev)
 
 	if (I915_READ(vga_reg) != VGA_DISP_DISABLE) {
 		DRM_DEBUG_KMS("Something enabled VGA plane, disabling it\n");
-		I915_WRITE(vga_reg, VGA_DISP_DISABLE);
-		POSTING_READ(vga_reg);
+		i915_disable_vga(dev);
 	}
 }