Skip to content

Commit

Permalink
Revert "drm/i915: Warn if we run out of FIFO space for a mode"
Browse files Browse the repository at this point in the history
This reverts commit b9421ae.

This warning was so prelevant, even for apparently working machines,
that it was just causing fear, anxiety and panic.

The root cause still remains, so we will add some better debugging when
we focus on fixing it.

Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=17021
Reported-by: Maciej Rutecki <maciej.rutecki@gmail.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
  • Loading branch information
Chris Wilson committed Sep 8, 2010
1 parent 12e8ba2 commit c3add4b
Showing 1 changed file with 1 addition and 7 deletions.
8 changes: 1 addition & 7 deletions drivers/gpu/drm/i915/intel_display.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down

0 comments on commit c3add4b

Please sign in to comment.