summaryrefslogtreecommitdiff
path: root/drivers/gpu/drm
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2009-09-15 20:57:35 (GMT)
committerEric Anholt <eric@anholt.net>2009-11-05 22:47:08 (GMT)
commit240a2d12dfff98f8fa1332dc8424284d96f0801e (patch)
treec23dd5a5abccb91a1fc13ab72edba37a78d22b9b /drivers/gpu/drm
parent02e792fbaadb75dec8e476a05b610e49908fc6a4 (diff)
downloadlinux-240a2d12dfff98f8fa1332dc8424284d96f0801e.tar.xz
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')
-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 3f6f3a3..4e88abb 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)
}
/* turn overlay off */
- /* this is not done in userspace!
BEGIN_LP_RING(6);
OUT_RING(MI_FLUSH);
OUT_RING(MI_NOOP);
@@ -338,7 +337,7 @@ static int intel_overlay_off(struct intel_overlay *overlay)
DRM_ERROR("intel overlay: ring sync failed, hw likely wedged\n");
overlay->hw_wedged = 1;
return ret;
- }*/
+ }
overlay->active = 0;