| Message ID | 20230621223311.2239547-6-jonas@kwiboo.se (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/rockchip: Fix crtc duplicate state and crtc reset funcs | expand |
On Wed, Jun 21, 2023 at 10:33:23PM +0000, Jonas Karlman wrote: > 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: 604be85547ce ("drm/rockchip: Add VOP2 driver") > Signed-off-by: Jonas Karlman <jonas@kwiboo.se> > --- > v2: > - Add check for allocation failure (Sascha) Reviewed-by: Sascha Hauer <s.hauer@pengutronix.de> Sascha > > drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 31 +++++++++----------- > 1 file changed, 14 insertions(+), 17 deletions(-) > > diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c > index f725487d02ef..5ba83121a1b9 100644 > --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c > +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c > @@ -2080,23 +2080,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; > @@ -2123,6 +2106,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, > -- > 2.41.0 > >
diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c index f725487d02ef..5ba83121a1b9 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c @@ -2080,23 +2080,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; @@ -2123,6 +2106,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,
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: 604be85547ce ("drm/rockchip: Add VOP2 driver") Signed-off-by: Jonas Karlman <jonas@kwiboo.se> --- v2: - Add check for allocation failure (Sascha) drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 31 +++++++++----------- 1 file changed, 14 insertions(+), 17 deletions(-)