From: Gustavo Padovan gustavo.padovan@collabora.co.uk
This patch series de-stage the sync framework, and in order to accomplish that a bunch of cleanups/improvements on the sync and fence were made.
The sync framework contained some abstractions around struct fence and those were removed in the de-staging process among other changes:
Userspace visible changes -------------------------
* The sw_sync file was moved from /dev/sw_sync to <debugfs>/sync/sw_sync. No other change.
Kernel API changes ------------------
* struct sync_timeline is now struct fence_timeline * sync_timeline_ops is now fence_timeline_ops and they now carry struct fence as parameter instead of struct sync_pt * a .cleanup() fence op was added to allow sync_fence to run a cleanup when the fence_timeline is destroyed * added fence_add_used_data() to pass a private point to struct fence. This pointer is sent back on the .cleanup op. * The sync timeline function were moved to be fence_timeline functions: - sync_timeline_create() -> fence_timeline_create() - sync_timeline_get() -> fence_timeline_get() - sync_timeline_put() -> fence_timeline_put() - sync_timeline_destroy() -> fence_timeline_destroy() - sync_timeline_signal() -> fence_timeline_signal()
* sync_pt_create() was replaced be fence_create_on_timeline()
Internal changes ----------------
* fence_timeline_ops was removed in favor of direct use fence_ops * fence default functions were created for fence_ops * removed structs sync_pt, sw_sync_timeline and sw_sync_pt
Gustavo Padovan (29): staging/android: fix sync framework documentation staging/android: fix checkpatch warning staging/android: rename sync_fence_release staging/android: rename 'android_fence' to 'sync_fence' staging/android: remove not used sync_timeline ops staging/android: create a 'sync' dir for debugfs information staging/android: move sw_sync file to debugfs file staging/android: Remove WARN_ON_ONCE when releasing sync_fence staging/android: rename struct sync_fence's variables to 'sync_fence' staging/android: rename 'sync_pt' to 'fence' in struct sync_fence_cb dma-buf/fence: move sync_timeline to fence_timeline staging/android: remove struct sync_pt dma-buf/fence: create fence_default_enable_signaling() dma-buf/fence: create fence_default_release() dma-buf/fence: create fence_default_get_driver_name() dma-buf/fence: create fence_default_timeline_name() dma-buf/fence: store last signaled value on fence timeline dma-buf/fence: create default .fence_value_str() and .timeline_value_str() dma-buf/fence: create fence_default_fill_driver_data() dma-buf/fence: remove fence_timeline_ops dma-buf/fence: add fence_create_on_timeline() staging/android: remove sync_pt_create() staging/android: remove sw_sync_timeline and sw_sync_pt dma-buf/fence: add debug to fence timeline dma-buf/fence: remove unused var from fence_timeline_signal() dma-buf/fence: remove pointless fence_timeline_signal at destroy phase dma-buf/fence: add .cleanup() callback staging/android: use .cleanup() to interrupt any sync_fence waiter dma-buf/fence: de-stage sync framework
drivers/Kconfig | 2 + drivers/dma-buf/Kconfig | 22 + drivers/dma-buf/Makefile | 4 +- drivers/dma-buf/fence.c | 333 ++++++++++ drivers/dma-buf/fence_debug.c | 128 ++++ drivers/dma-buf/sw_sync.c | 65 ++ drivers/dma-buf/sync.c | 527 +++++++++++++++ drivers/dma-buf/sync_debug.c | 279 ++++++++ drivers/staging/android/Kconfig | 28 - drivers/staging/android/Makefile | 2 - drivers/staging/android/sw_sync.c | 260 -------- drivers/staging/android/sync.c | 732 --------------------- drivers/staging/android/sync.h | 366 ----------- drivers/staging/android/sync_debug.c | 256 ------- include/linux/fence.h | 77 +++ .../staging/android => include/linux}/sw_sync.h | 30 +- include/linux/sync.h | 201 ++++++ include/trace/events/fence.h | 18 + .../android/trace => include/trace/events}/sync.h | 41 +- .../android/uapi => include/uapi/linux}/sw_sync.h | 0 .../android/uapi => include/uapi/linux}/sync.h | 0 21 files changed, 1672 insertions(+), 1699 deletions(-) create mode 100644 drivers/dma-buf/Kconfig create mode 100644 drivers/dma-buf/fence_debug.c create mode 100644 drivers/dma-buf/sw_sync.c create mode 100644 drivers/dma-buf/sync.c create mode 100644 drivers/dma-buf/sync_debug.c delete mode 100644 drivers/staging/android/sw_sync.c delete mode 100644 drivers/staging/android/sync.c delete mode 100644 drivers/staging/android/sync.h delete mode 100644 drivers/staging/android/sync_debug.c rename {drivers/staging/android => include/linux}/sw_sync.h (55%) create mode 100644 include/linux/sync.h rename {drivers/staging/android/trace => include/trace/events}/sync.h (53%) rename {drivers/staging/android/uapi => include/uapi/linux}/sw_sync.h (100%) rename {drivers/staging/android/uapi => include/uapi/linux}/sync.h (100%)