---

yaml --- r: 174519 b: refs/heads/master c: 240a2d1 h: refs/heads/master i: 174517: a6466f2 174515: 5eacfa6 174511: d38eb0e v: v3
git-mirror · Nov 5, 2009 · 575a807 · 575a807
1 parent 80eac72
commit 575a807
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: 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
@@ -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;