---

yaml --- r: 210559 b: refs/heads/master c: c3add4b h: refs/heads/master i: 210557: 9762129 210555: db3db24 210551: 0d57d2a 210543: c2f1580 210527: 00655ce 210495: 8f5fc53 210431: 45cf26c v: v3
git-mirror · Sep 8, 2010 · e66b26a · e66b26a
1 parent a20f5f8
commit e66b26a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 12e8ba25ef52f19e7a42e61aecb3c1fef83b2a82
+refs/heads/master: c3add4b63438555d5e88c5893d238ab80d1f5959
diff --git a/trunk/drivers/gpu/drm/i915/intel_display.c b/trunk/drivers/gpu/drm/i915/intel_display.c
@@ -2767,14 +2767,8 @@ static unsigned long intel_calculate_wm(unsigned long clock_in_khz,
 	/* Don't promote wm_size to unsigned... */
 	if (wm_size > (long)wm->max_wm)
 		wm_size = wm->max_wm;
-	if (wm_size <= 0) {
+	if (wm_size <= 0)
 		wm_size = wm->default_wm;
-		DRM_ERROR("Insufficient FIFO for plane, expect flickering:"
-			  " entries required = %ld, available = %lu.\n",
-			  entries_required + wm->guard_size,
-			  wm->fifo_size);
-	}
-
 	return wm_size;
 }