Am 09.07.26 um 13:50 schrieb Maxime Ripard:
drm_gem_reset_shadow_plane() is no longer used: all callers now go through drm_gem_create_shadow_plane_state() via the atomic_create_state hook. Remove it. Signed-off-by: Maxime Ripard <[email protected]>
Reviewed-by: Thomas Zimmermann <[email protected]> I think it would make sense to merge this change into patch 4. Your choice.
--- drivers/gpu/drm/drm_gem_atomic_helper.c | 23 ----------------------- include/drm/drm_gem_atomic_helper.h | 1 - 2 files changed, 24 deletions(-) diff --git a/drivers/gpu/drm/drm_gem_atomic_helper.c b/drivers/gpu/drm/drm_gem_atomic_helper.c index ae854555fd12..3bb6bfd560d3 100644 --- a/drivers/gpu/drm/drm_gem_atomic_helper.c +++ b/drivers/gpu/drm/drm_gem_atomic_helper.c @@ -337,33 +337,10 @@ void __drm_gem_reset_shadow_plane(struct drm_plane *plane, __drm_atomic_helper_plane_reset(plane, NULL); } } EXPORT_SYMBOL(__drm_gem_reset_shadow_plane);-/**- * drm_gem_reset_shadow_plane - resets a shadow-buffered plane - * @plane: the plane - * - * This function implements struct &drm_plane_funcs.reset_plane for - * shadow-buffered planes. It assumes the current plane state to be - * of type struct drm_shadow_plane and it allocates the new state of - * this type. - */ -void drm_gem_reset_shadow_plane(struct drm_plane *plane) -{ - struct drm_shadow_plane_state *shadow_plane_state; - - if (plane->state) { - drm_gem_destroy_shadow_plane_state(plane, plane->state); - plane->state = NULL; /* must be set to NULL here */ - } - - shadow_plane_state = kzalloc_obj(*shadow_plane_state); - __drm_gem_reset_shadow_plane(plane, shadow_plane_state); -} -EXPORT_SYMBOL(drm_gem_reset_shadow_plane); - /** * drm_gem_begin_shadow_fb_access - prepares shadow framebuffers for CPU access * @plane: the plane * @plane_state: the plane state of type struct drm_shadow_plane_state * diff --git a/include/drm/drm_gem_atomic_helper.h b/include/drm/drm_gem_atomic_helper.h index da8a4fb442b4..2deb0cd9ebbe 100644 --- a/include/drm/drm_gem_atomic_helper.h +++ b/include/drm/drm_gem_atomic_helper.h @@ -92,11 +92,10 @@ void __drm_gem_duplicate_shadow_plane_state(struct drm_plane *plane, struct drm_shadow_plane_state *new_shadow_plane_state); void __drm_gem_destroy_shadow_plane_state(struct drm_shadow_plane_state *shadow_plane_state); void __drm_gem_reset_shadow_plane(struct drm_plane *plane, struct drm_shadow_plane_state *shadow_plane_state);-void drm_gem_reset_shadow_plane(struct drm_plane *plane);void __drm_gem_shadow_plane_state_init(struct drm_plane *plane, struct drm_shadow_plane_state *shadow_plane_state); struct drm_plane_state *drm_gem_create_shadow_plane_state(struct drm_plane *plane); struct drm_plane_state *drm_gem_duplicate_shadow_plane_state(struct drm_plane *plane); void drm_gem_destroy_shadow_plane_state(struct drm_plane *plane,
-- -- Thomas Zimmermann Graphics Driver Developer SUSE Software Solutions Germany GmbH Frankenstr. 146, 90461 Nürnberg, Germany, www.suse.com GF: Jochen Jaser, Andrew McDonald, (HRB 36809, AG Nürnberg)
