aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/amd/amdgpu/amdgpu_test.c
diff options
context:
space:
mode:
authorChunming Zhou <david1.zhou@amd.com>2015-08-25 05:23:45 -0400
committerAlex Deucher <alexander.deucher@amd.com>2015-08-26 17:50:42 -0400
commitc7ae72c01be10f539f385f624713f8ba0aa11a8f (patch)
treec523633396afdeede8a47c386436bf0dd4e541ac /drivers/gpu/drm/amd/amdgpu/amdgpu_test.c
parent113cd9dacbad4906e1c8db09233b9fdcb002f80d (diff)
drm/amdgpu: use IB for copy buffer of eviction
This aids handling buffers moves with the scheduler. Signed-off-by: Chunming Zhou <david1.zhou@amd.com> Reviewed-by: Christian K?nig <christian.koenig@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_test.c')
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu_test.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_test.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_test.c
index 962dd5552137..f80b1a43be8a 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_test.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_test.c
@@ -77,7 +77,7 @@ static void amdgpu_do_test_moves(struct amdgpu_device *adev)
77 void *gtt_map, *vram_map; 77 void *gtt_map, *vram_map;
78 void **gtt_start, **gtt_end; 78 void **gtt_start, **gtt_end;
79 void **vram_start, **vram_end; 79 void **vram_start, **vram_end;
80 struct amdgpu_fence *fence = NULL; 80 struct fence *fence = NULL;
81 81
82 r = amdgpu_bo_create(adev, size, PAGE_SIZE, true, 82 r = amdgpu_bo_create(adev, size, PAGE_SIZE, true,
83 AMDGPU_GEM_DOMAIN_GTT, 0, NULL, gtt_obj + i); 83 AMDGPU_GEM_DOMAIN_GTT, 0, NULL, gtt_obj + i);
@@ -116,13 +116,13 @@ static void amdgpu_do_test_moves(struct amdgpu_device *adev)
116 goto out_lclean_unpin; 116 goto out_lclean_unpin;
117 } 117 }
118 118
119 r = fence_wait(&fence->base, false); 119 r = fence_wait(fence, false);
120 if (r) { 120 if (r) {
121 DRM_ERROR("Failed to wait for GTT->VRAM fence %d\n", i); 121 DRM_ERROR("Failed to wait for GTT->VRAM fence %d\n", i);
122 goto out_lclean_unpin; 122 goto out_lclean_unpin;
123 } 123 }
124 124
125 amdgpu_fence_unref(&fence); 125 fence_put(fence);
126 126
127 r = amdgpu_bo_kmap(vram_obj, &vram_map); 127 r = amdgpu_bo_kmap(vram_obj, &vram_map);
128 if (r) { 128 if (r) {
@@ -161,13 +161,13 @@ static void amdgpu_do_test_moves(struct amdgpu_device *adev)
161 goto out_lclean_unpin; 161 goto out_lclean_unpin;
162 } 162 }
163 163
164 r = fence_wait(&fence->base, false); 164 r = fence_wait(fence, false);
165 if (r) { 165 if (r) {
166 DRM_ERROR("Failed to wait for VRAM->GTT fence %d\n", i); 166 DRM_ERROR("Failed to wait for VRAM->GTT fence %d\n", i);
167 goto out_lclean_unpin; 167 goto out_lclean_unpin;
168 } 168 }
169 169
170 amdgpu_fence_unref(&fence); 170 fence_put(fence);
171 171
172 r = amdgpu_bo_kmap(gtt_obj[i], &gtt_map); 172 r = amdgpu_bo_kmap(gtt_obj[i], &gtt_map);
173 if (r) { 173 if (r) {
@@ -214,7 +214,7 @@ out_lclean:
214 amdgpu_bo_unref(&gtt_obj[i]); 214 amdgpu_bo_unref(&gtt_obj[i]);
215 } 215 }
216 if (fence) 216 if (fence)
217 amdgpu_fence_unref(&fence); 217 fence_put(fence);
218 break; 218 break;
219 } 219 }
220 220