---

yaml --- r: 228781 b: refs/heads/master c: f7746f0 h: refs/heads/master i: 228779: 176fdc0 v: v3
git-mirror · Dec 5, 2010 · 693804c · 693804c
1 parent 942edad
commit 693804c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1ec14ad3132702694f2e1a90b30641cf111183b9
+refs/heads/master: f7746f0e1f271fbc64b57c29873c47f73e28e5a0
diff --git a/trunk/drivers/gpu/drm/i915/intel_display.c b/trunk/drivers/gpu/drm/i915/intel_display.c
@@ -3456,7 +3456,7 @@ static void ironlake_update_wm(struct drm_device *dev,
 	 * display plane is used.
 	 */
 	tmp = 0;
-	if (enabled == 1 && /* XXX disabled due to buggy implmentation? */ 0) {
+	if (enabled == 1) {
 		unsigned long line_time_us;
 		int small, large, plane_fbc;
 		int sr_clock, entries;