samsung_sm8750/android_kernel_samsung_sm8750
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drm/amdgpu: grab an additional reference on the gang fence v2

Browse Source 
[ Upstream commit 0d9a95099dcb05b5f4719c830d15bf4fdcad0dc2 ]

We keep the gang submission fence around in adev, make sure that it
stays alive.

v2: fix memory leak on retry

Signed-off-by: Christian König <christian.koenig@amd.com>
Acked-by: Srinivasan Shanmugam <srinivasan.shanmugam@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Christian König
2025-01-14 13:51:39 +01:00
committed by Greg Kroah-Hartman
parent 13e5148f70
commit 3ab9cd2d2e
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
View File

@@ -6015,6 +6015,7 @@ struct dma_fence *amdgpu_device_switch_gang(struct amdgpu_device *adev,
{ {
struct dma_fence *old = NULL; struct dma_fence *old = NULL;
dma_fence_get(gang);
do { do {
dma_fence_put(old); dma_fence_put(old);
rcu_read_lock(); rcu_read_lock();
@@ -6024,12 +6025,19 @@ struct dma_fence *amdgpu_device_switch_gang(struct amdgpu_device *adev,
if (old == gang) if (old == gang)
break; break;
if (!dma_fence_is_signaled(old)) if (!dma_fence_is_signaled(old)) {
dma_fence_put(gang);
return old; return old;
}
} while (cmpxchg((struct dma_fence __force **)&adev->gang_submit, } while (cmpxchg((struct dma_fence __force **)&adev->gang_submit,
old, gang) != old); old, gang) != old);
/*
* Drop it once for the exchanged reference in adev and once for the
* thread local reference acquired in amdgpu_device_get_gang().
*/
dma_fence_put(old);
dma_fence_put(old); dma_fence_put(old);
return NULL; return NULL;
} }