Re: [PATCH 01/76] drm/atomic-state-helper: Rename __drm_atomic_helper_bridge_reset()

[Thomas Zimmermann <tzimmermann@suse.de>]

Am 30.05.26 um 15:59 schrieb Maxime Ripard:
> __drm_atomic_helper_bridge_reset() is used to initialize a
> newly allocated drm_bridge_state, and is being typically called by the
> drm_bridge_funcs.atomic_reset implementation.
>
> Since we want to consolidate DRM objects state allocation around the
> atomic_create_state callback that will only allocate and initialize a
> new drm_bridge_state instance, we will need to call
> __drm_atomic_helper_bridge_reset() from both the atomic_reset and
> atomic_create_state hooks.
>
> To avoid any confusion, we can thus rename
> __drm_atomic_helper_bridge_reset() to
> __drm_atomic_helper_bridge_state_init().
>
> Signed-off-by: Maxime Ripard <mripard@kernel.org>

Reviewed-by: Thomas Zimmermann <tzimmermann@suse.de>

> ---
>   drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-core.c | 2 +-
>   drivers/gpu/drm/drm_atomic_state_helper.c           | 6 +++---
>   include/drm/drm_atomic_state_helper.h               | 2 +-
>   3 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-core.c b/drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-core.c
> index 36c07b71fe04..4e3015d10a97 100644
> --- a/drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-core.c
> +++ b/drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-core.c
> @@ -1927,11 +1927,11 @@ cdns_mhdp_bridge_atomic_reset(struct drm_bridge *bridge)
>   
>   	cdns_mhdp_state = kzalloc_obj(*cdns_mhdp_state);
>   	if (!cdns_mhdp_state)
>   		return NULL;
>   
> -	__drm_atomic_helper_bridge_reset(bridge, &cdns_mhdp_state->base);
> +	__drm_atomic_helper_bridge_state_init(bridge, &cdns_mhdp_state->base);
>   
>   	return &cdns_mhdp_state->base;
>   }
>   
>   static u32 *cdns_mhdp_get_input_bus_fmts(struct drm_bridge *bridge,
> diff --git a/drivers/gpu/drm/drm_atomic_state_helper.c b/drivers/gpu/drm/drm_atomic_state_helper.c
> index 07686e94aae0..c38e514f336f 100644
> --- a/drivers/gpu/drm/drm_atomic_state_helper.c
> +++ b/drivers/gpu/drm/drm_atomic_state_helper.c
> @@ -884,27 +884,27 @@ void drm_atomic_helper_bridge_destroy_state(struct drm_bridge *bridge,
>   	kfree(state);
>   }
>   EXPORT_SYMBOL(drm_atomic_helper_bridge_destroy_state);
>   
>   /**
> - * __drm_atomic_helper_bridge_reset() - Initialize a bridge state to its
> + * __drm_atomic_helper_bridge_state_init() - Initialize a bridge state to its
>    *					default
>    * @bridge: the bridge this state refers to
>    * @state: bridge state to initialize
>    *
>    * Initializes the bridge state to default values. This is meant to be called
>    * by the bridge &drm_bridge_funcs.atomic_reset hook for bridges that subclass
>    * the bridge state.
>    */
> -void __drm_atomic_helper_bridge_reset(struct drm_bridge *bridge,
> +void __drm_atomic_helper_bridge_state_init(struct drm_bridge *bridge,
>   				      struct drm_bridge_state *state)
>   {
>   	memset(state, 0, sizeof(*state));
>   	__drm_atomic_helper_private_obj_create_state(&bridge->base, &state->base);
>   	state->bridge = bridge;
>   }
> -EXPORT_SYMBOL(__drm_atomic_helper_bridge_reset);
> +EXPORT_SYMBOL(__drm_atomic_helper_bridge_state_init);
>   
>   /**
>    * drm_atomic_helper_bridge_reset() - Allocate and initialize a bridge state
>    *				      to its default
>    * @bridge: the bridge this state refers to
> diff --git a/include/drm/drm_atomic_state_helper.h b/include/drm/drm_atomic_state_helper.h
> index f4b6d8833bc2..6a715d8e1f4a 100644
> --- a/include/drm/drm_atomic_state_helper.h
> +++ b/include/drm/drm_atomic_state_helper.h
> @@ -100,9 +100,9 @@ void __drm_atomic_helper_bridge_duplicate_state(struct drm_bridge *bridge,
>   						struct drm_bridge_state *state);
>   struct drm_bridge_state *
>   drm_atomic_helper_bridge_duplicate_state(struct drm_bridge *bridge);
>   void drm_atomic_helper_bridge_destroy_state(struct drm_bridge *bridge,
>   					    struct drm_bridge_state *state);
> -void __drm_atomic_helper_bridge_reset(struct drm_bridge *bridge,
> +void __drm_atomic_helper_bridge_state_init(struct drm_bridge *bridge,
>   				      struct drm_bridge_state *state);
>   struct drm_bridge_state *
>   drm_atomic_helper_bridge_reset(struct drm_bridge *bridge);
>

-- 
--
Thomas Zimmermann
Graphics Driver Developer
SUSE Software Solutions Germany GmbH
Frankenstr. 146, 90461 Nürnberg, Germany, www.suse.com
GF: Jochen Jaser, Andrew McDonald, Werner Knoblich, (HRB 36809, AG Nürnberg)