[Intel-gfx] [PATCH v4] dma-buf: Rename struct fence to dma_fence
On Tue, Oct 25, 2016 at 01:00:45PM +0100, Chris Wilson wrote:
> 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
Fourth times's the charm it seems. Applied to drm-misc, thanks.
-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
> Reviewed-by: Gustavo Padovan
> Acked-by: Sumit Semwal
> Acked-by: Christian König
> ---
> Documentation/sync_file.txt| 14 +-
> drivers/base/Kconfig | 6 +-
> drivers/dma-buf/Kconfig| 2 +-
> drivers/dma-buf/Makefile | 2 +-
> drivers/dma-buf/dma-buf.c | 28 +--
> .../dma-buf/{fence-array.c => dma-fence-array.c} | 91
> drivers/dma-buf/{fence.c => dma-fence.c} | 199 -
> drivers/dma-buf/reservation.c | 94
> drivers/dma-buf/seqno-fence.c | 18 +-
> drivers/dma-buf/sw_sync.c | 48 ++---
> drivers/dma-buf/sync_debug.c | 13 +-
> drivers/dma-buf/sync_debug.h | 9 +-
> drivers/dma-buf/sync_file.c| 63 +++---
> drivers/gpu/drm/amd/amdgpu/amdgpu.h| 54 ++---
> drivers/gpu/drm/amd/amdgpu/amdgpu_benchmark.c | 8 +-
> drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 16 +-
> drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c| 22 +-
> drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 14 +-
> drivers/gpu/drm/amd/amdgpu/amdgpu_display.c| 16 +-
> drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 58 ++---
> drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 6 +-
> drivers/gpu/drm/amd/amdgpu/amdgpu_job.c| 22 +-
> drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 14 +-
> drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 8 +-
> drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c | 24 +--
> drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c | 48 +++--
> drivers/gpu/drm/amd/amdgpu/amdgpu_test.c | 12 +-
> drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h | 4 +-
> drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c| 10 +-
> drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h| 4 +-
> drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c| 26 +--
> drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.h| 4 +-
> drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c| 26 +--
> drivers/gpu/drm/amd/amdgpu/amdgpu_vce.h| 4 +-
> drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 79 +++
> drivers/gpu/drm/amd/amdgpu/cik_sdma.c | 6 +-
> drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c | 6 +-
> drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 6 +-
> drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 12 +-
[PATCH v4] 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
Reviewed-by: Gustavo Padovan
Acked-by: Sumit Semwal
Acked-by: Christian König
---
Documentation/sync_file.txt| 14 +-
drivers/base/Kconfig | 6 +-
drivers/dma-buf/Kconfig| 2 +-
drivers/dma-buf/Makefile | 2 +-
drivers/dma-buf/dma-buf.c | 28 +--
.../dma-buf/{fence-array.c => dma-fence-array.c} | 91
drivers/dma-buf/{fence.c => dma-fence.c} | 199 -
drivers/dma-buf/reservation.c | 94
drivers/dma-buf/seqno-fence.c | 18 +-
drivers/dma-buf/sw_sync.c | 48 ++---
drivers/dma-buf/sync_debug.c | 13 +-
drivers/dma-buf/sync_debug.h | 9 +-
drivers/dma-buf/sync_file.c| 63 +++---
drivers/gpu/drm/amd/amdgpu/amdgpu.h| 54 ++---
drivers/gpu/drm/amd/amdgpu/amdgpu_benchmark.c | 8 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 16 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c| 22 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 14 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_display.c| 16 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 58 ++---
drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 6 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_job.c| 22 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 14 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 8 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c | 24 +--
drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c | 48 +++--
drivers/gpu/drm/amd/amdgpu/amdgpu_test.c | 12 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h | 4 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c| 10 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h| 4 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c| 26 +--
drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.h| 4 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c| 26 +--
drivers/gpu/drm/amd/amdgpu/amdgpu_vce.h| 4 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 79 +++
drivers/gpu/drm/amd/amdgpu/cik_sdma.c | 6 +-
drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c | 6 +-
drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 6 +-
drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 12 +-
drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 6 +-
drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 6 +-
drivers/gpu/drm/amd/amdgpu/si_dma.c| 6 +-
drivers/gpu/drm/amd/scheduler/gpu_sched_trace.h| 4 +-
drivers/gpu/drm/amd/scheduler/gpu_scheduler.c | 67 +++---
drivers/gpu/drm/amd/scheduler/gpu_scheduler.h | 26 +--
drivers/gpu/drm/amd/scheduler/sched_fence.c| 48 +++--
drivers/gpu/drm/drm_atomic.c
