diff options
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_test.c')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_test.c | 12 |
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 b827c75e95de..e05a24325eeb 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_test.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_test.c | |||
@@ -78,7 +78,7 @@ static void amdgpu_do_test_moves(struct amdgpu_device *adev) | |||
78 | void *gtt_map, *vram_map; | 78 | void *gtt_map, *vram_map; |
79 | void **gtt_start, **gtt_end; | 79 | void **gtt_start, **gtt_end; |
80 | void **vram_start, **vram_end; | 80 | void **vram_start, **vram_end; |
81 | struct fence *fence = NULL; | 81 | struct dma_fence *fence = NULL; |
82 | 82 | ||
83 | r = amdgpu_bo_create(adev, size, PAGE_SIZE, true, | 83 | r = amdgpu_bo_create(adev, size, PAGE_SIZE, true, |
84 | AMDGPU_GEM_DOMAIN_GTT, 0, NULL, | 84 | AMDGPU_GEM_DOMAIN_GTT, 0, NULL, |
@@ -118,13 +118,13 @@ static void amdgpu_do_test_moves(struct amdgpu_device *adev) | |||
118 | goto out_lclean_unpin; | 118 | goto out_lclean_unpin; |
119 | } | 119 | } |
120 | 120 | ||
121 | r = fence_wait(fence, false); | 121 | r = dma_fence_wait(fence, false); |
122 | if (r) { | 122 | if (r) { |
123 | DRM_ERROR("Failed to wait for GTT->VRAM fence %d\n", i); | 123 | DRM_ERROR("Failed to wait for GTT->VRAM fence %d\n", i); |
124 | goto out_lclean_unpin; | 124 | goto out_lclean_unpin; |
125 | } | 125 | } |
126 | 126 | ||
127 | fence_put(fence); | 127 | dma_fence_put(fence); |
128 | 128 | ||
129 | r = amdgpu_bo_kmap(vram_obj, &vram_map); | 129 | r = amdgpu_bo_kmap(vram_obj, &vram_map); |
130 | if (r) { | 130 | if (r) { |
@@ -163,13 +163,13 @@ static void amdgpu_do_test_moves(struct amdgpu_device *adev) | |||
163 | goto out_lclean_unpin; | 163 | goto out_lclean_unpin; |
164 | } | 164 | } |
165 | 165 | ||
166 | r = fence_wait(fence, false); | 166 | r = dma_fence_wait(fence, false); |
167 | if (r) { | 167 | if (r) { |
168 | DRM_ERROR("Failed to wait for VRAM->GTT fence %d\n", i); | 168 | DRM_ERROR("Failed to wait for VRAM->GTT fence %d\n", i); |
169 | goto out_lclean_unpin; | 169 | goto out_lclean_unpin; |
170 | } | 170 | } |
171 | 171 | ||
172 | fence_put(fence); | 172 | dma_fence_put(fence); |
173 | 173 | ||
174 | r = amdgpu_bo_kmap(gtt_obj[i], >t_map); | 174 | r = amdgpu_bo_kmap(gtt_obj[i], >t_map); |
175 | if (r) { | 175 | if (r) { |
@@ -216,7 +216,7 @@ out_lclean: | |||
216 | amdgpu_bo_unref(>t_obj[i]); | 216 | amdgpu_bo_unref(>t_obj[i]); |
217 | } | 217 | } |
218 | if (fence) | 218 | if (fence) |
219 | fence_put(fence); | 219 | dma_fence_put(fence); |
220 | break; | 220 | break; |
221 | } | 221 | } |
222 | 222 | ||