From 575a807c1918f7d57202d128196c996d41507d3e Mon Sep 17 00:00:00 2001
From: Daniel Vetter <daniel.vetter@ffwll.ch>
Date: Tue, 15 Sep 2009 22:57:35 +0200
Subject: [PATCH] --- yaml --- r: 174519 b: refs/heads/master c:
 240a2d12dfff98f8fa1332dc8424284d96f0801e h: refs/heads/master i:   174517:
 a6466f2d839cb8bccba0b8ef5373364bafaa1762   174515:
 5eacfa674c140c8d59221842e8f740ba0cb04fdc   174511:
 d38eb0e547c7604895a0638752733afc389cc7fd v: v3

---
 [refs]                                     | 2 +-
 trunk/drivers/gpu/drm/i915/intel_overlay.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 7f24fd59dca0..948a83e9cdaa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 02e792fbaadb75dec8e476a05b610e49908fc6a4
+refs/heads/master: 240a2d12dfff98f8fa1332dc8424284d96f0801e
diff --git a/trunk/drivers/gpu/drm/i915/intel_overlay.c b/trunk/drivers/gpu/drm/i915/intel_overlay.c
index 3f6f3a36929f..4e88abb423b0 100644
--- a/trunk/drivers/gpu/drm/i915/intel_overlay.c
+++ b/trunk/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;