* [PATCH] drm/atomic: clear out fence when duplicating state
@ 2017-01-27 10:33 ` Lucas Stach
0 siblings, 0 replies; 7+ messages in thread
From: Lucas Stach @ 2017-01-27 10:33 UTC (permalink / raw)
To: David Airlie
Cc: dri-devel, stable, Daniel Vetter, Fabio Estevam, kernel,
patchwork-lst
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>
---
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
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH] drm/atomic: clear out fence when duplicating state
2017-01-27 10:33 ` Lucas Stach
@ 2017-01-27 11:43 ` Fabio Estevam
-1 siblings, 0 replies; 7+ messages in thread
From: Fabio Estevam @ 2017-01-27 11:43 UTC (permalink / raw)
To: Lucas Stach; +Cc: Sascha Hauer, stable, patchwork-lst, DRI mailing list
Hi Lucas,
On Fri, Jan 27, 2017 at 8:33 AM, Lucas Stach <l.stach@pengutronix.de> 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@pengutronix.de>
Excellent: this fixes the kernel warning on 4.9.x. I can now stop
kmscube several times without getting any kernel warning:
Tested-by: Fabio Estevam <fabio.estevam@nxp.com>
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] drm/atomic: clear out fence when duplicating state
@ 2017-01-27 11:43 ` Fabio Estevam
0 siblings, 0 replies; 7+ messages in thread
From: Fabio Estevam @ 2017-01-27 11:43 UTC (permalink / raw)
To: Lucas Stach
Cc: David Airlie, DRI mailing list, stable, Daniel Vetter,
Sascha Hauer, patchwork-lst
Hi Lucas,
On Fri, Jan 27, 2017 at 8:33 AM, Lucas Stach <l.stach@pengutronix.de> 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@pengutronix.de>
Excellent: this fixes the kernel warning on 4.9.x. I can now stop
kmscube several times without getting any kernel warning:
Tested-by: Fabio Estevam <fabio.estevam@nxp.com>
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] drm/atomic: clear out fence when duplicating state
2017-01-27 10:33 ` Lucas Stach
@ 2017-01-27 14:07 ` Daniel Vetter
-1 siblings, 0 replies; 7+ messages in thread
From: Daniel Vetter @ 2017-01-27 14:07 UTC (permalink / raw)
To: Lucas Stach; +Cc: kernel, stable, patchwork-lst, dri-devel
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@pengutronix.de>
Reviewed-by: Daniel Vetter <daniel.vetter@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
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] drm/atomic: clear out fence when duplicating state
@ 2017-01-27 14:07 ` Daniel Vetter
0 siblings, 0 replies; 7+ messages in thread
From: Daniel Vetter @ 2017-01-27 14:07 UTC (permalink / raw)
To: Lucas Stach
Cc: David Airlie, dri-devel, stable, Daniel Vetter, Fabio Estevam,
kernel, patchwork-lst
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@pengutronix.de>
Reviewed-by: Daniel Vetter <daniel.vetter@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
^ permalink raw reply [flat|nested] 7+ messages in thread
* Patch "drm/atomic: clear out fence when duplicating state" has been added to the 4.9-stable tree
2017-01-27 10:33 ` Lucas Stach
` (2 preceding siblings ...)
(?)
@ 2017-01-27 14:37 ` gregkh
-1 siblings, 0 replies; 7+ messages in thread
From: gregkh @ 2017-01-27 14:37 UTC (permalink / raw)
To: l.stach, airlied, daniel.vetter, daniel, fabio.estevam, festevam,
gregkh
Cc: stable, stable-commits
This is a note to let you know that I've just added the patch titled
drm/atomic: clear out fence when duplicating state
to the 4.9-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
drm-atomic-clear-out-fence-when-duplicating-state.patch
and it can be found in the queue-4.9 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@vger.kernel.org> know about it.
>From l.stach@pengutronix.de Fri Jan 27 15:34:48 2017
From: Lucas Stach <l.stach@pengutronix.de>
Date: Fri, 27 Jan 2017 11:33:04 +0100
Subject: drm/atomic: clear out fence when duplicating state
To: David Airlie <airlied@linux.ie>
Cc: dri-devel@lists.freedesktop.org, stable@vger.kernel.org, Daniel Vetter <daniel@ffwll.ch>, Fabio Estevam <festevam@gmail.com>, kernel@pengutronix.de, patchwork-lst@pengutronix.de
Message-ID: <20170127103304.27613-1-l.stach@pengutronix.de>
From: Lucas Stach <l.stach@pengutronix.de>
[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>
---
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);
Patches currently in stable-queue which might be from l.stach@pengutronix.de are
queue-4.9/drm-atomic-clear-out-fence-when-duplicating-state.patch
^ permalink raw reply [flat|nested] 7+ messages in thread