The MSM mdp5 driver 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]> --- Cc: Rob Clark <[email protected]> Cc: Dmitry Baryshkov <[email protected]> Cc: Abhinav Kumar <[email protected]> Cc: Jessica Zhang <[email protected]> Cc: Sean Paul <[email protected]> Cc: Marijn Suijten <[email protected]> Cc: [email protected] Cc: [email protected] --- drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c | 31 ++++++++++++++++++++++--------- 1 file changed, 22 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c b/drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c index 5b6ca8dd929e1870b7228af93da03886524f5f20..44aef7eb8e9073bc9a4bab03c1d6c41313c56ac7 100644 --- a/drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c +++ b/drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c @@ -112,10 +112,30 @@ static void mdp5_global_destroy_state(struct drm_private_obj *obj, struct mdp5_global_state *mdp5_state = to_mdp5_global_state(state); kfree(mdp5_state); } +static void mdp5_global_reset(struct drm_private_obj *obj) +{ + struct drm_device *dev = obj->dev; + struct msm_drm_private *priv = dev->dev_private; + struct mdp5_kms *mdp5_kms = to_mdp5_kms(to_mdp_kms(priv->kms)); + struct mdp5_global_state *mdp5_state; + + if (obj->state) { + mdp5_global_destroy_state(obj, obj->state); + obj->state = NULL; + } + + mdp5_state = kzalloc(sizeof(*mdp5_state), GFP_KERNEL); + if (!mdp5_state) + return; + + __drm_atomic_helper_private_obj_reset(obj, &mdp5_state->base); + mdp5_state->mdp5_kms = mdp5_kms; +} + static void mdp5_global_print_state(struct drm_printer *p, const struct drm_private_state *state) { struct mdp5_global_state *mdp5_state = to_mdp5_global_state(state); @@ -125,24 +145,17 @@ static void mdp5_global_print_state(struct drm_printer *p, static const struct drm_private_state_funcs mdp5_global_state_funcs = { .atomic_duplicate_state = mdp5_global_duplicate_state, .atomic_destroy_state = mdp5_global_destroy_state, .atomic_print_state = mdp5_global_print_state, + .reset = mdp5_global_reset, }; static int mdp5_global_obj_init(struct mdp5_kms *mdp5_kms) { - struct mdp5_global_state *state; - - state = kzalloc(sizeof(*state), GFP_KERNEL); - if (!state) - return -ENOMEM; - - state->mdp5_kms = mdp5_kms; - drm_atomic_private_obj_init(mdp5_kms->dev, &mdp5_kms->glob_state, - &state->base, + NULL, &mdp5_global_state_funcs); return 0; } static void mdp5_enable_commit(struct msm_kms *kms) -- 2.51.0
