Commit 10ef476a authored by YiPeng Chai's avatar YiPeng Chai Committed by Alex Deucher
Browse files

drm/amdgpu: fix vram reservation issue 



The vram block allocation flag must be cleared
before making vram reservation, otherwise reserving
addresses within the currently freed memory range
will always fail.

Fixes: c9cad937 ("drm/amdgpu: add drm buddy support to amdgpu")
Signed-off-by: default avatarYiPeng Chai <YiPeng.Chai@amd.com>
Reviewed-by: default avatarHawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
(cherry picked from commit d38eaf27)
parent e67b8afc

drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c

+1 −2
Original line number Diff line number Diff line
@@ -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);