[PATCH] drm: Clean up planes in atomic commit helper failure path

[Daniel Vetter]

On Tue, Jan 03, 2017 at 01:14:27AM +0200, Laurent Pinchart wrote:
> If waiting for fences fails for blocking commits, planes must be cleaned
> up before returning.
> 
> Cc: stable at vger.kernel.org
> Fixes: f6ce410a59a4 ("drm/fence: allow fence waiting to be interrupted by userspace")
> Signed-off-by: Laurent Pinchart <laurent.pinchart at ideasonboard.com>

Nice catch. Applied to drm-misc-fixes, will send a pull to Dave soonish.
-Daniel

> ---
>  drivers/gpu/drm/drm_atomic_helper.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c
> index 2099868ee9f7..2bde19a64dd6 100644
> --- a/drivers/gpu/drm/drm_atomic_helper.c
> +++ b/drivers/gpu/drm/drm_atomic_helper.c
> @@ -1259,8 +1259,10 @@ int drm_atomic_helper_commit(struct drm_device *dev,
>  
>  	if (!nonblock) {
>  		ret = drm_atomic_helper_wait_for_fences(dev, state, true);
> -		if (ret)
> +		if (ret) {
> +			drm_atomic_helper_cleanup_planes(dev, state);
>  			return ret;
> +		}
>  	}
>  
>  	/*
> -- 
> Regards,
> 
> Laurent Pinchart
> 
> _______________________________________________
> dri-devel mailing list
> dri-devel at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch