]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
drm/xe: Use dma_fence_chain_free in chain fence unused as a sync
authorMatthew Brost <matthew.brost@intel.com>
Sat, 27 Jul 2024 01:22:16 +0000 (18:22 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 14 Aug 2024 13:34:24 +0000 (15:34 +0200)
[ Upstream commit 4f854a8b1b85d46abd5ce206936d23f87ac5e0c9 ]

A chain fence is uninitialized if not installed in a drm sync obj. Thus
if xe_sync_entry_cleanup is called and sync->chain_fence is non-NULL the
proper cleanup is dma_fence_chain_free rather than a dma-fence put.

Reported-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Closes: https://gitlab.freedesktop.org/drm/xe/kernel/-/issues/2411
Closes: https://gitlab.freedesktop.org/drm/xe/kernel/-/issues/2261
Fixes: dd08ebf6c352 ("drm/xe: Introduce a new DRM driver for Intel GPUs")
Signed-off-by: Matthew Brost <matthew.brost@intel.com>
Reviewed-by: Matthew Auld <matthew.auld@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240727012216.2118276-1-matthew.brost@intel.com
(cherry picked from commit 7f7a2da3bf8bc0e0f6c239af495b7050056e889c)
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/gpu/drm/xe/xe_sync.c

index 65f1f16282356d41c2f7c6ff9f4fdcbcd9cfc951..2bfff998458ba79bf0d88d2a2b82aeb7dd94dbbc 100644 (file)
@@ -263,7 +263,7 @@ void xe_sync_entry_cleanup(struct xe_sync_entry *sync)
        if (sync->fence)
                dma_fence_put(sync->fence);
        if (sync->chain_fence)
-               dma_fence_put(&sync->chain_fence->base);
+               dma_fence_chain_free(sync->chain_fence);
        if (sync->ufence)
                user_fence_put(sync->ufence);
 }