The omap 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: Tomi Valkeinen <[email protected]> --- drivers/gpu/drm/omapdrm/omap_crtc.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/drm/omapdrm/omap_crtc.c b/drivers/gpu/drm/omapdrm/omap_crtc.c index c1b41e010a00..a9f6a76ebb5e 100644 --- a/drivers/gpu/drm/omapdrm/omap_crtc.c +++ b/drivers/gpu/drm/omapdrm/omap_crtc.c @@ -705,22 +705,21 @@ static int omap_crtc_atomic_get_property(struct drm_crtc *crtc, return -EINVAL; return 0; } -static void omap_crtc_reset(struct drm_crtc *crtc) +static struct drm_crtc_state *omap_crtc_create_state(struct drm_crtc *crtc) { struct omap_crtc_state *state; - if (crtc->state) - __drm_atomic_helper_crtc_destroy_state(crtc->state); - - kfree(crtc->state); - 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 * omap_crtc_duplicate_state(struct drm_crtc *crtc) { @@ -743,11 +742,11 @@ omap_crtc_duplicate_state(struct drm_crtc *crtc) return &state->base; } static const struct drm_crtc_funcs omap_crtc_funcs = { - .reset = omap_crtc_reset, + .atomic_create_state = omap_crtc_create_state, .set_config = drm_atomic_helper_set_config, .destroy = omap_crtc_destroy, .page_flip = drm_atomic_helper_page_flip, .atomic_duplicate_state = omap_crtc_duplicate_state, .atomic_destroy_state = drm_atomic_helper_crtc_destroy_state, -- 2.55.0
