| From 40efd162f723bbdbc251595e91ac2f3b3ca0dadf Mon Sep 17 00:00:00 2001 |
| From: Lucas Stach <l.stach@pengutronix.de> |
| Date: Fri, 27 Jan 2017 11:33:04 +0100 |
| Subject: [PATCH] drm/atomic: clear out fence when duplicating state |
| |
| commit a2104c7cd3b24c4329b6193f7ec0882ce612f110 upstream. |
| |
| [Fixed differently in 4.10] |
| |
| 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@pengutronix.de> |
| Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> |
| Tested-by: Fabio Estevam <fabio.estevam@nxp.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c |
| index 20be86d89a20..c55771fcc9f3 100644 |
| --- a/drivers/gpu/drm/drm_atomic_helper.c |
| +++ b/drivers/gpu/drm/drm_atomic_helper.c |
| @@ -3059,6 +3059,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.10.1 |
| |
