From e62864df82f6a47c969485636b2894472f321acd Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Wed, 16 Sep 2026 10:55:50 +0200 Subject: [PATCH] drm/atomic-state-helper: Remove drm_atomic_helper_plane_reset() drm_atomic_helper_plane_reset() is no longer used: all callers now go through drm_atomic_helper_plane_create_state(). Remove it. Reviewed-by: Thomas Zimmermann Link: https://patch.msgid.link/20260916-drm-no-more-plane-reset-v5-7-f590d2003f2c@kernel.org Signed-off-by: Maxime Ripard --- drivers/gpu/drm/drm_atomic_state_helper.c | 19 ------------------- include/drm/drm_atomic_state_helper.h | 1 - include/drm/drm_plane.h | 3 --- 3 files changed, 23 deletions(-) diff --git a/drivers/gpu/drm/drm_atomic_state_helper.c b/drivers/gpu/drm/drm_atomic_state_helper.c index eb9de78c4d85..ee16f6e644f8 100644 --- a/drivers/gpu/drm/drm_atomic_state_helper.c +++ b/drivers/gpu/drm/drm_atomic_state_helper.c @@ -308,25 +308,6 @@ void __drm_atomic_helper_plane_reset(struct drm_plane *plane, } EXPORT_SYMBOL(__drm_atomic_helper_plane_reset); -/** - * drm_atomic_helper_plane_reset - default &drm_plane_funcs.reset hook for planes - * @plane: drm plane - * - * Resets the atomic state for @plane by freeing the state pointer (which might - * be NULL, e.g. at driver load time) and allocating a new empty state object. - */ -void drm_atomic_helper_plane_reset(struct drm_plane *plane) -{ - if (plane->state) - __drm_atomic_helper_plane_destroy_state(plane->state); - - kfree(plane->state); - plane->state = kzalloc_obj(*plane->state); - if (plane->state) - __drm_atomic_helper_plane_reset(plane, plane->state); -} -EXPORT_SYMBOL(drm_atomic_helper_plane_reset); - /** * drm_atomic_helper_plane_create_state - default &drm_plane_funcs.atomic_create_state hook for planes * @plane: plane object diff --git a/include/drm/drm_atomic_state_helper.h b/include/drm/drm_atomic_state_helper.h index 480eaae42f45..49acd05552a5 100644 --- a/include/drm/drm_atomic_state_helper.h +++ b/include/drm/drm_atomic_state_helper.h @@ -58,7 +58,6 @@ struct drm_plane_state * drm_atomic_helper_plane_create_state(struct drm_plane *plane); void __drm_atomic_helper_plane_reset(struct drm_plane *plane, struct drm_plane_state *state); -void drm_atomic_helper_plane_reset(struct drm_plane *plane); void __drm_atomic_helper_plane_duplicate_state(struct drm_plane *plane, struct drm_plane_state *state); struct drm_plane_state * diff --git a/include/drm/drm_plane.h b/include/drm/drm_plane.h index 2c5a5a70a71b..e757e9dbf132 100644 --- a/include/drm/drm_plane.h +++ b/include/drm/drm_plane.h @@ -365,9 +365,6 @@ struct drm_plane_funcs { * Reset plane hardware and software state to off. This function isn't * called by the core directly, only through drm_mode_config_reset(). * It's not a helper hook only for historical reasons. - * - * Atomic drivers can use drm_atomic_helper_plane_reset() to reset - * atomic state using this hook. */ void (*reset)(struct drm_plane *plane);