Commit 4d49d87b authored by Jonas Karlman's avatar Jonas Karlman Committed by Heiko Stuebner
Browse files

drm/rockchip: vop2: Add missing call to crtc reset helper 



Add missing call to crtc reset helper to properly vblank reset.

Also move vop2_crtc_reset and call vop2_crtc_destroy_state to simplify
and remove duplicated code.

Fixes: 604be855 ("drm/rockchip: Add VOP2 driver")
Signed-off-by: default avatarJonas Karlman <jonas@kwiboo.se>
Reviewed-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: default avatarHeiko Stuebner <heiko@sntech.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20230621223311.2239547-6-jonas@kwiboo.se
parent 342f7e49

drivers/gpu/drm/rockchip/rockchip_drm_vop2.c

+14 −17
Original line number Diff line number Diff line
@@ -2079,23 +2079,6 @@ static const struct drm_crtc_helper_funcs vop2_crtc_helper_funcs = { 
	.atomic_disable = vop2_crtc_atomic_disable,

};



static void vop2_crtc_reset(struct drm_crtc *crtc)

{

	struct rockchip_crtc_state *vcstate = to_rockchip_crtc_state(crtc->state);



	if (crtc->state) {

		__drm_atomic_helper_crtc_destroy_state(crtc->state);

		kfree(vcstate);

	}



	vcstate = kzalloc(sizeof(*vcstate), GFP_KERNEL);

	if (!vcstate)

		return;



	crtc->state = &vcstate->base;

	crtc->state->crtc = crtc;

}



static struct drm_crtc_state *vop2_crtc_duplicate_state(struct drm_crtc *crtc)

{

	struct rockchip_crtc_state *vcstate;
@@ -2122,6 +2105,20 @@ static void vop2_crtc_destroy_state(struct drm_crtc *crtc, 
	kfree(vcstate);

}



static void vop2_crtc_reset(struct drm_crtc *crtc)

{

	struct rockchip_crtc_state *vcstate =

		kzalloc(sizeof(*vcstate), GFP_KERNEL);



	if (crtc->state)

		vop2_crtc_destroy_state(crtc, crtc->state);



	if (vcstate)

		__drm_atomic_helper_crtc_reset(crtc, &vcstate->base);

	else

		__drm_atomic_helper_crtc_reset(crtc, NULL);

}



static const struct drm_crtc_funcs vop2_crtc_funcs = {

	.set_config = drm_atomic_helper_set_config,

	.page_flip = drm_atomic_helper_page_flip,