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_object.h | |
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_object.h')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.h index 8255034d73eb..3e785ed3cb4b 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | |||
@@ -156,19 +156,19 @@ int amdgpu_bo_get_metadata(struct amdgpu_bo *bo, void *buffer, | |||
156 | void amdgpu_bo_move_notify(struct ttm_buffer_object *bo, | 156 | void amdgpu_bo_move_notify(struct ttm_buffer_object *bo, |
157 | struct ttm_mem_reg *new_mem); | 157 | struct ttm_mem_reg *new_mem); |
158 | int amdgpu_bo_fault_reserve_notify(struct ttm_buffer_object *bo); | 158 | int amdgpu_bo_fault_reserve_notify(struct ttm_buffer_object *bo); |
159 | void amdgpu_bo_fence(struct amdgpu_bo *bo, struct fence *fence, | 159 | void amdgpu_bo_fence(struct amdgpu_bo *bo, struct dma_fence *fence, |
160 | bool shared); | 160 | bool shared); |
161 | u64 amdgpu_bo_gpu_offset(struct amdgpu_bo *bo); | 161 | u64 amdgpu_bo_gpu_offset(struct amdgpu_bo *bo); |
162 | int amdgpu_bo_backup_to_shadow(struct amdgpu_device *adev, | 162 | int amdgpu_bo_backup_to_shadow(struct amdgpu_device *adev, |
163 | struct amdgpu_ring *ring, | 163 | struct amdgpu_ring *ring, |
164 | struct amdgpu_bo *bo, | 164 | struct amdgpu_bo *bo, |
165 | struct reservation_object *resv, | 165 | struct reservation_object *resv, |
166 | struct fence **fence, bool direct); | 166 | struct dma_fence **fence, bool direct); |
167 | int amdgpu_bo_restore_from_shadow(struct amdgpu_device *adev, | 167 | int amdgpu_bo_restore_from_shadow(struct amdgpu_device *adev, |
168 | struct amdgpu_ring *ring, | 168 | struct amdgpu_ring *ring, |
169 | struct amdgpu_bo *bo, | 169 | struct amdgpu_bo *bo, |
170 | struct reservation_object *resv, | 170 | struct reservation_object *resv, |
171 | struct fence **fence, | 171 | struct dma_fence **fence, |
172 | bool direct); | 172 | bool direct); |
173 | 173 | ||
174 | 174 | ||
@@ -200,7 +200,7 @@ int amdgpu_sa_bo_new(struct amdgpu_sa_manager *sa_manager, | |||
200 | unsigned size, unsigned align); | 200 | unsigned size, unsigned align); |
201 | void amdgpu_sa_bo_free(struct amdgpu_device *adev, | 201 | void amdgpu_sa_bo_free(struct amdgpu_device *adev, |
202 | struct amdgpu_sa_bo **sa_bo, | 202 | struct amdgpu_sa_bo **sa_bo, |
203 | struct fence *fence); | 203 | struct dma_fence *fence); |
204 | #if defined(CONFIG_DEBUG_FS) | 204 | #if defined(CONFIG_DEBUG_FS) |
205 | void amdgpu_sa_bo_dump_debug_info(struct amdgpu_sa_manager *sa_manager, | 205 | void amdgpu_sa_bo_dump_debug_info(struct amdgpu_sa_manager *sa_manager, |
206 | struct seq_file *m); | 206 | struct seq_file *m); |