瀏覽代碼

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>
Chris Wilson 14 年之前
父節點
當前提交
c3add4b634
共有 1 個文件被更改,包括 1 次插入7 次删除
  1. 1 7
      drivers/gpu/drm/i915/intel_display.c

+ 1 - 7
drivers/gpu/drm/i915/intel_display.c

@@ -2767,14 +2767,8 @@ static unsigned long intel_calculate_wm(unsigned long clock_in_khz,
 	/* Don't promote wm_size to unsigned... */
 	/* Don't promote wm_size to unsigned... */
 	if (wm_size > (long)wm->max_wm)
 	if (wm_size > (long)wm->max_wm)
 		wm_size = wm->max_wm;
 		wm_size = wm->max_wm;
-	if (wm_size <= 0) {
+	if (wm_size <= 0)
 		wm_size = wm->default_wm;
 		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;
 	return wm_size;
 }
 }