From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Mon, 19 Jul 2010 20:46:08 +0000 (+0100)
Subject: drm/i915: Warn if we run out of FIFO space for a mode
X-Git-Tag: MMI-PSA29.97-13-9~22422^2~70^2~7
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=b9421ae8f30958deea98d71477b4a77a066856b4;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

drm/i915: Warn if we run out of FIFO space for a mode

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Eric Anholt <eric@anholt.net>
---

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index baaaeaac7f21..132314e2bf21 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -2745,8 +2745,14 @@ 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;
 }