diff options
| -rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index e0d1952fd3ce..7c9103030036 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c | |||
| @@ -2767,14 +2767,8 @@ static unsigned long intel_calculate_wm(unsigned long clock_in_khz, | |||
| 2767 | /* Don't promote wm_size to unsigned... */ | 2767 | /* Don't promote wm_size to unsigned... */ |
| 2768 | if (wm_size > (long)wm->max_wm) | 2768 | if (wm_size > (long)wm->max_wm) |
| 2769 | wm_size = wm->max_wm; | 2769 | wm_size = wm->max_wm; |
| 2770 | if (wm_size <= 0) { | 2770 | if (wm_size <= 0) |
| 2771 | wm_size = wm->default_wm; | 2771 | wm_size = wm->default_wm; |
| 2772 | DRM_ERROR("Insufficient FIFO for plane, expect flickering:" | ||
| 2773 | " entries required = %ld, available = %lu.\n", | ||
| 2774 | entries_required + wm->guard_size, | ||
| 2775 | wm->fifo_size); | ||
| 2776 | } | ||
| 2777 | |||
| 2778 | return wm_size; | 2772 | return wm_size; |
| 2779 | } | 2773 | } |
| 2780 | 2774 | ||
