diff options
| author | Dave Airlie <[email protected]> | 2025-08-13 22:16:25 +0000 |
|---|---|---|
| committer | Dave Airlie <[email protected]> | 2025-08-13 22:16:31 +0000 |
| commit | 68ad07df92faf4d7842199820ffb2b96702d0cfa (patch) | |
| tree | d892453d045395c661acef58c39b1f60aad57a6f /drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | |
| parent | Merge tag 'drm-misc-next-fixes-2025-08-12' of https://gitlab.freedesktop.org/... (diff) | |
| parent | drm/amdgpu: fix task hang from failed job submission during process kill (diff) | |
| download | kernel-68ad07df92faf4d7842199820ffb2b96702d0cfa.tar.gz kernel-68ad07df92faf4d7842199820ffb2b96702d0cfa.zip | |
Merge tag 'amd-drm-fixes-6.17-2025-08-13' of https://gitlab.freedesktop.org/agd5f/linux into drm-fixes
amd-drm-fixes-6.17-2025-08-13:
amdgpu:
- PSP fix
- VRAM reservation fix
- CSA fix
- Process kill fix
Signed-off-by: Dave Airlie <[email protected]>
From: Alex Deucher <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c index 07c936e90d8e..78f9e86ccc09 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c @@ -648,9 +648,8 @@ static void amdgpu_vram_mgr_del(struct ttm_resource_manager *man, list_for_each_entry(block, &vres->blocks, link) vis_usage += amdgpu_vram_mgr_vis_size(adev, block); - amdgpu_vram_mgr_do_reserve(man); - drm_buddy_free_list(mm, &vres->blocks, vres->flags); + amdgpu_vram_mgr_do_reserve(man); mutex_unlock(&mgr->lock); atomic64_sub(vis_usage, &mgr->vis_usage); |