aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/amd/amdgpu/amdgpu_test.c
diff options
context:
space:
mode:
authorJunwei Zhang <Jerry.Zhang@amd.com>2018-06-25 00:51:14 -0400
committerAlex Deucher <alexander.deucher@amd.com>2018-07-10 15:15:39 -0400
commit7b7c6c81b3a370b46b0c48f4ab7ac3be83237a12 (patch)
treedd93e3098cbcce0051433e3a173c466dd241ddbf /drivers/gpu/drm/amd/amdgpu/amdgpu_test.c
parentb861686b18538eaaf3530255eb37b4133146fbe2 (diff)
drm/amdgpu: separate gpu address from bo pin
It could be got by amdgpu_bo_gpu_offset() if need Signed-off-by: Junwei Zhang <Jerry.Zhang@amd.com> Reviewed-by: Michel Dänzer <michel.daenzer@amd.com> Reviewed-by: Christian König <christian.koenig@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_test.c')
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu_test.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_test.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_test.c
index 57b14dccd8e0..007d70cd69dd 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_test.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_test.c
@@ -76,11 +76,12 @@ static void amdgpu_do_test_moves(struct amdgpu_device *adev)
76 r = amdgpu_bo_reserve(vram_obj, false); 76 r = amdgpu_bo_reserve(vram_obj, false);
77 if (unlikely(r != 0)) 77 if (unlikely(r != 0))
78 goto out_unref; 78 goto out_unref;
79 r = amdgpu_bo_pin(vram_obj, AMDGPU_GEM_DOMAIN_VRAM, &vram_addr); 79 r = amdgpu_bo_pin(vram_obj, AMDGPU_GEM_DOMAIN_VRAM);
80 if (r) { 80 if (r) {
81 DRM_ERROR("Failed to pin VRAM object\n"); 81 DRM_ERROR("Failed to pin VRAM object\n");
82 goto out_unres; 82 goto out_unres;
83 } 83 }
84 vram_addr = amdgpu_bo_gpu_offset(vram_obj);
84 for (i = 0; i < n; i++) { 85 for (i = 0; i < n; i++) {
85 void *gtt_map, *vram_map; 86 void *gtt_map, *vram_map;
86 void **gart_start, **gart_end; 87 void **gart_start, **gart_end;
@@ -97,11 +98,12 @@ static void amdgpu_do_test_moves(struct amdgpu_device *adev)
97 r = amdgpu_bo_reserve(gtt_obj[i], false); 98 r = amdgpu_bo_reserve(gtt_obj[i], false);
98 if (unlikely(r != 0)) 99 if (unlikely(r != 0))
99 goto out_lclean_unref; 100 goto out_lclean_unref;
100 r = amdgpu_bo_pin(gtt_obj[i], AMDGPU_GEM_DOMAIN_GTT, &gart_addr); 101 r = amdgpu_bo_pin(gtt_obj[i], AMDGPU_GEM_DOMAIN_GTT);
101 if (r) { 102 if (r) {
102 DRM_ERROR("Failed to pin GTT object %d\n", i); 103 DRM_ERROR("Failed to pin GTT object %d\n", i);
103 goto out_lclean_unres; 104 goto out_lclean_unres;
104 } 105 }
106 gart_addr = amdgpu_bo_gpu_offset(gtt_obj[i]);
105 107
106 r = amdgpu_bo_kmap(gtt_obj[i], &gtt_map); 108 r = amdgpu_bo_kmap(gtt_obj[i], &gtt_map);
107 if (r) { 109 if (r) {