[PATCH] drm/atomic: clear out fence when duplicating state

Daniel Vetter daniel at ffwll.ch
Fri Jan 27 14:07:43 UTC 2017


On Fri, Jan 27, 2017 at 11:33:04AM +0100, Lucas Stach wrote:
> The fence needs to be cleared out, otherwise the following commit
> might wait on a stale fence from the previous commit. This was fixed
> as a side effect of 9626014258a5 (drm/fence: add in-fences support)
> in kernel 4.10.
> 
> As this commit introduces new functionality and as such can not be
> applied to stable, this patch is the minimal fix for the kernel 4.9
> stable series.
> 
> Signed-off-by: Lucas Stach <l.stach at pengutronix.de>

Reviewed-by: Daniel Vetter <daniel.vetter at ffwll.ch>

Stable teams, please apply.

Thanks, Daniel

> ---
>  drivers/gpu/drm/drm_atomic_helper.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c
> index 21f992605541..8ace20a5bf64 100644
> --- a/drivers/gpu/drm/drm_atomic_helper.c
> +++ b/drivers/gpu/drm/drm_atomic_helper.c
> @@ -3113,6 +3113,8 @@ void __drm_atomic_helper_plane_duplicate_state(struct drm_plane *plane,
>  
>  	if (state->fb)
>  		drm_framebuffer_reference(state->fb);
> +
> +	state->fence = NULL;
>  }
>  EXPORT_SYMBOL(__drm_atomic_helper_plane_duplicate_state);
>  
> -- 
> 2.11.0
> 

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


More information about the dri-devel mailing list