Applied. Thanks. I forgot to add it to the commit when I pushed it,
but for posterity,
Fixes: 3bd68b32c911 ("drm/amdgpu: fix pipeline sync v2:)
Alex
On Fri, Feb 3, 2023 at 11:53 AM Bert Karwatzki <spasswolf@xxxxxx> wrote:
>
> Here is the fix for (send again to test if I can get it right with
> Evolution)
> Bug: https://gitlab.freedesktop.org/drm/amd/-/issues/2360
>
> From 6e064c9565ef0da890f3fcb2a4f6a8cd44a12fdb Mon Sep 17 00:00:00 2001
> From: Bert Karwatzki <spasswolf@xxxxxx>
> Date: Thu, 2 Feb 2023 19:50:27 +0100
> Subject: [PATCH] Fix memory leak in amdgpu_cs_sync_rings.
>
> Signed-off-by: Bert Karwatzki <spasswolf@xxxxxx>
> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
> b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
> index 0f4cb41078c1..08eced097bd8 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
> @@ -1222,10 +1222,13 @@ static int amdgpu_cs_sync_rings(struct
> amdgpu_cs_parser *p)
> * next job actually sees the results from the
> previous one
> * before we start executing on the same scheduler
> ring.
> */
> - if (!s_fence || s_fence->sched != sched)
> + if (!s_fence || s_fence->sched != sched) {
> + dma_fence_put(fence);
> continue;
> + }
>
> r = amdgpu_sync_fence(&p->gang_leader->explicit_sync,
> fence);
> + dma_fence_put(fence);
> if (r)
> return r;
> }
>
