Re: [PATCH 02/76] drm/atomic-state-helper: Reorder __drm_atomic_helper_bridge_state_init() arguments

[Thomas Zimmermann <tzimmermann@suse.de>]

Am 30.05.26 um 15:59 schrieb Maxime Ripard:
> The convention for state init helpers is to pass the state pointer
> as the first argument and the object pointer second.
>
> __drm_atomic_helper_bridge_state_init() has them in the opposite
> order. Swap the arguments to follow the convention, and update the
> cdns-mhdp8546 caller.
>
> 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           | 8 ++++----
>   include/drm/drm_atomic_state_helper.h               | 4 ++--
>   3 files changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-core.c b/drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-core.c
> index 4e3015d10a97..063f073034c1 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_state_init(bridge, &cdns_mhdp_state->base);
> +	__drm_atomic_helper_bridge_state_init(&cdns_mhdp_state->base, bridge);
>   
>   	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 c38e514f336f..8f04eae7a754 100644
> --- a/drivers/gpu/drm/drm_atomic_state_helper.c
> +++ b/drivers/gpu/drm/drm_atomic_state_helper.c
> @@ -886,19 +886,19 @@ void drm_atomic_helper_bridge_destroy_state(struct drm_bridge *bridge,
>   EXPORT_SYMBOL(drm_atomic_helper_bridge_destroy_state);
>   
>   /**
>    * __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
> + * @bridge: the bridge this state refers to
>    *
>    * 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_state_init(struct drm_bridge *bridge,
> -				      struct drm_bridge_state *state)
> +void __drm_atomic_helper_bridge_state_init(struct drm_bridge_state *state,
> +					   struct drm_bridge *bridge)
>   {
>   	memset(state, 0, sizeof(*state));
>   	__drm_atomic_helper_private_obj_create_state(&bridge->base, &state->base);
>   	state->bridge = bridge;
>   }
> @@ -920,9 +920,9 @@ drm_atomic_helper_bridge_reset(struct drm_bridge *bridge)
>   
>   	bridge_state = kzalloc_obj(*bridge_state);
>   	if (!bridge_state)
>   		return ERR_PTR(-ENOMEM);
>   
> -	__drm_atomic_helper_bridge_reset(bridge, bridge_state);
> +	__drm_atomic_helper_bridge_state_init(bridge_state, bridge);
>   	return bridge_state;
>   }
>   EXPORT_SYMBOL(drm_atomic_helper_bridge_reset);
> diff --git a/include/drm/drm_atomic_state_helper.h b/include/drm/drm_atomic_state_helper.h
> index 6a715d8e1f4a..cbc760598b9e 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_state_init(struct drm_bridge *bridge,
> -				      struct drm_bridge_state *state);
> +void __drm_atomic_helper_bridge_state_init(struct drm_bridge_state *state,
> +					   struct drm_bridge *bridge);
>   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)