The DP tunnel 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 reset implementation, let's migrate this instance to the new pattern. Signed-off-by: Maxime Ripard <[email protected]> --- drivers/gpu/drm/display/drm_dp_tunnel.c | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/drm/display/drm_dp_tunnel.c b/drivers/gpu/drm/display/drm_dp_tunnel.c index 43f13a7c79b931beb230f8afe20afa0ebcf5ed8d..ae6c6ca99417bf7d99186dd2648f0525c633a8d5 100644 --- a/drivers/gpu/drm/display/drm_dp_tunnel.c +++ b/drivers/gpu/drm/display/drm_dp_tunnel.c @@ -1495,13 +1495,31 @@ tunnel_group_duplicate_state(struct drm_private_obj *obj) static void tunnel_group_destroy_state(struct drm_private_obj *obj, struct drm_private_state *state) { free_group_state(to_group_state(state)); } +static void tunnel_group_reset(struct drm_private_obj *obj) +{ + struct drm_dp_tunnel_group_state *group_state; + + if (obj->state) { + tunnel_group_destroy_state(obj, obj->state); + obj->state = NULL; + } + + group_state = kzalloc(sizeof(*group_state), GFP_KERNEL); + if (!group_state) + return; + + __drm_atomic_helper_private_obj_reset(obj, &group_state->base); + INIT_LIST_HEAD(&group_state->tunnel_states); +} + static const struct drm_private_state_funcs tunnel_group_funcs = { .atomic_duplicate_state = tunnel_group_duplicate_state, .atomic_destroy_state = tunnel_group_destroy_state, + .reset = tunnel_group_reset, }; /** * drm_dp_tunnel_atomic_get_state - get/allocate the new atomic state for a tunnel * @state: Atomic state @@ -1579,23 +1597,15 @@ drm_dp_tunnel_atomic_get_new_state(struct drm_atomic_state *state, } EXPORT_SYMBOL(drm_dp_tunnel_atomic_get_new_state); static bool init_group(struct drm_dp_tunnel_mgr *mgr, struct drm_dp_tunnel_group *group) { - struct drm_dp_tunnel_group_state *group_state; - - group_state = kzalloc(sizeof(*group_state), GFP_KERNEL); - if (!group_state) - return false; - - INIT_LIST_HEAD(&group_state->tunnel_states); - group->mgr = mgr; group->available_bw = -1; INIT_LIST_HEAD(&group->tunnels); - drm_atomic_private_obj_init(mgr->dev, &group->base, &group_state->base, + drm_atomic_private_obj_init(mgr->dev, &group->base, NULL, &tunnel_group_funcs); return true; } -- 2.51.0
