The vkms crtc implementation provides a custom reset hook. However, this hook only allocates the state, initializes it with __drm_atomic_helper_crtc_reset(), initializes the composer work struct, 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: Haneen Mohammed <[email protected]> Cc: Louis Chauvet <[email protected]> Cc: Melissa Wen <[email protected]> --- drivers/gpu/drm/vkms/vkms_crtc.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/vkms/vkms_crtc.c b/drivers/gpu/drm/vkms/vkms_crtc.c index 079abfba427d..fe17f49305a9 100644 --- a/drivers/gpu/drm/vkms/vkms_crtc.c +++ b/drivers/gpu/drm/vkms/vkms_crtc.c @@ -84,26 +84,28 @@ static void vkms_atomic_crtc_destroy_state(struct drm_crtc *crtc, WARN_ON(work_pending(&vkms_state->composer_work)); kfree(vkms_state->active_planes); kfree(vkms_state); } -static void vkms_atomic_crtc_reset(struct drm_crtc *crtc) +static struct drm_crtc_state *vkms_atomic_crtc_create_state(struct drm_crtc *crtc) { - struct vkms_crtc_state *vkms_state = kzalloc_obj(*vkms_state); + struct vkms_crtc_state *vkms_state; - if (crtc->state) - vkms_atomic_crtc_destroy_state(crtc, crtc->state); + vkms_state = kzalloc_obj(*vkms_state); + if (!vkms_state) + return ERR_PTR(-ENOMEM); - __drm_atomic_helper_crtc_reset(crtc, &vkms_state->base); - if (vkms_state) - INIT_WORK(&vkms_state->composer_work, vkms_composer_worker); + __drm_atomic_helper_crtc_state_init(&vkms_state->base, crtc); + INIT_WORK(&vkms_state->composer_work, vkms_composer_worker); + + return &vkms_state->base; } static const struct drm_crtc_funcs vkms_crtc_funcs = { .set_config = drm_atomic_helper_set_config, .page_flip = drm_atomic_helper_page_flip, - .reset = vkms_atomic_crtc_reset, + .atomic_create_state = vkms_atomic_crtc_create_state, .atomic_duplicate_state = vkms_atomic_crtc_duplicate_state, .atomic_destroy_state = vkms_atomic_crtc_destroy_state, DRM_CRTC_VBLANK_TIMER_FUNCS, .get_crc_sources = vkms_get_crc_sources, .set_crc_source = vkms_set_crc_source, -- 2.55.0
