The mdp5 crtc implementation provides a custom reset hook. However, this hook only allocates the state, initializes it with __drm_atomic_helper_crtc_reset(), and frees the previous state. It does not perform any hardware reset.
Since this is exactly what the atomic_create_state hook is meant to do, minus the old state cleanup which the caller handles, convert the implementation to use atomic_create_state with __drm_atomic_helper_crtc_state_init() instead. Signed-off-by: Maxime Ripard <[email protected]> --- Cc: Abhinav Kumar <[email protected]> Cc: Dmitry Baryshkov <[email protected]> Cc: Jessica Zhang <[email protected]> Cc: Marijn Suijten <[email protected]> Cc: Rob Clark <[email protected]> Cc: Sean Paul <[email protected]> Cc: [email protected] Cc: [email protected] --- drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c b/drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c index 4c4a897fc1ee..1e1fff37380c 100644 --- a/drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c +++ b/drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c @@ -1126,27 +1126,27 @@ static void mdp5_crtc_destroy_state(struct drm_crtc *crtc, struct drm_crtc_state __drm_atomic_helper_crtc_destroy_state(state); kfree(mdp5_cstate); } -static void mdp5_crtc_reset(struct drm_crtc *crtc) +static struct drm_crtc_state *mdp5_crtc_create_state(struct drm_crtc *crtc) { - struct mdp5_crtc_state *mdp5_cstate = kzalloc_obj(*mdp5_cstate); + struct mdp5_crtc_state *mdp5_cstate; - if (crtc->state) - mdp5_crtc_destroy_state(crtc, crtc->state); + mdp5_cstate = kzalloc_obj(*mdp5_cstate); + if (!mdp5_cstate) + return ERR_PTR(-ENOMEM); - if (mdp5_cstate) - __drm_atomic_helper_crtc_reset(crtc, &mdp5_cstate->base); - else - __drm_atomic_helper_crtc_reset(crtc, NULL); + __drm_atomic_helper_crtc_state_init(&mdp5_cstate->base, crtc); + + return &mdp5_cstate->base; } static const struct drm_crtc_funcs mdp5_crtc_no_lm_cursor_funcs = { .set_config = drm_atomic_helper_set_config, .page_flip = drm_atomic_helper_page_flip, - .reset = mdp5_crtc_reset, + .atomic_create_state = mdp5_crtc_create_state, .atomic_duplicate_state = mdp5_crtc_duplicate_state, .atomic_destroy_state = mdp5_crtc_destroy_state, .atomic_print_state = mdp5_crtc_atomic_print_state, .get_vblank_counter = mdp5_crtc_get_vblank_counter, .enable_vblank = msm_crtc_enable_vblank, @@ -1155,11 +1155,11 @@ static const struct drm_crtc_funcs mdp5_crtc_no_lm_cursor_funcs = { }; static const struct drm_crtc_funcs mdp5_crtc_funcs = { .set_config = drm_atomic_helper_set_config, .page_flip = drm_atomic_helper_page_flip, - .reset = mdp5_crtc_reset, + .atomic_create_state = mdp5_crtc_create_state, .atomic_duplicate_state = mdp5_crtc_duplicate_state, .atomic_destroy_state = mdp5_crtc_destroy_state, .cursor_set = mdp5_crtc_cursor_set, .cursor_move = mdp5_crtc_cursor_move, .atomic_print_state = mdp5_crtc_atomic_print_state, -- 2.55.0
