On Fri, Jun 12, 2020 at 06:00:51PM +0200, Daniel Vetter wrote:
> Now also comes with the added benefit of doing a drm_crtc_vblank_off(),
> which means vblank state isn't ill-defined and fail-y at driver load
> before the first modeset on each crtc.
>
> Signed-off-by: Daniel Vetter <daniel.vet...@intel.com>
> Cc: Philipp Zabel <p.za...@pengutronix.de>
> Cc: Shawn Guo <shawn...@kernel.org>
> Cc: Sascha Hauer <s.ha...@pengutronix.de>
> Cc: Pengutronix Kernel Team <ker...@pengutronix.de>
> Cc: Fabio Estevam <feste...@gmail.com>
> Cc: NXP Linux Team <linux-...@nxp.com>
> Cc: linux-arm-ker...@lists.infradead.org
Ping for some ack/review on this pls.
Thanks, Daniel
> ---
> drivers/gpu/drm/imx/ipuv3-crtc.c | 21 ++++++++-------------
> 1 file changed, 8 insertions(+), 13 deletions(-)
>
> diff --git a/drivers/gpu/drm/imx/ipuv3-crtc.c
> b/drivers/gpu/drm/imx/ipuv3-crtc.c
> index 63c0284f8b3c..02c2f848f2d1 100644
> --- a/drivers/gpu/drm/imx/ipuv3-crtc.c
> +++ b/drivers/gpu/drm/imx/ipuv3-crtc.c
> @@ -109,20 +109,15 @@ static void imx_drm_crtc_reset(struct drm_crtc *crtc)
> {
> struct imx_crtc_state *state;
>
> - if (crtc->state) {
> - if (crtc->state->mode_blob)
> - drm_property_blob_put(crtc->state->mode_blob);
> -
> - state = to_imx_crtc_state(crtc->state);
> - memset(state, 0, sizeof(*state));
> - } else {
> - state = kzalloc(sizeof(*state), GFP_KERNEL);
> - if (!state)
> - return;
> - crtc->state = &state->base;
> - }
> + if (crtc->state)
> + __drm_atomic_helper_crtc_destroy_state(crtc->state);
>
> - state->base.crtc = crtc;
> + kfree(to_imx_crtc_state(crtc->state));
> + crtc->state = NULL;
> +
> + state = kzalloc(sizeof(*state), GFP_KERNEL);
> + if (state)
> + __drm_atomic_helper_crtc_reset(crtc, &state->base);
> }
>
> static struct drm_crtc_state *imx_drm_crtc_duplicate_state(struct drm_crtc
> *crtc)
> --
> 2.26.2
>
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
