The lcdif 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: Marek Vasut <[email protected]> Cc: Pengutronix Kernel Team <[email protected]> Cc: Sascha Hauer <[email protected]> Cc: Stefan Agner <[email protected]> Cc: [email protected] --- drivers/gpu/drm/mxsfb/lcdif_kms.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/drm/mxsfb/lcdif_kms.c b/drivers/gpu/drm/mxsfb/lcdif_kms.c index 79e0f483ca20..5f0fbec3a390 100644 --- a/drivers/gpu/drm/mxsfb/lcdif_kms.c +++ b/drivers/gpu/drm/mxsfb/lcdif_kms.c @@ -594,22 +594,21 @@ static void lcdif_crtc_atomic_destroy_state(struct drm_crtc *crtc, { __drm_atomic_helper_crtc_destroy_state(state); kfree(to_lcdif_crtc_state(state)); } -static void lcdif_crtc_reset(struct drm_crtc *crtc) +static struct drm_crtc_state *lcdif_crtc_create_state(struct drm_crtc *crtc) { struct lcdif_crtc_state *state; - if (crtc->state) - lcdif_crtc_atomic_destroy_state(crtc, 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 * lcdif_crtc_atomic_duplicate_state(struct drm_crtc *crtc) { @@ -657,11 +656,11 @@ static const struct drm_crtc_helper_funcs lcdif_crtc_helper_funcs = { .atomic_enable = lcdif_crtc_atomic_enable, .atomic_disable = lcdif_crtc_atomic_disable, }; static const struct drm_crtc_funcs lcdif_crtc_funcs = { - .reset = lcdif_crtc_reset, + .atomic_create_state = lcdif_crtc_create_state, .destroy = drm_crtc_cleanup, .set_config = drm_atomic_helper_set_config, .page_flip = drm_atomic_helper_page_flip, .atomic_duplicate_state = lcdif_crtc_atomic_duplicate_state, .atomic_destroy_state = lcdif_crtc_atomic_destroy_state, -- 2.55.0
