mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-08-24 04:18:55 -04:00
Code Issues Packages Projects Releases Wiki Activity

drm/atomic-state-helper: Reorder __drm_atomic_helper_bridge_state_init() arguments

Browse Source 
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.

Reviewed-by: Thomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Reviewed-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Tested-by: Luca Ceresoli <luca.ceresoli@bootlin.com> # imx8mp + sn65dsi84 + bridge hotplug
Link: https://patch.msgid.link/20260619-drm-no-more-bridge-reset-v3-4-ff399263111b@kernel.org
Signed-off-by: Maxime Ripard <mripard@kernel.org>
This commit is contained in:
Maxime Ripard
2026-06-19 14:24:09 +02:00
parent e723909e9d
commit c8a25a2d85
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-core.c
View File

@@ -1929,7 +1929,7 @@ cdns_mhdp_bridge_atomic_reset(struct drm_bridge *bridge)
if (!cdns_mhdp_state)
return ERR_PTR(-ENOMEM);
__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;
}

8
drivers/gpu/drm/drm_atomic_state_helper.c
View File

@@ -888,15 +888,15 @@ 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);
@@ -922,7 +922,7 @@ drm_atomic_helper_bridge_reset(struct drm_bridge *bridge)
if (!bridge_state)
return ERR_PTR(-ENOMEM);
__drm_atomic_helper_bridge_state_init(bridge, bridge_state);
__drm_atomic_helper_bridge_state_init(bridge_state, bridge);
return bridge_state;
}
EXPORT_SYMBOL(drm_atomic_helper_bridge_reset);

4
include/drm/drm_atomic_state_helper.h
View File

@@ -102,7 +102,7 @@ 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);