Re: [PATCH] dma-buf: Rename struct fence to dma_fence

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



2016-10-20 Chris Wilson <chris@xxxxxxxxxxxxxxxxxx>:

> 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!
> 
> coccinelle script:
> @@
> 
> @@
> (
> - struct fence
> + struct dma_fence
> |
> - struct fence_ops
> + struct dma_fence_ops
> |
> - struct fence_cb
> + struct dma_fence_cb
> |
> - 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_get_rcu_safe
> + dma_fence_get_rcu_safe
> |
> - 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_TRACE
> + DMA_FENCE_TRACE
> |
> - FENCE_WARN
> + DMA_FENCE_WARN
> |
> - FENCE_ERR
> + DMA_FENCE_ERR
> )
>  (
>  ...
>  )
> 
> Signed-off-by: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx>
> ---
>  drivers/base/Kconfig                               |   6 +-
>  drivers/dma-buf/Makefile                           |   2 +-
>  drivers/dma-buf/dma-buf.c                          |  28 +--
>  .../dma-buf/{fence-array.c => dma-fence-array.c}   |  89 ++++----
>  drivers/dma-buf/{fence.c => dma-fence.c}           | 195 ++++++++---------
>  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                        |  59 +++---
>  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             |  80 +++----
>  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                       |   2 +-
>  drivers/gpu/drm/drm_atomic_helper.c                |   8 +-
>  drivers/gpu/drm/drm_fops.c                         |   4 +-
>  drivers/gpu/drm/etnaviv/etnaviv_gem.c              |   6 +-
>  drivers/gpu/drm/etnaviv/etnaviv_gpu.c              |  50 ++---
>  drivers/gpu/drm/etnaviv/etnaviv_gpu.h              |   4 +-
>  drivers/gpu/drm/i915/i915_gem_request.c            |  28 +--
>  drivers/gpu/drm/i915/i915_gem_request.h            |  18 +-
>  drivers/gpu/drm/i915/i915_sw_fence.c               |  41 ++--
>  drivers/gpu/drm/i915/i915_sw_fence.h               |   8 +-
>  drivers/gpu/drm/i915/i915_trace.h                  |   2 +-
>  drivers/gpu/drm/i915/intel_breadcrumbs.c           |   2 +-
>  drivers/gpu/drm/i915/intel_engine_cs.c             |   2 +-
>  drivers/gpu/drm/msm/msm_drv.h                      |   2 +-
>  drivers/gpu/drm/msm/msm_fence.c                    |  34 +--
>  drivers/gpu/drm/msm/msm_fence.h                    |   2 +-
>  drivers/gpu/drm/msm/msm_gem.c                      |  14 +-
>  drivers/gpu/drm/msm/msm_gem.h                      |   2 +-
>  drivers/gpu/drm/msm/msm_gem_submit.c               |   8 +-
>  drivers/gpu/drm/msm/msm_gpu.c                      |   2 +-
>  drivers/gpu/drm/nouveau/nouveau_bo.c               |   6 +-
>  drivers/gpu/drm/nouveau/nouveau_fence.c            |  80 +++----
>  drivers/gpu/drm/nouveau/nouveau_fence.h            |   6 +-
>  drivers/gpu/drm/nouveau/nouveau_gem.c              |   2 +-
>  drivers/gpu/drm/nouveau/nv04_fence.c               |   2 +-
>  drivers/gpu/drm/nouveau/nv10_fence.c               |   2 +-
>  drivers/gpu/drm/nouveau/nv17_fence.c               |   2 +-
>  drivers/gpu/drm/nouveau/nv50_fence.c               |   2 +-
>  drivers/gpu/drm/nouveau/nv84_fence.c               |   2 +-
>  drivers/gpu/drm/qxl/qxl_drv.h                      |   4 +-
>  drivers/gpu/drm/qxl/qxl_release.c                  |  35 +--
>  drivers/gpu/drm/radeon/radeon.h                    |  10 +-
>  drivers/gpu/drm/radeon/radeon_device.c             |   2 +-
>  drivers/gpu/drm/radeon/radeon_display.c            |   8 +-
>  drivers/gpu/drm/radeon/radeon_fence.c              |  56 ++---
>  drivers/gpu/drm/radeon/radeon_sync.c               |   6 +-
>  drivers/gpu/drm/radeon/radeon_uvd.c                |   2 +-
>  drivers/gpu/drm/ttm/ttm_bo.c                       |  24 +--
>  drivers/gpu/drm/ttm/ttm_bo_util.c                  |  22 +-
>  drivers/gpu/drm/ttm/ttm_bo_vm.c                    |   8 +-
>  drivers/gpu/drm/ttm/ttm_execbuf_util.c             |   3 +-
>  drivers/gpu/drm/vgem/vgem_fence.c                  |  53 ++---
>  drivers/gpu/drm/virtio/virtgpu_drv.h               |   2 +-
>  drivers/gpu/drm/virtio/virtgpu_fence.c             |  26 +--
>  drivers/gpu/drm/virtio/virtgpu_ioctl.c             |  12 +-
>  drivers/gpu/drm/virtio/virtgpu_kms.c               |   2 +-
>  drivers/gpu/drm/virtio/virtgpu_plane.c             |   2 +-
>  drivers/gpu/drm/vmwgfx/vmwgfx_fence.c              |  44 ++--
>  drivers/gpu/drm/vmwgfx/vmwgfx_fence.h              |   8 +-
>  drivers/gpu/drm/vmwgfx/vmwgfx_resource.c           |   2 +-
>  include/drm/drmP.h                                 |   4 +-
>  include/drm/drm_crtc.h                             |   2 +-
>  include/drm/drm_plane.h                            |   2 +-
>  include/drm/ttm/ttm_bo_api.h                       |   2 +-
>  include/drm/ttm/ttm_bo_driver.h                    |   6 +-
>  include/drm/ttm/ttm_execbuf_util.h                 |   2 +-
>  include/linux/dma-buf.h                            |   4 +-
>  include/linux/{fence-array.h => dma-fence-array.h} |  43 ++--
>  include/linux/{fence.h => dma-fence.h}             | 235 +++++++++++----------
>  include/linux/reservation.h                        |  28 +--
>  include/linux/seqno-fence.h                        |  16 +-
>  include/linux/sync_file.h                          |  14 +-
>  include/trace/events/{fence.h => dma_fence.h}      |  44 ++--
>  107 files changed, 1174 insertions(+), 1136 deletions(-)
>  rename drivers/dma-buf/{fence-array.c => dma-fence-array.c} (53%)
>  rename drivers/dma-buf/{fence.c => dma-fence.c} (65%)
>  rename include/linux/{fence-array.h => dma-fence-array.h} (62%)
>  rename include/linux/{fence.h => dma-fence.h} (59%)
>  rename include/trace/events/{fence.h => dma_fence.h} (72%)

Reviewed-by: Gustavo Padovan <gustavo.padovan@xxxxxxxxxxxxxxx>

Gustavo

_______________________________________________
dri-devel mailing list
dri-devel@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/dri-devel




[Index of Archives]     [Linux DRI Users]     [Linux Intel Graphics]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]     [XFree86]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Linux Kernel]     [Linux SCSI]     [XFree86]
  Powered by Linux