Skip to content

Commit

Permalink
drm/amdgpu: Fix VRAM BO swap issue
Browse files Browse the repository at this point in the history
DRM buddy manager allocates the contiguous memory requests in
a single block or multiple blocks. So for the ttm move operation
(incase of low vram memory) we should consider all the blocks to
compute the total memory size which compared with the struct
ttm_resource num_pages in order to verify that the blocks are
contiguous for the eviction process.

v2: Added a Fixes tag
v3: Rewrite the code to save a bit of calculations and
    variables (Christian)

Fixes: c9cad93 ("drm/amdgpu: add drm buddy support to amdgpu")
Signed-off-by: Arunpravin Paneer Selvam <Arunpravin.PaneerSelvam@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
  • Loading branch information
arunpravin24 authored and alexdeucher committed Oct 6, 2022
1 parent 7e4ab9f commit 312b4dc
Showing 1 changed file with 12 additions and 5 deletions.
17 changes: 12 additions & 5 deletions drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
Expand Up @@ -424,8 +424,9 @@ static int amdgpu_move_blit(struct ttm_buffer_object *bo,
static bool amdgpu_mem_visible(struct amdgpu_device *adev,
struct ttm_resource *mem)
{
uint64_t mem_size = (u64)mem->num_pages << PAGE_SHIFT;
u64 mem_size = (u64)mem->num_pages << PAGE_SHIFT;
struct amdgpu_res_cursor cursor;
u64 end;

if (mem->mem_type == TTM_PL_SYSTEM ||
mem->mem_type == TTM_PL_TT)
Expand All @@ -434,12 +435,18 @@ static bool amdgpu_mem_visible(struct amdgpu_device *adev,
return false;

amdgpu_res_first(mem, 0, mem_size, &cursor);
end = cursor.start + cursor.size;
while (cursor.remaining) {
amdgpu_res_next(&cursor, cursor.size);

/* ttm_resource_ioremap only supports contiguous memory */
if (cursor.size != mem_size)
return false;
/* ttm_resource_ioremap only supports contiguous memory */
if (end != cursor.start)
return false;

end = cursor.start + cursor.size;
}

return cursor.start + cursor.size <= adev->gmc.visible_vram_size;
return end <= adev->gmc.visible_vram_size;
}

/*
Expand Down

0 comments on commit 312b4dc

Please sign in to comment.