[Intel-gfx] [PATCH] drm/i915: Fix WARN_ON condition for cursor plane ddb allocation

Vandita Kulkarni vandita.kulkarni at intel.com
Fri Dec 13 15:45:15 UTC 2019


In some cases min_ddb_alloc can be U16_MAX, exclude it
from the WARN_ON.

Fixes: 10a7e07b68b9 ("drm/i915: Make sure cursor has enough ddb for the selected wm level")
Suggested-by: Ville Syrjälä <ville.syrjala at linux.intel.com>
Signed-off-by: Vandita Kulkarni <vandita.kulkarni at intel.com>
---
 drivers/gpu/drm/i915/intel_pm.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index ccbbdf4a6aab..cec4fa79422c 100644
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -4312,8 +4312,10 @@ skl_allocate_pipe_ddb(struct intel_crtc_state *crtc_state,
 				&crtc_state->wm.skl.optimal.planes[plane_id];
 
 			if (plane_id == PLANE_CURSOR) {
-				if (WARN_ON(wm->wm[level].min_ddb_alloc >
-					    total[PLANE_CURSOR])) {
+				if (wm->wm[level].min_ddb_alloc >
+				    total[PLANE_CURSOR]) {
+					WARN_ON(wm->wm[level].min_ddb_alloc !=
+						U16_MAX);
 					blocks = U32_MAX;
 					break;
 				}
-- 
2.21.0.5.gaeb582a



More information about the Intel-gfx mailing list