[RFC] dma-buf: Rename struct fence to dma_fence
Hi, 2016-07-13 23:10 GMT+09:00 Chris Wilson : > 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. > > As an indication of the scale of the flag day: > > 91 files changed, 904 insertions(+), 880 deletions(-) Seems files changed and below patch codes are not inconsistent. i.e., I cannot see modified codes for Android sync driver. And Android sync driver - explicit fence - can use a fence object regardless of DMA buffer. So it looks reasonable to use 'fence' as-is. Was there any changes for Android sync driver to be dependent on DMA buffer? Thanks, Inki Dae > > with the greatest victim being amdgpu. > > Just the highlights shown below. > -Chris > > --- > drivers/base/Kconfig| 6 +- > drivers/dma-buf/Makefile| 2 +- > drivers/dma-buf/dma-buf.c | 28 +- > drivers/dma-buf/dma-fence.c | 535 > > drivers/dma-buf/fence.c | 532 --- > drivers/dma-buf/reservation.c | 90 ++-- > drivers/dma-buf/seqno-fence.c | 18 +- > drivers/dma-buf/sw_sync.c | 44 +- > drivers/dma-buf/sync_debug.c| 9 +- > drivers/dma-buf/sync_debug.h| 13 +- > drivers/dma-buf/sync_file.c | 30 +- > drivers/gpu/drm/amd/amdgpu/amdgpu.h | 56 +-- > drivers/gpu/drm/amd/amdgpu/amdgpu_benchmark.c | 8 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 18 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 22 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 2 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 16 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 50 +-- > drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 10 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 18 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 2 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 4 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c | 24 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c| 56 +-- > 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 | 6 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 18 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.h | 4 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 22 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_vce.h | 4 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 56 +-- > drivers/gpu/drm/amd/amdgpu/cik_sdma.c | 8 +- > drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 8 +- > drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 16 +- > drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 8 +- > drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 8 +- > drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c | 6 +- > drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c | 6 +- > drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 6 +- > drivers/gpu/drm/amd/scheduler/gpu_sched_trace.h | 4 +- > drivers/gpu/drm/amd/scheduler/gpu_scheduler.c | 42 +- > drivers/gpu/drm/amd/scheduler/gpu_scheduler.h | 24 +- > drivers/gpu/drm/amd/scheduler/sched_fence.c | 22 +- > drivers/gpu/drm/drm_atomic_helper.c | 6 +- > drivers/gpu/drm/etnaviv/etnaviv_gem.c | 6 +- > drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 46 +- > drivers/gpu/drm/etnaviv/etnaviv_gpu.h | 4 +- > drivers/gpu/drm/imx/ipuv3-crtc.c| 12 +- > drivers/gpu/drm/msm/msm_drv.h | 2 +- > drivers/gpu/drm/msm/msm_fence.c | 30 +- > 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| 2 +- > drivers/gpu/drm/msm/msm_gpu.c | 2 +- > drivers/gpu/drm/nouveau/nouveau_bo.c| 6 +- > drivers/gpu/drm/nouveau/nouveau_fence.c | 68 +-- > 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 | 27 +- > drivers/gpu/drm/radeon/radeon.h | 10 +- > drivers/gpu/drm/radeon/radeon_device.c | 2 +- >
[RFC] dma-buf: Rename struct fence to dma_fence
On 13 July 2016 at 20:16, Daniel Vetter wrote: > On Wed, Jul 13, 2016 at 03:10: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. >> >> As an indication of the scale of the flag day: >> >> 91 files changed, 904 insertions(+), 880 deletions(-) >> >> with the greatest victim being amdgpu. >> >> Just the highlights shown below. > > +1 on dma_fence, for more consistency with dma_buf and everything else > dma_*. I think if we land this right before/after 4.8-rc1 through the drm > tree it should be minimally invasive. Worst case we'll have a fun merge > between drm.git and drm-intel.git (since drm-intel-next-queued doesn't get > closed while the merge window is open). > +1 on the merge idea, Daniel. > Adding lots more people to gather their opinion. > -Daniel > >> -Chris >> >> --- >> drivers/base/Kconfig| 6 +- >> drivers/dma-buf/Makefile| 2 +- >> drivers/dma-buf/dma-buf.c | 28 +- >> drivers/dma-buf/dma-fence.c | 535 >> >> drivers/dma-buf/fence.c | 532 >> --- >> drivers/dma-buf/reservation.c | 90 ++-- >> drivers/dma-buf/seqno-fence.c | 18 +- >> drivers/dma-buf/sw_sync.c | 44 +- >> drivers/dma-buf/sync_debug.c| 9 +- >> drivers/dma-buf/sync_debug.h| 13 +- >> drivers/dma-buf/sync_file.c | 30 +- >> drivers/gpu/drm/amd/amdgpu/amdgpu.h | 56 +-- >> drivers/gpu/drm/amd/amdgpu/amdgpu_benchmark.c | 8 +- >> drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 18 +- >> drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 22 +- >> drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 2 +- >> drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 16 +- >> drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 50 +-- >> drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 10 +- >> drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 18 +- >> drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 2 +- >> drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 4 +- >> drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c | 24 +- >> drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c| 56 +-- >> 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 | 6 +- >> drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 18 +- >> drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.h | 4 +- >> drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 22 +- >> drivers/gpu/drm/amd/amdgpu/amdgpu_vce.h | 4 +- >> drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 56 +-- >> drivers/gpu/drm/amd/amdgpu/cik_sdma.c | 8 +- >> drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 8 +- >> drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 16 +- >> drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 8 +- >> drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 8 +- >> drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c | 6 +- >> drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c | 6 +- >> drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 6 +- >> drivers/gpu/drm/amd/scheduler/gpu_sched_trace.h | 4 +- >> drivers/gpu/drm/amd/scheduler/gpu_scheduler.c | 42 +- >> drivers/gpu/drm/amd/scheduler/gpu_scheduler.h | 24 +- >> drivers/gpu/drm/amd/scheduler/sched_fence.c | 22 +- >> drivers/gpu/drm/drm_atomic_helper.c | 6 +- >> drivers/gpu/drm/etnaviv/etnaviv_gem.c | 6 +- >> drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 46 +- >> drivers/gpu/drm/etnaviv/etnaviv_gpu.h | 4 +- >> drivers/gpu/drm/imx/ipuv3-crtc.c| 12 +- >> drivers/gpu/drm/msm/msm_drv.h | 2 +- >> drivers/gpu/drm/msm/msm_fence.c | 30 +- >> 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| 2 +- >> drivers/gpu/drm/msm/msm_gpu.c | 2 +- >> drivers/gpu/drm/nouveau/nouveau_bo.c| 6 +- >> drivers/gpu/drm/nouveau/nouveau_fence.c | 68 +-- >> 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
[RFC] dma-buf: Rename struct fence to dma_fence
Am 13.07.2016 um 16:10 schrieb Chris Wilson: > 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. > > As an indication of the scale of the flag day: > > 91 files changed, 904 insertions(+), 880 deletions(-) > > with the greatest victim being amdgpu. > > Just the highlights shown below. Oh, yes please. You won't believe how often I had to explain the difference between this fence infrastructure and an actual hardware fence (e.g. the hardware command) because people confused one with the other. Christian. > -Chris > > --- > drivers/base/Kconfig| 6 +- > drivers/dma-buf/Makefile| 2 +- > drivers/dma-buf/dma-buf.c | 28 +- > drivers/dma-buf/dma-fence.c | 535 > > drivers/dma-buf/fence.c | 532 > --- > drivers/dma-buf/reservation.c | 90 ++-- > drivers/dma-buf/seqno-fence.c | 18 +- > drivers/dma-buf/sw_sync.c | 44 +- > drivers/dma-buf/sync_debug.c| 9 +- > drivers/dma-buf/sync_debug.h| 13 +- > drivers/dma-buf/sync_file.c | 30 +- > drivers/gpu/drm/amd/amdgpu/amdgpu.h | 56 +-- > drivers/gpu/drm/amd/amdgpu/amdgpu_benchmark.c | 8 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 18 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 22 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 2 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 16 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 50 +-- > drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 10 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 18 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 2 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 4 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c | 24 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c| 56 +-- > 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 | 6 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 18 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.h | 4 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 22 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_vce.h | 4 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 56 +-- > drivers/gpu/drm/amd/amdgpu/cik_sdma.c | 8 +- > drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 8 +- > drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 16 +- > drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 8 +- > drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 8 +- > drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c | 6 +- > drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c | 6 +- > drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 6 +- > drivers/gpu/drm/amd/scheduler/gpu_sched_trace.h | 4 +- > drivers/gpu/drm/amd/scheduler/gpu_scheduler.c | 42 +- > drivers/gpu/drm/amd/scheduler/gpu_scheduler.h | 24 +- > drivers/gpu/drm/amd/scheduler/sched_fence.c | 22 +- > drivers/gpu/drm/drm_atomic_helper.c | 6 +- > drivers/gpu/drm/etnaviv/etnaviv_gem.c | 6 +- > drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 46 +- > drivers/gpu/drm/etnaviv/etnaviv_gpu.h | 4 +- > drivers/gpu/drm/imx/ipuv3-crtc.c| 12 +- > drivers/gpu/drm/msm/msm_drv.h | 2 +- > drivers/gpu/drm/msm/msm_fence.c | 30 +- > 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| 2 +- > drivers/gpu/drm/msm/msm_gpu.c | 2 +- > drivers/gpu/drm/nouveau/nouveau_bo.c| 6 +- > drivers/gpu/drm/nouveau/nouveau_fence.c | 68 +-- > 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 | 27 +- > drivers/gpu/drm/radeon/radeon.h | 10 +- > drivers/gpu/drm/radeon/radeon_device.c | 2 +- > drivers/gpu/drm/radeon/radeon_display.c | 8 +- >
[RFC] dma-buf: Rename struct fence to dma_fence
2016-07-13 Daniel Vetter : > On Wed, Jul 13, 2016 at 03:10: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. > > > > As an indication of the scale of the flag day: > > > > 91 files changed, 904 insertions(+), 880 deletions(-) > > > > with the greatest victim being amdgpu. > > > > Just the highlights shown below. > > +1 on dma_fence, for more consistency with dma_buf and everything else > dma_*. I think if we land this right before/after 4.8-rc1 through the drm > tree it should be minimally invasive. Worst case we'll have a fun merge > between drm.git and drm-intel.git (since drm-intel-next-queued doesn't get > closed while the merge window is open). +1 from me, we just need to make sure we don't create any merge issue. Gustavo
[RFC] dma-buf: Rename struct fence to dma_fence
On Wed, Jul 13, 2016 at 03:10: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. > > As an indication of the scale of the flag day: > > 91 files changed, 904 insertions(+), 880 deletions(-) > > with the greatest victim being amdgpu. > > Just the highlights shown below. +1 on dma_fence, for more consistency with dma_buf and everything else dma_*. I think if we land this right before/after 4.8-rc1 through the drm tree it should be minimally invasive. Worst case we'll have a fun merge between drm.git and drm-intel.git (since drm-intel-next-queued doesn't get closed while the merge window is open). Adding lots more people to gather their opinion. -Daniel > -Chris > > --- > drivers/base/Kconfig| 6 +- > drivers/dma-buf/Makefile| 2 +- > drivers/dma-buf/dma-buf.c | 28 +- > drivers/dma-buf/dma-fence.c | 535 > > drivers/dma-buf/fence.c | 532 --- > drivers/dma-buf/reservation.c | 90 ++-- > drivers/dma-buf/seqno-fence.c | 18 +- > drivers/dma-buf/sw_sync.c | 44 +- > drivers/dma-buf/sync_debug.c| 9 +- > drivers/dma-buf/sync_debug.h| 13 +- > drivers/dma-buf/sync_file.c | 30 +- > drivers/gpu/drm/amd/amdgpu/amdgpu.h | 56 +-- > drivers/gpu/drm/amd/amdgpu/amdgpu_benchmark.c | 8 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 18 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 22 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 2 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 16 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 50 +-- > drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 10 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 18 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 2 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 4 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c | 24 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c| 56 +-- > 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 | 6 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 18 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.h | 4 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 22 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_vce.h | 4 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 56 +-- > drivers/gpu/drm/amd/amdgpu/cik_sdma.c | 8 +- > drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 8 +- > drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 16 +- > drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 8 +- > drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 8 +- > drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c | 6 +- > drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c | 6 +- > drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 6 +- > drivers/gpu/drm/amd/scheduler/gpu_sched_trace.h | 4 +- > drivers/gpu/drm/amd/scheduler/gpu_scheduler.c | 42 +- > drivers/gpu/drm/amd/scheduler/gpu_scheduler.h | 24 +- > drivers/gpu/drm/amd/scheduler/sched_fence.c | 22 +- > drivers/gpu/drm/drm_atomic_helper.c | 6 +- > drivers/gpu/drm/etnaviv/etnaviv_gem.c | 6 +- > drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 46 +- > drivers/gpu/drm/etnaviv/etnaviv_gpu.h | 4 +- > drivers/gpu/drm/imx/ipuv3-crtc.c| 12 +- > drivers/gpu/drm/msm/msm_drv.h | 2 +- > drivers/gpu/drm/msm/msm_fence.c | 30 +- > 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| 2 +- > drivers/gpu/drm/msm/msm_gpu.c | 2 +- > drivers/gpu/drm/nouveau/nouveau_bo.c| 6 +- > drivers/gpu/drm/nouveau/nouveau_fence.c | 68 +-- > 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 | 27 +- > drivers/gpu/drm/radeon/radeon.h | 10 +- >
[RFC] dma-buf: Rename struct fence to dma_fence
On Wed, Jul 13, 2016 at 11:54:50PM +0900, Inki Dae wrote: > Hi, > > 2016-07-13 23:10 GMT+09:00 Chris Wilson : > > 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. > > > > As an indication of the scale of the flag day: > > > > 91 files changed, 904 insertions(+), 880 deletions(-) > > Seems files changed and below patch codes are not inconsistent. i.e., > I cannot see modified codes for Android sync driver. The cut'n'paste doesn't include the renames which the patch below does (i..e. it should be a more accurate representation of lines changed by ignoring the lines moved). > And Android sync driver - explicit fence - can use a fence object > regardless of DMA buffer. So it looks reasonable to use 'fence' as-is. > Was there any changes for Android sync driver to be dependent on DMA buffer? This was based on Gustova Padovan's destaged sync tree, so all the Android changes should be inside drivers/dma-buf/*sync* I was using grep to find all users of struct fence and callers of fence_*() so I don't think I missed any drivers/staging/ - and obviously this will have to repeated closer to the flag day. -Chris -- Chris Wilson, Intel Open Source Technology Centre
[RFC] dma-buf: Rename struct fence to dma_fence
On 13 July 2016 at 15:10, 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. > > As an indication of the scale of the flag day: > > 91 files changed, 904 insertions(+), 880 deletions(-) > > with the greatest victim being amdgpu. > > Just the highlights shown below. > -Chris > > --- > drivers/base/Kconfig| 6 +- > drivers/dma-buf/Makefile| 2 +- > drivers/dma-buf/dma-buf.c | 28 +- > drivers/dma-buf/dma-fence.c | 535 > > drivers/dma-buf/fence.c | 532 --- > drivers/dma-buf/reservation.c | 90 ++-- > drivers/dma-buf/seqno-fence.c | 18 +- > drivers/dma-buf/sw_sync.c | 44 +- > drivers/dma-buf/sync_debug.c| 9 +- > drivers/dma-buf/sync_debug.h| 13 +- > drivers/dma-buf/sync_file.c | 30 +- > drivers/gpu/drm/amd/amdgpu/amdgpu.h | 56 +-- > drivers/gpu/drm/amd/amdgpu/amdgpu_benchmark.c | 8 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 18 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 22 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 2 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 16 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 50 +-- > drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 10 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 18 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 2 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 4 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c | 24 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c| 56 +-- > 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 | 6 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 18 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.h | 4 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 22 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_vce.h | 4 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 56 +-- > drivers/gpu/drm/amd/amdgpu/cik_sdma.c | 8 +- > drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 8 +- > drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 16 +- > drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 8 +- > drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 8 +- > drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c | 6 +- > drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c | 6 +- > drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 6 +- > drivers/gpu/drm/amd/scheduler/gpu_sched_trace.h | 4 +- > drivers/gpu/drm/amd/scheduler/gpu_scheduler.c | 42 +- > drivers/gpu/drm/amd/scheduler/gpu_scheduler.h | 24 +- > drivers/gpu/drm/amd/scheduler/sched_fence.c | 22 +- > drivers/gpu/drm/drm_atomic_helper.c | 6 +- > drivers/gpu/drm/etnaviv/etnaviv_gem.c | 6 +- > drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 46 +- > drivers/gpu/drm/etnaviv/etnaviv_gpu.h | 4 +- > drivers/gpu/drm/imx/ipuv3-crtc.c| 12 +- > drivers/gpu/drm/msm/msm_drv.h | 2 +- > drivers/gpu/drm/msm/msm_fence.c | 30 +- > 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| 2 +- > drivers/gpu/drm/msm/msm_gpu.c | 2 +- > drivers/gpu/drm/nouveau/nouveau_bo.c| 6 +- > drivers/gpu/drm/nouveau/nouveau_fence.c | 68 +-- > 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 | 27 +- > 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 | 50 +-- > 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 | 2 +- >
[RFC] 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. As an indication of the scale of the flag day: 91 files changed, 904 insertions(+), 880 deletions(-) with the greatest victim being amdgpu. Just the highlights shown below. -Chris --- drivers/base/Kconfig| 6 +- drivers/dma-buf/Makefile| 2 +- drivers/dma-buf/dma-buf.c | 28 +- drivers/dma-buf/dma-fence.c | 535 drivers/dma-buf/fence.c | 532 --- drivers/dma-buf/reservation.c | 90 ++-- drivers/dma-buf/seqno-fence.c | 18 +- drivers/dma-buf/sw_sync.c | 44 +- drivers/dma-buf/sync_debug.c| 9 +- drivers/dma-buf/sync_debug.h| 13 +- drivers/dma-buf/sync_file.c | 30 +- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 56 +-- drivers/gpu/drm/amd/amdgpu/amdgpu_benchmark.c | 8 +- drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 18 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 22 +- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 16 +- drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 50 +-- drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 10 +- drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 18 +- drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 4 +- drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c | 24 +- drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c| 56 +-- 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 | 6 +- drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 18 +- drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.h | 4 +- drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 22 +- drivers/gpu/drm/amd/amdgpu/amdgpu_vce.h | 4 +- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 56 +-- drivers/gpu/drm/amd/amdgpu/cik_sdma.c | 8 +- drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 8 +- drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 16 +- drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 8 +- drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 8 +- drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c | 6 +- drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c | 6 +- drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 6 +- drivers/gpu/drm/amd/scheduler/gpu_sched_trace.h | 4 +- drivers/gpu/drm/amd/scheduler/gpu_scheduler.c | 42 +- drivers/gpu/drm/amd/scheduler/gpu_scheduler.h | 24 +- drivers/gpu/drm/amd/scheduler/sched_fence.c | 22 +- drivers/gpu/drm/drm_atomic_helper.c | 6 +- drivers/gpu/drm/etnaviv/etnaviv_gem.c | 6 +- drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 46 +- drivers/gpu/drm/etnaviv/etnaviv_gpu.h | 4 +- drivers/gpu/drm/imx/ipuv3-crtc.c| 12 +- drivers/gpu/drm/msm/msm_drv.h | 2 +- drivers/gpu/drm/msm/msm_fence.c | 30 +- 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| 2 +- drivers/gpu/drm/msm/msm_gpu.c | 2 +- drivers/gpu/drm/nouveau/nouveau_bo.c| 6 +- drivers/gpu/drm/nouveau/nouveau_fence.c | 68 +-- 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 | 27 +- 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 | 50 +-- 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 | 2 +- drivers/gpu/drm/ttm/ttm_execbuf_util.c | 3 +- drivers/gpu/drm/virtio/virtgpu_display.c| 2 +- drivers/gpu/drm/virtio/virtgpu_drv.h| 2 +- drivers/gpu/drm/virtio/virtgpu_fence.c | 22 +-
[RFC] dma-buf: Rename struct fence to dma_fence
On Wed, Jul 13, 2016 at 7:46 AM, Daniel Vetter wrote: > On Wed, Jul 13, 2016 at 03:10: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. >> >> As an indication of the scale of the flag day: >> >> 91 files changed, 904 insertions(+), 880 deletions(-) >> >> with the greatest victim being amdgpu. >> >> Just the highlights shown below. > > +1 on dma_fence, for more consistency with dma_buf and everything else > dma_*. I think if we land this right before/after 4.8-rc1 through the drm > tree it should be minimally invasive. Worst case we'll have a fun merge > between drm.git and drm-intel.git (since drm-intel-next-queued doesn't get > closed while the merge window is open). > > Adding lots more people to gather their opinion. LGTM, can you post the coccinelle script (assuming this is what you used) along with the patch so we can repro locally to confirm everything lines up? Sean > -Daniel > >> -Chris >> >> --- >> drivers/base/Kconfig| 6 +- >> drivers/dma-buf/Makefile| 2 +- >> drivers/dma-buf/dma-buf.c | 28 +- >> drivers/dma-buf/dma-fence.c | 535 >> >> drivers/dma-buf/fence.c | 532 >> --- >> drivers/dma-buf/reservation.c | 90 ++-- >> drivers/dma-buf/seqno-fence.c | 18 +- >> drivers/dma-buf/sw_sync.c | 44 +- >> drivers/dma-buf/sync_debug.c| 9 +- >> drivers/dma-buf/sync_debug.h| 13 +- >> drivers/dma-buf/sync_file.c | 30 +- >> drivers/gpu/drm/amd/amdgpu/amdgpu.h | 56 +-- >> drivers/gpu/drm/amd/amdgpu/amdgpu_benchmark.c | 8 +- >> drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 18 +- >> drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 22 +- >> drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 2 +- >> drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 16 +- >> drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 50 +-- >> drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 10 +- >> drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 18 +- >> drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 2 +- >> drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 4 +- >> drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c | 24 +- >> drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c| 56 +-- >> 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 | 6 +- >> drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 18 +- >> drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.h | 4 +- >> drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 22 +- >> drivers/gpu/drm/amd/amdgpu/amdgpu_vce.h | 4 +- >> drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 56 +-- >> drivers/gpu/drm/amd/amdgpu/cik_sdma.c | 8 +- >> drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 8 +- >> drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 16 +- >> drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 8 +- >> drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 8 +- >> drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c | 6 +- >> drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c | 6 +- >> drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 6 +- >> drivers/gpu/drm/amd/scheduler/gpu_sched_trace.h | 4 +- >> drivers/gpu/drm/amd/scheduler/gpu_scheduler.c | 42 +- >> drivers/gpu/drm/amd/scheduler/gpu_scheduler.h | 24 +- >> drivers/gpu/drm/amd/scheduler/sched_fence.c | 22 +- >> drivers/gpu/drm/drm_atomic_helper.c | 6 +- >> drivers/gpu/drm/etnaviv/etnaviv_gem.c | 6 +- >> drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 46 +- >> drivers/gpu/drm/etnaviv/etnaviv_gpu.h | 4 +- >> drivers/gpu/drm/imx/ipuv3-crtc.c| 12 +- >> drivers/gpu/drm/msm/msm_drv.h | 2 +- >> drivers/gpu/drm/msm/msm_fence.c | 30 +- >> 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| 2 +- >> drivers/gpu/drm/msm/msm_gpu.c | 2 +- >> drivers/gpu/drm/nouveau/nouveau_bo.c| 6 +- >> drivers/gpu/drm/nouveau/nouveau_fence.c | 68 +-- >> 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 +- >>
