aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2010-09-08 04:14:08 -0400
committerChris Wilson <chris@chris-wilson.co.uk>2010-09-08 04:22:52 -0400
commitc3add4b63438555d5e88c5893d238ab80d1f5959 (patch)
tree94b0802d55c77870e4c73c730cd97ca17904e76c /drivers/gpu
parent12e8ba25ef52f19e7a42e61aecb3c1fef83b2a82 (diff)
Revert "drm/i915: Warn if we run out of FIFO space for a mode"
This reverts commit b9421ae8f30958deea98d71477b4a77a066856b4. 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>
Diffstat (limited to 'drivers/gpu')
-rw-r--r--drivers/gpu/drm/i915/intel_display.c8
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 e0d1952fd3c..7c910303003 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