From e66b26a1ac62214576ed1da4493f359c4853af40 Mon Sep 17 00:00:00 2001
From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Wed, 8 Sep 2010 09:14:08 +0100
Subject: [PATCH] --- yaml --- r: 210559 b: refs/heads/master c:
 c3add4b63438555d5e88c5893d238ab80d1f5959 h: refs/heads/master i:   210557:
 976212928137716cc93916a03114449ae9c3c0a6   210555:
 db3db24ac146f13089f7e466f65c23dd57e44b04   210551:
 0d57d2acbe11324688c4801f52703d4c0bb2cfb8   210543:
 c2f1580307056e31e9f65b472157575ebd64c565   210527:
 00655ce3037bc1a8bce1387a63a01180f18cdafc   210495:
 8f5fc534f3aa0a7f35d24ad4c2e1ae8fdfa39203   210431:
 45cf26c7e63351cc7e6022d4b8bfd9a293f3eb88 v: v3

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

diff --git a/[refs] b/[refs]
index 8e6144a197ea..f7b2b03566ae 100644
--- 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
index e0d1952fd3ce..7c9103030036 100644
--- 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;
 }