From 70f0700e60d66f8b25e33c8f5efe57cb3d4eb534 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Sat, 17 Dec 2016 12:36:21 +0000 Subject: lib/sw_sync: Indicate that sync_merge() operates and create a sync_fence Improvements to self-documentating API that matches the rest of sw_sync. Signed-off-by: Chris Wilson --- lib/sw_sync.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'lib/sw_sync.h') diff --git a/lib/sw_sync.h b/lib/sw_sync.h index abcdc523..d7629241 100644 --- a/lib/sw_sync.h +++ b/lib/sw_sync.h @@ -31,15 +31,17 @@ #define SW_SYNC_FENCE_STATUS_ACTIVE (0) #define SW_SYNC_FENCE_STATUS_SIGNALED (1) +void igt_require_sw_sync(void); + int sw_sync_timeline_create(void); int __sw_sync_fence_create(int fd, uint32_t seqno); int sw_sync_fence_create(int fd, uint32_t seqno); void sw_sync_timeline_inc(int fd, uint32_t count); -int sync_merge(int fd1, int fd2); + +int sync_fence_merge(int fd1, int fd2); int sync_fence_wait(int fence, int timeout); int sync_fence_count(int fd); int sync_fence_count_status(int fd, int status); -void igt_require_sw_sync(void); #endif -- cgit v1.2.3