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_ttm.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_ttm.c')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c index dcaf691f56b5..a743aeabc767 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | |||
@@ -268,7 +268,7 @@ static int amdgpu_move_blit(struct ttm_buffer_object *bo, | |||
268 | struct amdgpu_device *adev; | 268 | struct amdgpu_device *adev; |
269 | struct amdgpu_ring *ring; | 269 | struct amdgpu_ring *ring; |
270 | uint64_t old_start, new_start; | 270 | uint64_t old_start, new_start; |
271 | struct fence *fence; | 271 | struct dma_fence *fence; |
272 | int r; | 272 | int r; |
273 | 273 | ||
274 | adev = amdgpu_get_adev(bo->bdev); | 274 | adev = amdgpu_get_adev(bo->bdev); |
@@ -316,7 +316,7 @@ static int amdgpu_move_blit(struct ttm_buffer_object *bo, | |||
316 | return r; | 316 | return r; |
317 | 317 | ||
318 | r = ttm_bo_pipeline_move(bo, fence, evict, new_mem); | 318 | r = ttm_bo_pipeline_move(bo, fence, evict, new_mem); |
319 | fence_put(fence); | 319 | dma_fence_put(fence); |
320 | return r; | 320 | return r; |
321 | } | 321 | } |
322 | 322 | ||
@@ -1247,7 +1247,7 @@ int amdgpu_copy_buffer(struct amdgpu_ring *ring, | |||
1247 | uint64_t dst_offset, | 1247 | uint64_t dst_offset, |
1248 | uint32_t byte_count, | 1248 | uint32_t byte_count, |
1249 | struct reservation_object *resv, | 1249 | struct reservation_object *resv, |
1250 | struct fence **fence, bool direct_submit) | 1250 | struct dma_fence **fence, bool direct_submit) |
1251 | { | 1251 | { |
1252 | struct amdgpu_device *adev = ring->adev; | 1252 | struct amdgpu_device *adev = ring->adev; |
1253 | struct amdgpu_job *job; | 1253 | struct amdgpu_job *job; |
@@ -1294,7 +1294,7 @@ int amdgpu_copy_buffer(struct amdgpu_ring *ring, | |||
1294 | if (direct_submit) { | 1294 | if (direct_submit) { |
1295 | r = amdgpu_ib_schedule(ring, job->num_ibs, job->ibs, | 1295 | r = amdgpu_ib_schedule(ring, job->num_ibs, job->ibs, |
1296 | NULL, NULL, fence); | 1296 | NULL, NULL, fence); |
1297 | job->fence = fence_get(*fence); | 1297 | job->fence = dma_fence_get(*fence); |
1298 | if (r) | 1298 | if (r) |
1299 | DRM_ERROR("Error scheduling IBs (%d)\n", r); | 1299 | DRM_ERROR("Error scheduling IBs (%d)\n", r); |
1300 | amdgpu_job_free(job); | 1300 | amdgpu_job_free(job); |
@@ -1315,7 +1315,7 @@ error_free: | |||
1315 | int amdgpu_fill_buffer(struct amdgpu_bo *bo, | 1315 | int amdgpu_fill_buffer(struct amdgpu_bo *bo, |
1316 | uint32_t src_data, | 1316 | uint32_t src_data, |
1317 | struct reservation_object *resv, | 1317 | struct reservation_object *resv, |
1318 | struct fence **fence) | 1318 | struct dma_fence **fence) |
1319 | { | 1319 | { |
1320 | struct amdgpu_device *adev = bo->adev; | 1320 | struct amdgpu_device *adev = bo->adev; |
1321 | struct amdgpu_job *job; | 1321 | struct amdgpu_job *job; |