Hi Maarten, On Fri, Mar 01, 2019 at 01:56:15PM +0100, Maarten Lankhorst wrote: > Convert mali to using __drm_atomic_helper_crtc_reset(), instead of > writing its own version. Instead of open coding > malidp_crtc_destroy_state(), call it directly for freeing the old state. > > Signed-off-by: Maarten Lankhorst <maarten.lankhorst@xxxxxxxxxxxxxxx> > Cc: Liviu Dudau <liviu.dudau@xxxxxxx> Acked-by: Liviu Dudau <liviu.dudau@xxxxxxx> If you need me to take this patch into malidp tree let me know, otherwise I expect is going to show up in drm-misc-next at some moment. Best regards, Liviu > Cc: Brian Starkey <brian.starkey@xxxxxxx> > --- > drivers/gpu/drm/arm/malidp_crtc.c | 28 +++++++++++----------------- > 1 file changed, 11 insertions(+), 17 deletions(-) > > diff --git a/drivers/gpu/drm/arm/malidp_crtc.c b/drivers/gpu/drm/arm/malidp_crtc.c > index 56aad288666e..d6690e016f0b 100644 > --- a/drivers/gpu/drm/arm/malidp_crtc.c > +++ b/drivers/gpu/drm/arm/malidp_crtc.c > @@ -463,23 +463,6 @@ static struct drm_crtc_state *malidp_crtc_duplicate_state(struct drm_crtc *crtc) > return &state->base; > } > > -static void malidp_crtc_reset(struct drm_crtc *crtc) > -{ > - struct malidp_crtc_state *state = NULL; > - > - if (crtc->state) { > - state = to_malidp_crtc_state(crtc->state); > - __drm_atomic_helper_crtc_destroy_state(crtc->state); > - } > - > - kfree(state); > - state = kzalloc(sizeof(*state), GFP_KERNEL); > - if (state) { > - crtc->state = &state->base; > - crtc->state->crtc = crtc; > - } > -} > - > static void malidp_crtc_destroy_state(struct drm_crtc *crtc, > struct drm_crtc_state *state) > { > @@ -493,6 +476,17 @@ static void malidp_crtc_destroy_state(struct drm_crtc *crtc, > kfree(mali_state); > } > > +static void malidp_crtc_reset(struct drm_crtc *crtc) > +{ > + struct malidp_crtc_state *state = > + kzalloc(sizeof(*state), GFP_KERNEL); > + > + if (crtc->state) > + malidp_crtc_destroy_state(crtc, crtc->state); > + > + __drm_atomic_helper_crtc_reset(crtc, &state->base); > +} > + > static int malidp_crtc_enable_vblank(struct drm_crtc *crtc) > { > struct malidp_drm *malidp = crtc_to_malidp_device(crtc); > -- > 2.20.1 > > _______________________________________________ > dri-devel mailing list > dri-devel@xxxxxxxxxxxxxxxxxxxxx > https://lists.freedesktop.org/mailman/listinfo/dri-devel -- ==================== | I would like to | | fix the world, | | but they're not | | giving me the | \ source code! / --------------- ¯\_(ツ)_/¯ _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx