aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2009-09-15 16:57:35 -0400
committerEric Anholt <eric@anholt.net>2009-11-05 17:47:08 -0500
commit240a2d12dfff98f8fa1332dc8424284d96f0801e (patch)
treec23dd5a5abccb91a1fc13ab72edba37a78d22b9b /drivers/gpu/drm/i915
parent02e792fbaadb75dec8e476a05b610e49908fc6a4 (diff)
drm/i915: fully switch off overlay when not in use
Now that the cache flushing of the memory based overlay regs works, we can safely switch off the overlay. Beforehand it was only disabled (like in userspace). Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> Signed-off-by: Eric Anholt <eric@anholt.net>
Diffstat (limited to 'drivers/gpu/drm/i915')
-rw-r--r--drivers/gpu/drm/i915/intel_overlay.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/intel_overlay.c b/drivers/gpu/drm/i915/intel_overlay.c
index 3f6f3a36929f..4e88abb423b0 100644
--- a/drivers/gpu/drm/i915/intel_overlay.c
+++ b/drivers/gpu/drm/i915/intel_overlay.c
@@ -323,7 +323,6 @@ static int intel_overlay_off(struct intel_overlay *overlay)
323 } 323 }
324 324
325 /* turn overlay off */ 325 /* turn overlay off */
326 /* this is not done in userspace!
327 BEGIN_LP_RING(6); 326 BEGIN_LP_RING(6);
328 OUT_RING(MI_FLUSH); 327 OUT_RING(MI_FLUSH);
329 OUT_RING(MI_NOOP); 328 OUT_RING(MI_NOOP);
@@ -338,7 +337,7 @@ static int intel_overlay_off(struct intel_overlay *overlay)
338 DRM_ERROR("intel overlay: ring sync failed, hw likely wedged\n"); 337 DRM_ERROR("intel overlay: ring sync failed, hw likely wedged\n");
339 overlay->hw_wedged = 1; 338 overlay->hw_wedged = 1;
340 return ret; 339 return ret;
341 }*/ 340 }
342 341
343 overlay->active = 0; 342 overlay->active = 0;
344 343