mirror of
https://github.com/torvalds/linux.git
synced 2026-06-01 11:03:43 +02:00
drm/bridge: Switch private_obj initialization to atomic_create_state
The bridge implementation relies on a drm_private_obj, that is initialized by allocating and initializing a state, and then passing it to drm_private_obj_init. Since we're gradually moving away from that pattern to the more established one relying on a atomic_create_state implementation, let's migrate this instance to the new pattern. Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com> Reviewed-by: Thomas Zimmermann <tzimmermann@suse.de> Link: https://patch.msgid.link/20260128-drm-private-obj-reset-v4-4-90891fa3d3b0@redhat.com Signed-off-by: Maxime Ripard <mripard@kernel.org>
This commit is contained in:
parent
e7be39ed17
commit
ca8453ce03
|
|
@ -825,6 +825,7 @@ void __drm_atomic_helper_bridge_reset(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);
|
||||
|
|
|
|||
|
|
@ -460,7 +460,21 @@ drm_bridge_atomic_destroy_priv_state(struct drm_private_obj *obj,
|
|||
bridge->funcs->atomic_destroy_state(bridge, state);
|
||||
}
|
||||
|
||||
static struct drm_private_state *
|
||||
drm_bridge_atomic_create_priv_state(struct drm_private_obj *obj)
|
||||
{
|
||||
struct drm_bridge *bridge = drm_priv_to_bridge(obj);
|
||||
struct drm_bridge_state *state;
|
||||
|
||||
state = bridge->funcs->atomic_reset(bridge);
|
||||
if (IS_ERR(state))
|
||||
return ERR_CAST(state);
|
||||
|
||||
return &state->base;
|
||||
}
|
||||
|
||||
static const struct drm_private_state_funcs drm_bridge_priv_state_funcs = {
|
||||
.atomic_create_state = drm_bridge_atomic_create_priv_state,
|
||||
.atomic_duplicate_state = drm_bridge_atomic_duplicate_priv_state,
|
||||
.atomic_destroy_state = drm_bridge_atomic_destroy_priv_state,
|
||||
};
|
||||
|
|
@ -537,26 +551,13 @@ int drm_bridge_attach(struct drm_encoder *encoder, struct drm_bridge *bridge,
|
|||
goto err_reset_bridge;
|
||||
}
|
||||
|
||||
if (drm_bridge_is_atomic(bridge)) {
|
||||
struct drm_bridge_state *state;
|
||||
|
||||
state = bridge->funcs->atomic_reset(bridge);
|
||||
if (IS_ERR(state)) {
|
||||
ret = PTR_ERR(state);
|
||||
goto err_detach_bridge;
|
||||
}
|
||||
|
||||
if (drm_bridge_is_atomic(bridge))
|
||||
drm_atomic_private_obj_init(bridge->dev, &bridge->base,
|
||||
&state->base,
|
||||
NULL,
|
||||
&drm_bridge_priv_state_funcs);
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
||||
err_detach_bridge:
|
||||
if (bridge->funcs->detach)
|
||||
bridge->funcs->detach(bridge);
|
||||
|
||||
err_reset_bridge:
|
||||
bridge->dev = NULL;
|
||||
bridge->encoder = NULL;
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user