From 18216d5fa8dc29c76c4d3944282d990ebc41514c Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Wed, 16 Sep 2026 10:55:51 +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_state_init(). Remove it. Reviewed-by: Thomas Zimmermann Link: https://patch.msgid.link/20260916-drm-no-more-plane-reset-v5-8-f590d2003f2c@kernel.org Signed-off-by: Maxime Ripard --- drivers/gpu/drm/drm_atomic_state_helper.c | 22 ---------------------- include/drm/drm_atomic_state_helper.h | 2 -- 2 files changed, 24 deletions(-) diff --git a/drivers/gpu/drm/drm_atomic_state_helper.c b/drivers/gpu/drm/drm_atomic_state_helper.c index ee16f6e644f8..406157a3660f 100644 --- a/drivers/gpu/drm/drm_atomic_state_helper.c +++ b/drivers/gpu/drm/drm_atomic_state_helper.c @@ -286,28 +286,6 @@ void __drm_atomic_helper_plane_state_init(struct drm_plane_state *plane_state, } EXPORT_SYMBOL(__drm_atomic_helper_plane_state_init); -/** - * __drm_atomic_helper_plane_reset - reset state on plane - * @plane: drm plane - * @plane_state: plane state to assign - * - * Initializes the newly allocated @plane_state and assigns it to - * the &drm_plane->state pointer of @plane, usually required when - * initializing the drivers or when called from the &drm_plane_funcs.reset - * hook. - * - * This is useful for drivers that subclass the plane state. - */ -void __drm_atomic_helper_plane_reset(struct drm_plane *plane, - struct drm_plane_state *plane_state) -{ - if (plane_state) - __drm_atomic_helper_plane_state_init(plane_state, plane); - - plane->state = 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 49acd05552a5..4706eeab52c1 100644 --- a/include/drm/drm_atomic_state_helper.h +++ b/include/drm/drm_atomic_state_helper.h @@ -56,8 +56,6 @@ void __drm_atomic_helper_plane_state_init(struct drm_plane_state *state, struct drm_plane *plane); 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_duplicate_state(struct drm_plane *plane, struct drm_plane_state *state); struct drm_plane_state *