On Tue, 2025-02-18 at 23:19 +0200, Ville Syrjala wrote:
> From: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
>
> Add skl_wm_plane_disable_noatomic() which will clear out all
> the ddb and wm state for the plane. And let's do this _before_
> we call plane->disable_arm() so that it'll actually clear out
> the state in the hardware as well.
>
> Currently this won't do anything new for most of the
> intel_plane_disable_noatomic() calls since those are done before
> wm readout, and thus everything wm/ddb related in the state
> will still be zeroed anyway. The only difference will be for
> skl_dbuf_sanitize() is happens after wm readout. But I'll be
> reordering thigns so that wm readout happens earlier and at that
> point this will guarantee that we still clear out the old
> wm/ddb junk from the state.
>
> Signed-off-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
> ---
> drivers/gpu/drm/i915/display/intel_display.c | 2 ++
> drivers/gpu/drm/i915/display/skl_watermark.c | 22 ++++++++++++++++++++
> drivers/gpu/drm/i915/display/skl_watermark.h | 2 ++
> 3 files changed, 26 insertions(+)
>
Reviewed-by: Vinod Govindapillai <vinod.govindapillai@xxxxxxxxx>
> diff --git a/drivers/gpu/drm/i915/display/intel_display.c
> b/drivers/gpu/drm/i915/display/intel_display.c
> index 9756f52184c0..5a4953ba4d19 100644
> --- a/drivers/gpu/drm/i915/display/intel_display.c
> +++ b/drivers/gpu/drm/i915/display/intel_display.c
> @@ -678,6 +678,8 @@ void intel_plane_disable_noatomic(struct intel_crtc *crtc,
> intel_set_plane_visible(crtc_state, plane_state, false);
> intel_plane_fixup_bitmasks(crtc_state);
>
> + skl_wm_plane_disable_noatomic(crtc, plane);
> +
> if ((crtc_state->active_planes & ~BIT(PLANE_CURSOR)) == 0 &&
> hsw_ips_disable(crtc_state)) {
> crtc_state->ips_enabled = false;
> diff --git a/drivers/gpu/drm/i915/display/skl_watermark.c
> b/drivers/gpu/drm/i915/display/skl_watermark.c
> index 9584d4da13d0..da7ffcfd9478 100644
> --- a/drivers/gpu/drm/i915/display/skl_watermark.c
> +++ b/drivers/gpu/drm/i915/display/skl_watermark.c
> @@ -3867,6 +3867,28 @@ void skl_wm_crtc_disable_noatomic(struct intel_crtc *crtc)
> memset(&crtc_state->wm.skl.ddb, 0, sizeof(crtc_state->wm.skl.ddb));
> }
>
> +void skl_wm_plane_disable_noatomic(struct intel_crtc *crtc,
> + struct intel_plane *plane)
> +{
> + struct intel_display *display = to_intel_display(crtc);
> + struct intel_crtc_state *crtc_state =
> + to_intel_crtc_state(crtc->base.state);
> +
> + if (DISPLAY_VER(display) < 9)
> + return;
> +
> + skl_ddb_entry_init(&crtc_state->wm.skl.plane_ddb[plane->id], 0, 0);
> + skl_ddb_entry_init(&crtc_state->wm.skl.plane_ddb[plane->id], 0, 0);
> +
> + crtc_state->wm.skl.plane_min_ddb[plane->id] = 0;
> + crtc_state->wm.skl.plane_interim_ddb[plane->id] = 0;
> +
> + memset(&crtc_state->wm.skl.raw.planes[plane->id], 0,
> + sizeof(crtc_state->wm.skl.raw.planes[plane->id]));
> + memset(&crtc_state->wm.skl.optimal.planes[plane->id], 0,
> + sizeof(crtc_state->wm.skl.optimal.planes[plane->id]));
> +}
> +
> void intel_wm_state_verify(struct intel_atomic_state *state,
> struct intel_crtc *crtc)
> {
> diff --git a/drivers/gpu/drm/i915/display/skl_watermark.h
> b/drivers/gpu/drm/i915/display/skl_watermark.h
> index 8c07c11135c7..d9cff6c54310 100644
> --- a/drivers/gpu/drm/i915/display/skl_watermark.h
> +++ b/drivers/gpu/drm/i915/display/skl_watermark.h
> @@ -42,6 +42,8 @@ void intel_wm_state_verify(struct intel_atomic_state *state,
> struct intel_crtc *crtc);
>
> void skl_wm_crtc_disable_noatomic(struct intel_crtc *crtc);
> +void skl_wm_plane_disable_noatomic(struct intel_crtc *crtc,
> + struct intel_plane *plane);
>
> void skl_watermark_ipc_init(struct drm_i915_private *i915);
> void skl_watermark_ipc_update(struct drm_i915_private *i915);
