diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2010-07-19 21:46:08 +0100 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2010-08-01 19:47:59 -0700 |
| commit | b9421ae8f30958deea98d71477b4a77a066856b4 (patch) | |
| tree | 4339e82f376d0e92b7125e071c49a0ec9714d113 /drivers/gpu/drm/i915/intel_display.c | |
| parent | 8de9b311bcd117a97998574705829bd48bfa2971 (diff) | |
| download | linux-b9421ae8f30958deea98d71477b4a77a066856b4.tar.gz linux-b9421ae8f30958deea98d71477b4a77a066856b4.tar.bz2 linux-b9421ae8f30958deea98d71477b4a77a066856b4.zip | |
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/gpu/drm/i915/intel_display.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 8 |
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, /* 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; } |