From: Greg Kroah-Hartman Date: Fri, 27 Jan 2017 14:37:16 +0000 (+0100) Subject: 4.9-stable patches X-Git-Tag: v4.4.46~8 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0907f6c333f237d1d056ae8e77ebb08c2a728400;p=thirdparty%2Fkernel%2Fstable-queue.git 4.9-stable patches added patches: drm-atomic-clear-out-fence-when-duplicating-state.patch --- diff --git a/queue-4.9/drm-atomic-clear-out-fence-when-duplicating-state.patch b/queue-4.9/drm-atomic-clear-out-fence-when-duplicating-state.patch new file mode 100644 index 00000000000..2813045c30f --- /dev/null +++ b/queue-4.9/drm-atomic-clear-out-fence-when-duplicating-state.patch @@ -0,0 +1,41 @@ +From l.stach@pengutronix.de Fri Jan 27 15:34:48 2017 +From: Lucas Stach +Date: Fri, 27 Jan 2017 11:33:04 +0100 +Subject: drm/atomic: clear out fence when duplicating state +To: David Airlie +Cc: dri-devel@lists.freedesktop.org, stable@vger.kernel.org, Daniel Vetter , Fabio Estevam , kernel@pengutronix.de, patchwork-lst@pengutronix.de +Message-ID: <20170127103304.27613-1-l.stach@pengutronix.de> + +From: Lucas Stach + +[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 +Reviewed-by: Daniel Vetter +Tested-by: Fabio Estevam +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/gpu/drm/drm_atomic_helper.c | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/drivers/gpu/drm/drm_atomic_helper.c ++++ b/drivers/gpu/drm/drm_atomic_helper.c +@@ -3115,6 +3115,8 @@ void __drm_atomic_helper_plane_duplicate + + if (state->fb) + drm_framebuffer_reference(state->fb); ++ ++ state->fence = NULL; + } + EXPORT_SYMBOL(__drm_atomic_helper_plane_duplicate_state); + diff --git a/queue-4.9/series b/queue-4.9/series index 54ccd913f2d..0c4d9b92ab3 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -8,3 +8,4 @@ drm-vc4-fix-an-integer-overflow-in-temporary-allocation-layout.patch drm-vc4-return-einval-on-the-overflow-checks-failing.patch drm-vc4-fix-a-bounds-check.patch revert-drm-radeon-always-apply-pci-shutdown-callbacks.patch +drm-atomic-clear-out-fence-when-duplicating-state.patch