drm/i915/wm: Verify the correct plane DDB entry

vsyrjala · tursulin · commit a97c88a176b6 · 2026-04-14T08:04:47.000+01:00
Actually verify the DDB entry for the plane we're looking at instead of always verifying the cursor DDB. Fixes: 7d45617 ("drm/i915: Tweak plane ddb allocation tracking") Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Link: https://patch.msgid.link/20260324134843.2364-5-ville.syrjala@linux.intel.com Reviewed-by: Vinod Govindapillai <vinod.govindapillai@intel.com> (cherry picked from commit f002f7c7439de18117a31ca84dc87a59719c3dd6) Signed-off-by: Tvrtko Ursulin <tursulin@ursulin.net>
diff --git a/drivers/gpu/drm/i915/display/skl_watermark.c b/drivers/gpu/drm/i915/display/skl_watermark.c
@@ -4028,8 +4028,8 @@ void intel_wm_state_verify(struct intel_atomic_state *state,
 		}
 
 		/* DDB */
-		hw_ddb_entry = &hw->ddb[PLANE_CURSOR];
-		sw_ddb_entry = &new_crtc_state->wm.skl.plane_ddb[PLANE_CURSOR];
+		hw_ddb_entry = &hw->ddb[plane->id];
+		sw_ddb_entry = &new_crtc_state->wm.skl.plane_ddb[plane->id];
 
 		if (!skl_ddb_entry_equal(hw_ddb_entry, sw_ddb_entry)) {
 			drm_err(display->drm,

Original file line number	Diff line number	Diff line change
`@@ -4028,8 +4028,8 @@ void intel_wm_state_verify(struct intel_atomic_state *state,`
`4028`	`4028`	`}`
`4029`	`4029`
`4030`	`4030`	`/* DDB */`
`4031`		`- hw_ddb_entry = &hw->ddb[PLANE_CURSOR];`
`4032`		`- sw_ddb_entry = &new_crtc_state->wm.skl.plane_ddb[PLANE_CURSOR];`
	`4031`	`+ hw_ddb_entry = &hw->ddb[plane->id];`
	`4032`	`+ sw_ddb_entry = &new_crtc_state->wm.skl.plane_ddb[plane->id];`
`4033`	`4033`
`4034`	`4034`	`if (!skl_ddb_entry_equal(hw_ddb_entry, sw_ddb_entry)) {`
`4035`	`4035`	`drm_err(display->drm,`