aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c
diff options
context:
space:
mode:
authorChristian König <christian.koenig@amd.com>2018-01-12 09:26:08 -0500
committerAlex Deucher <alexander.deucher@amd.com>2018-02-19 14:17:44 -0500
commit132f34e4b558488cc8d153a1d18833054a76e44c (patch)
treef3395e8c95a922f65b43d6d3185c082d2f7f039c /drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c
parent770d13b19fdf365a99e559f1d47f1380910a947d (diff)
drm/amdgpu: move struct gart_funcs into amdgpu_gmc.h
And rename it to struct gmc_funcs. Signed-off-by: Christian König <christian.koenig@amd.com> Reviewed-by: Samuel Li <Samuel.Li@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c')
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c
index b730dee4cb0e..18d23878ad14 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c
@@ -241,14 +241,14 @@ int amdgpu_gart_unbind(struct amdgpu_device *adev, uint64_t offset,
241 continue; 241 continue;
242 242
243 for (j = 0; j < (PAGE_SIZE / AMDGPU_GPU_PAGE_SIZE); j++, t++) { 243 for (j = 0; j < (PAGE_SIZE / AMDGPU_GPU_PAGE_SIZE); j++, t++) {
244 amdgpu_gart_set_pte_pde(adev, adev->gart.ptr, 244 amdgpu_gmc_set_pte_pde(adev, adev->gart.ptr,
245 t, page_base, flags); 245 t, page_base, flags);
246 page_base += AMDGPU_GPU_PAGE_SIZE; 246 page_base += AMDGPU_GPU_PAGE_SIZE;
247 } 247 }
248 } 248 }
249 mb(); 249 mb();
250 amdgpu_asic_flush_hdp(adev); 250 amdgpu_asic_flush_hdp(adev);
251 amdgpu_gart_flush_gpu_tlb(adev, 0); 251 amdgpu_gmc_flush_gpu_tlb(adev, 0);
252 return 0; 252 return 0;
253} 253}
254 254
@@ -280,7 +280,7 @@ int amdgpu_gart_map(struct amdgpu_device *adev, uint64_t offset,
280 for (i = 0; i < pages; i++) { 280 for (i = 0; i < pages; i++) {
281 page_base = dma_addr[i]; 281 page_base = dma_addr[i];
282 for (j = 0; j < (PAGE_SIZE / AMDGPU_GPU_PAGE_SIZE); j++, t++) { 282 for (j = 0; j < (PAGE_SIZE / AMDGPU_GPU_PAGE_SIZE); j++, t++) {
283 amdgpu_gart_set_pte_pde(adev, dst, t, page_base, flags); 283 amdgpu_gmc_set_pte_pde(adev, dst, t, page_base, flags);
284 page_base += AMDGPU_GPU_PAGE_SIZE; 284 page_base += AMDGPU_GPU_PAGE_SIZE;
285 } 285 }
286 } 286 }
@@ -331,7 +331,7 @@ int amdgpu_gart_bind(struct amdgpu_device *adev, uint64_t offset,
331 331
332 mb(); 332 mb();
333 amdgpu_asic_flush_hdp(adev); 333 amdgpu_asic_flush_hdp(adev);
334 amdgpu_gart_flush_gpu_tlb(adev, 0); 334 amdgpu_gmc_flush_gpu_tlb(adev, 0);
335 return 0; 335 return 0;
336} 336}
337 337