On 13 July 2016 at 15:10, Chris Wilson <chris@xxxxxxxxxxxxxxxxxx> 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 +- > 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 +- > drivers/gpu/drm/virtio/virtgpu_ioctl.c | 12 +- > drivers/gpu/drm/vmwgfx/vmwgfx_fence.c | 40 +- > drivers/gpu/drm/vmwgfx/vmwgfx_fence.h | 8 +- > drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | 2 +- > include/drm/drm_crtc.h | 4 +- > include/drm/ttm/ttm_bo_driver.h | 2 +- > include/drm/ttm/ttm_execbuf_util.h | 2 +- > include/linux/dma-buf.h | 4 +- > include/linux/dma-fence.h | 392 +++++++++++++++++ > include/linux/fence.h | 379 ----------------- > include/linux/reservation.h | 28 +- > include/linux/seqno-fence.h | 16 +- > include/linux/sync_file.h | 8 +- > include/trace/events/dma-fence.h | 128 ++++++ > include/trace/events/fence.h | 128 ------ > 94 files changed, 1719 insertions(+), 1695 deletions(-) > create mode 100644 drivers/dma-buf/dma-fence.c > delete mode 100644 drivers/dma-buf/fence.c > create mode 100644 include/linux/dma-fence.h > delete mode 100644 include/linux/fence.h > create mode 100644 include/trace/events/dma-fence.h > delete mode 100644 include/trace/events/fence.h > With the following git will generate "file moved" patches by default. $ git config --global diff.renames true Note: such patches are unlikely to work with `patch'. Sharing for people who want to change the default format-patch behaviour :-) Regards, Emil _______________________________________________ dri-devel mailing list dri-devel@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/dri-devel
