[PULL REQUEST] ttm fence conversion
Maarten Lankhorst
maarten.lankhorst at canonical.com
Mon Sep 1 04:34:59 PDT 2014
The following changes since commit 04cd214516d8a6f0f8c0116185d6e360df0860d2:
Merge branch 'drm-next-3.18' of git://people.freedesktop.org/~agd5f/linux into drm-next (2014-08-28 13:45:45 +1000)
are available in the git repository at:
ssh://people.freedesktop.org/~mlankhorst/linux for-airlied-next
for you to fetch changes up to d591829ffd785ee27c82becc67673ce70b21cb83:
drm/nouveau: use shared fences for readable objects (2014-09-01 11:09:39 +0200)
\o/ radeon gpu reset rework is in -next, time for fences!
----------------------------------------------------------------
Maarten Lankhorst (18):
drm/nouveau: add reservation to nouveau_gem_ioctl_cpu_prep
drm/nouveau: require reservations for nouveau_fence_sync and nouveau_bo_fence
drm/ttm: call ttm_bo_wait while inside a reservation
drm/ttm: kill fence_lock
drm/ttm: add interruptible parameter to ttm_eu_reserve_buffers
drm/ttm: kill off some members to ttm_validate_buffer
drm/radeon: use common fence implementation for fences, v3
drm/vmwgfx: get rid of different types of fence_flags entirely
drm/vmwgfx: rework to new fence interface, v2
drm/nouveau: rework to new fence interface
drm/qxl: rework to new fence interface
drm/ttm: flip the switch, and convert to dma_fence
drm/nouveau: use rcu in nouveau_gem_ioctl_cpu_prep
drm/radeon: use rcu waits in some ioctls
drm/vmwgfx: use rcu in vmw_user_dmabuf_synccpu_grab
drm/ttm: use rcu in core ttm
drm/nouveau: Keep only a single list for validation.
drm/nouveau: use shared fences for readable objects
drivers/gpu/drm/nouveau/nouveau_bo.c | 64 +---
drivers/gpu/drm/nouveau/nouveau_bo.h | 2 +-
drivers/gpu/drm/nouveau/nouveau_display.c | 27 +-
drivers/gpu/drm/nouveau/nouveau_fence.c | 518 ++++++++++++++++++++----------
drivers/gpu/drm/nouveau/nouveau_fence.h | 26 +-
drivers/gpu/drm/nouveau/nouveau_gem.c | 178 +++++-----
drivers/gpu/drm/nouveau/nv04_fence.c | 6 +-
drivers/gpu/drm/nouveau/nv10_fence.c | 6 +-
drivers/gpu/drm/nouveau/nv17_fence.c | 4 +-
drivers/gpu/drm/nouveau/nv50_fence.c | 4 +-
drivers/gpu/drm/nouveau/nv84_fence.c | 22 +-
drivers/gpu/drm/qxl/Makefile | 2 +-
drivers/gpu/drm/qxl/qxl_cmd.c | 7 -
drivers/gpu/drm/qxl/qxl_debugfs.c | 16 +-
drivers/gpu/drm/qxl/qxl_drv.h | 20 +-
drivers/gpu/drm/qxl/qxl_fence.c | 91 ------
drivers/gpu/drm/qxl/qxl_kms.c | 1 +
drivers/gpu/drm/qxl/qxl_object.c | 2 -
drivers/gpu/drm/qxl/qxl_object.h | 6 +-
drivers/gpu/drm/qxl/qxl_release.c | 172 ++++++++--
drivers/gpu/drm/qxl/qxl_ttm.c | 93 ------
drivers/gpu/drm/radeon/radeon.h | 15 +-
drivers/gpu/drm/radeon/radeon_cs.c | 10 +-
drivers/gpu/drm/radeon/radeon_device.c | 6 +-
drivers/gpu/drm/radeon/radeon_display.c | 7 +-
drivers/gpu/drm/radeon/radeon_fence.c | 256 +++++++++++++--
drivers/gpu/drm/radeon/radeon_gem.c | 20 +-
drivers/gpu/drm/radeon/radeon_irq_kms.c | 43 +++
drivers/gpu/drm/radeon/radeon_mn.c | 6 +-
drivers/gpu/drm/radeon/radeon_object.c | 8 +-
drivers/gpu/drm/radeon/radeon_ttm.c | 34 +-
drivers/gpu/drm/radeon/radeon_uvd.c | 6 +-
drivers/gpu/drm/radeon/radeon_vm.c | 17 +-
drivers/gpu/drm/ttm/ttm_bo.c | 187 +++++------
drivers/gpu/drm/ttm/ttm_bo_util.c | 28 +-
drivers/gpu/drm/ttm/ttm_bo_vm.c | 3 -
drivers/gpu/drm/ttm/ttm_execbuf_util.c | 146 +++------
drivers/gpu/drm/vmwgfx/vmwgfx_buffer.c | 47 ---
drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 2 +-
drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 24 +-
drivers/gpu/drm/vmwgfx/vmwgfx_fence.c | 346 +++++++++++---------
drivers/gpu/drm/vmwgfx/vmwgfx_fence.h | 35 +-
drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c | 11 +-
drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | 43 ++-
include/drm/ttm/ttm_bo_api.h | 7 +-
include/drm/ttm/ttm_bo_driver.h | 29 +-
include/drm/ttm/ttm_execbuf_util.h | 22 +-
47 files changed, 1396 insertions(+), 1229 deletions(-)
delete mode 100644 drivers/gpu/drm/qxl/qxl_fence.c
More information about the dri-devel
mailing list