diff options
| author | Christian König <christian.koenig@amd.com> | 2025-01-14 13:51:39 +0100 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2025-03-19 15:51:31 -0400 |
| commit | 0d9a95099dcb05b5f4719c830d15bf4fdcad0dc2 (patch) | |
| tree | 989acd9c221084ca61e8089cc7644ac85d6add7a /drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | |
| parent | 6c11d4a87d5258f784699274b732bb5fe288475a (diff) | |
| download | linux-0d9a95099dcb05b5f4719c830d15bf4fdcad0dc2.tar.gz linux-0d9a95099dcb05b5f4719c830d15bf4fdcad0dc2.tar.bz2 linux-0d9a95099dcb05b5f4719c830d15bf4fdcad0dc2.zip | |
drm/amdgpu: grab an additional reference on the gang fence v2
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>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_device.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c index e63bcd5edab9..35ace1368b9c 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c @@ -6913,18 +6913,26 @@ struct dma_fence *amdgpu_device_switch_gang(struct amdgpu_device *adev, { struct dma_fence *old = NULL; + dma_fence_get(gang); do { dma_fence_put(old); old = amdgpu_device_get_gang(adev); if (old == gang) break; - if (!dma_fence_is_signaled(old)) + if (!dma_fence_is_signaled(old)) { + dma_fence_put(gang); return old; + } } while (cmpxchg((struct dma_fence __force **)&adev->gang_submit, 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); return NULL; } |