aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2010-07-19 16:46:08 -0400
committerEric Anholt <eric@anholt.net>2010-08-01 22:47:59 -0400
commitb9421ae8f30958deea98d71477b4a77a066856b4 (patch)
tree4339e82f376d0e92b7125e071c49a0ec9714d113 /drivers
parent8de9b311bcd117a97998574705829bd48bfa2971 (diff)
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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpu/drm/i915/intel_display.c8
1 files changed, 7 insertions, 1 deletions
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,
2745 /* Don't promote wm_size to unsigned... */ 2745 /* Don't promote wm_size to unsigned... */
2746 if (wm_size > (long)wm->max_wm) 2746 if (wm_size > (long)wm->max_wm)
2747 wm_size = wm->max_wm; 2747 wm_size = wm->max_wm;
2748 if (wm_size <= 0) 2748 if (wm_size <= 0) {
2749 wm_size = wm->default_wm; 2749 wm_size = wm->default_wm;
2750 DRM_ERROR("Insufficient FIFO for plane, expect flickering:"
2751 " entries required = %ld, available = %lu.\n",
2752 entries_required + wm->guard_size,
2753 wm->fifo_size);
2754 }
2755
2750 return wm_size; 2756 return wm_size;
2751} 2757}
2752 2758