The ipuv3 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: Fabio Estevam <[email protected]> Cc: Frank Li <[email protected]> Cc: Pengutronix Kernel Team <[email protected]> Cc: Philipp Zabel <[email protected]> Cc: Sascha Hauer <[email protected]> Cc: [email protected] --- drivers/gpu/drm/imx/ipuv3/ipuv3-crtc.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/drivers/gpu/drm/imx/ipuv3/ipuv3-crtc.c b/drivers/gpu/drm/imx/ipuv3/ipuv3-crtc.c index 1405e50ee56b..f4fe1842cfae 100644 --- a/drivers/gpu/drm/imx/ipuv3/ipuv3-crtc.c +++ b/drivers/gpu/drm/imx/ipuv3/ipuv3-crtc.c @@ -105,23 +105,21 @@ static void ipu_crtc_atomic_disable(struct drm_crtc *crtc, crtc->state->event = NULL; } spin_unlock_irq(&crtc->dev->event_lock); } -static void imx_drm_crtc_reset(struct drm_crtc *crtc) +static struct drm_crtc_state *imx_drm_crtc_create_state(struct drm_crtc *crtc) { struct imx_crtc_state *state; - if (crtc->state) - __drm_atomic_helper_crtc_destroy_state(crtc->state); - - kfree(to_imx_crtc_state(crtc->state)); - crtc->state = NULL; - state = kzalloc_obj(*state); - if (state) - __drm_atomic_helper_crtc_reset(crtc, &state->base); + if (!state) + return ERR_PTR(-ENOMEM); + + __drm_atomic_helper_crtc_state_init(&state->base, crtc); + + return &state->base; } static struct drm_crtc_state *imx_drm_crtc_duplicate_state(struct drm_crtc *crtc) { struct imx_crtc_state *state; @@ -162,11 +160,11 @@ static void ipu_disable_vblank(struct drm_crtc *crtc) } static const struct drm_crtc_funcs ipu_crtc_funcs = { .set_config = drm_atomic_helper_set_config, .page_flip = drm_atomic_helper_page_flip, - .reset = imx_drm_crtc_reset, + .atomic_create_state = imx_drm_crtc_create_state, .atomic_duplicate_state = imx_drm_crtc_duplicate_state, .atomic_destroy_state = imx_drm_crtc_destroy_state, .enable_vblank = ipu_enable_vblank, .disable_vblank = ipu_disable_vblank, }; -- 2.55.0
