The rcar-du crtc implementation provides a custom reset hook. However, this hook only allocates the state, initializes it with __drm_atomic_helper_crtc_reset(), sets driver-specific default values for the CRC source and index, 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: Geert Uytterhoeven <[email protected]> Cc: Kieran Bingham <[email protected]> Cc: Laurent Pinchart <[email protected]> Cc: Magnus Damm <[email protected]> Cc: Tomi Valkeinen <[email protected]> Cc: [email protected] --- drivers/gpu/drm/renesas/rcar-du/rcar_du_crtc.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/drivers/gpu/drm/renesas/rcar-du/rcar_du_crtc.c b/drivers/gpu/drm/renesas/rcar-du/rcar_du_crtc.c index 6c07c406f725..59c2a4b76137 100644 --- a/drivers/gpu/drm/renesas/rcar-du/rcar_du_crtc.c +++ b/drivers/gpu/drm/renesas/rcar-du/rcar_du_crtc.c @@ -995,27 +995,24 @@ static void rcar_du_crtc_cleanup(struct drm_crtc *crtc) rcar_du_crtc_crc_cleanup(rcrtc); drm_crtc_cleanup(crtc); } -static void rcar_du_crtc_reset(struct drm_crtc *crtc) +static struct drm_crtc_state *rcar_du_crtc_create_state(struct drm_crtc *crtc) { struct rcar_du_crtc_state *state; - if (crtc->state) { - rcar_du_crtc_atomic_destroy_state(crtc, crtc->state); - crtc->state = NULL; - } - state = kzalloc_obj(*state); if (state == NULL) - return; + return ERR_PTR(-ENOMEM); state->crc.source = VSP1_DU_CRC_NONE; state->crc.index = 0; - __drm_atomic_helper_crtc_reset(crtc, &state->state); + __drm_atomic_helper_crtc_state_init(&state->state, crtc); + + return &state->state; } static int rcar_du_crtc_enable_vblank(struct drm_crtc *crtc) { struct rcar_du_crtc *rcrtc = to_rcar_crtc(crtc); @@ -1153,22 +1150,22 @@ static int rcar_du_crtc_set_crc_source(struct drm_crtc *crtc, return ret; } static const struct drm_crtc_funcs crtc_funcs_gen2 = { - .reset = rcar_du_crtc_reset, + .atomic_create_state = rcar_du_crtc_create_state, .destroy = drm_crtc_cleanup, .set_config = drm_atomic_helper_set_config, .page_flip = drm_atomic_helper_page_flip, .atomic_duplicate_state = rcar_du_crtc_atomic_duplicate_state, .atomic_destroy_state = rcar_du_crtc_atomic_destroy_state, .enable_vblank = rcar_du_crtc_enable_vblank, .disable_vblank = rcar_du_crtc_disable_vblank, }; static const struct drm_crtc_funcs crtc_funcs_gen3 = { - .reset = rcar_du_crtc_reset, + .atomic_create_state = rcar_du_crtc_create_state, .destroy = rcar_du_crtc_cleanup, .set_config = drm_atomic_helper_set_config, .page_flip = drm_atomic_helper_page_flip, .atomic_duplicate_state = rcar_du_crtc_atomic_duplicate_state, .atomic_destroy_state = rcar_du_crtc_atomic_destroy_state, -- 2.55.0
