mirror of
https://github.com/torvalds/linux.git
synced 2025-12-07 20:06:24 +00:00
drm/amdgpu/ttm: Use GART helper to map VRAM pages (v2)
Use the GART helper function introduced in the previous commit to map the VRAM pages of the transfer window to GART. No functional changes, just code cleanup. Split this into a separate commit to make it easier to bisect, in case there are problems in the future. Signed-off-by: Timur Kristóf <timur.kristof@gmail.com> Reviewed-by: Christian König <christian.koenig@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
committed by
Alex Deucher
parent
15bd4958fe
commit
43a0ca334e
@@ -188,7 +188,6 @@ static int amdgpu_ttm_map_buffer(struct ttm_buffer_object *bo,
|
||||
struct amdgpu_job *job;
|
||||
void *cpu_addr;
|
||||
uint64_t flags;
|
||||
unsigned int i;
|
||||
int r;
|
||||
|
||||
BUG_ON(adev->mman.buffer_funcs->copy_max_bytes <
|
||||
@@ -255,16 +254,9 @@ static int amdgpu_ttm_map_buffer(struct ttm_buffer_object *bo,
|
||||
dma_addr = &bo->ttm->dma_address[mm_cur->start >> PAGE_SHIFT];
|
||||
amdgpu_gart_map(adev, 0, num_pages, dma_addr, flags, cpu_addr);
|
||||
} else {
|
||||
dma_addr_t dma_address;
|
||||
u64 pa = mm_cur->start + adev->vm_manager.vram_base_offset;
|
||||
|
||||
dma_address = mm_cur->start;
|
||||
dma_address += adev->vm_manager.vram_base_offset;
|
||||
|
||||
for (i = 0; i < num_pages; ++i) {
|
||||
amdgpu_gart_map(adev, i << PAGE_SHIFT, 1, &dma_address,
|
||||
flags, cpu_addr);
|
||||
dma_address += PAGE_SIZE;
|
||||
}
|
||||
amdgpu_gart_map_vram_range(adev, pa, 0, num_pages, flags, cpu_addr);
|
||||
}
|
||||
|
||||
dma_fence_put(amdgpu_job_submit(job));
|
||||
|
||||
Reference in New Issue
Block a user