diff options
author | Chris Wilson <chris@chris-wilson.co.uk> | 2016-10-25 08:00:45 -0400 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2016-10-25 08:40:39 -0400 |
commit | f54d1867005c3323f5d8ad83eed823e84226c429 (patch) | |
tree | 026c3f57bc546d3a0205389d0f8e0d02ce8a76ac /drivers/gpu/drm/amd/amdgpu/amdgpu_test.c | |
parent | 0fc4f78f44e6c6148cee32456f0d0023ec1c1fd8 (diff) |
dma-buf: Rename struct fence to dma_fence
I plan to usurp the short name of struct fence for a core kernel struct,
and so I need to rename the specialised fence/timeline for DMA
operations to make room.
A consensus was reached in
https://lists.freedesktop.org/archives/dri-devel/2016-July/113083.html
that making clear this fence applies to DMA operations was a good thing.
Since then the patch has grown a bit as usage increases, so hopefully it
remains a good thing!
(v2...: rebase, rerun spatch)
v3: Compile on msm, spotted a manual fixup that I broke.
v4: Try again for msm, sorry Daniel
coccinelle script:
@@
@@
- struct fence
+ struct dma_fence
@@
@@
- struct fence_ops
+ struct dma_fence_ops
@@
@@
- struct fence_cb
+ struct dma_fence_cb
@@
@@
- struct fence_array
+ struct dma_fence_array
@@
@@
- enum fence_flag_bits
+ enum dma_fence_flag_bits
@@
@@
(
- fence_init
+ dma_fence_init
|
- fence_release
+ dma_fence_release
|
- fence_free
+ dma_fence_free
|
- fence_get
+ dma_fence_get
|
- fence_get_rcu
+ dma_fence_get_rcu
|
- fence_put
+ dma_fence_put
|
- fence_signal
+ dma_fence_signal
|
- fence_signal_locked
+ dma_fence_signal_locked
|
- fence_default_wait
+ dma_fence_default_wait
|
- fence_add_callback
+ dma_fence_add_callback
|
- fence_remove_callback
+ dma_fence_remove_callback
|
- fence_enable_sw_signaling
+ dma_fence_enable_sw_signaling
|
- fence_is_signaled_locked
+ dma_fence_is_signaled_locked
|
- fence_is_signaled
+ dma_fence_is_signaled
|
- fence_is_later
+ dma_fence_is_later
|
- fence_later
+ dma_fence_later
|
- fence_wait_timeout
+ dma_fence_wait_timeout
|
- fence_wait_any_timeout
+ dma_fence_wait_any_timeout
|
- fence_wait
+ dma_fence_wait
|
- fence_context_alloc
+ dma_fence_context_alloc
|
- fence_array_create
+ dma_fence_array_create
|
- to_fence_array
+ to_dma_fence_array
|
- fence_is_array
+ dma_fence_is_array
|
- trace_fence_emit
+ trace_dma_fence_emit
|
- FENCE_TRACE
+ DMA_FENCE_TRACE
|
- FENCE_WARN
+ DMA_FENCE_WARN
|
- FENCE_ERR
+ DMA_FENCE_ERR
)
(
...
)
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Acked-by: Sumit Semwal <sumit.semwal@linaro.org>
Acked-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/20161025120045.28839-1-chris@chris-wilson.co.uk
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 | ||