public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-08-21 06:50:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

drm/syncobj: Extend EXPORT_SYNC_FILE for timeline syncobjs

Browse source 
Add support for exporting a dma_fence fd for a specific point on a
timeline.  This is needed for vtest/vpipe[1][2] to implement timeline
syncobj support, as it needs a way to turn a point on a timeline back
into a dma_fence fd.  It also closes an odd omission from the syncobj
UAPI.

[1] https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/33433
[2] https://gitlab.freedesktop.org/virgl/virglrenderer/-/merge_requests/805

v2: Add DRM_SYNCOBJ_HANDLE_TO_FD_FLAGS_TIMELINE
v3: Add unstaged uabi header hunk
v4: Also handle IMPORT_SYNC_FILE case
v5: Address comments from Dmitry
v6: checkpatch.pl nits

Signed-off-by: Rob Clark <robdclark@chromium.org>
Reviewed-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Dmitry Osipenko <dmitry.osipenko@collabora.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20250401155758.48855-1-robdclark@gmail.com
Signed-off-by: Christian König <christian.koenig@amd.com>
This commit is contained in:
Rob Clark 2025-04-01 08:57:58 -07:00 • committed by Christian König
parent de04bb0089
commit c2d3a73006
2 changed files with 41 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
drivers/gpu/drm/drm_syncobj.c
View file

@ -741,7 +741,7 @@ static int drm_syncobj_fd_to_handle(struct drm_file *file_private,
} }
static int drm_syncobj_import_sync_file_fence(struct drm_file *file_private, static int drm_syncobj_import_sync_file_fence(struct drm_file *file_private,
int fd, int handle) int fd, int handle, u64 point)
{ {
struct dma_fence *fence = sync_file_get_fence(fd); struct dma_fence *fence = sync_file_get_fence(fd);
struct drm_syncobj *syncobj; struct drm_syncobj *syncobj;
@ -755,14 +755,24 @@ static int drm_syncobj_import_sync_file_fence(struct drm_file *file_private,
return -ENOENT; return -ENOENT;
} }
drm_syncobj_replace_fence(syncobj, fence); if (point) {
struct dma_fence_chain *chain = dma_fence_chain_alloc();
if (!chain)
return -ENOMEM;
drm_syncobj_add_point(syncobj, chain, fence, point);
} else {
drm_syncobj_replace_fence(syncobj, fence);
}
dma_fence_put(fence); dma_fence_put(fence);
drm_syncobj_put(syncobj); drm_syncobj_put(syncobj);
return 0; return 0;
} }
static int drm_syncobj_export_sync_file(struct drm_file *file_private, static int drm_syncobj_export_sync_file(struct drm_file *file_private,
int handle, int *p_fd) int handle, u64 point, int *p_fd)
{ {
int ret; int ret;
struct dma_fence *fence; struct dma_fence *fence;
@ -772,7 +782,7 @@ static int drm_syncobj_export_sync_file(struct drm_file *file_private,
if (fd < 0) if (fd < 0)
return fd; return fd;
ret = drm_syncobj_find_fence(file_private, handle, 0, 0, &fence); ret = drm_syncobj_find_fence(file_private, handle, point, 0, &fence);
if (ret) if (ret)
goto err_put_fd; goto err_put_fd;
@ -869,6 +879,9 @@ drm_syncobj_handle_to_fd_ioctl(struct drm_device *dev, void *data,
struct drm_file *file_private) struct drm_file *file_private)
{ {
struct drm_syncobj_handle *args = data; struct drm_syncobj_handle *args = data;
unsigned int valid_flags = DRM_SYNCOBJ_HANDLE_TO_FD_FLAGS_TIMELINE |
DRM_SYNCOBJ_HANDLE_TO_FD_FLAGS_EXPORT_SYNC_FILE;
u64 point = 0;
if (!drm_core_check_feature(dev, DRIVER_SYNCOBJ)) if (!drm_core_check_feature(dev, DRIVER_SYNCOBJ))
return -EOPNOTSUPP; return -EOPNOTSUPP;
@ -876,13 +889,18 @@ drm_syncobj_handle_to_fd_ioctl(struct drm_device *dev, void *data,
if (args->pad) if (args->pad)
return -EINVAL; return -EINVAL;
if (args->flags != 0 && if (args->flags & ~valid_flags)
args->flags != DRM_SYNCOBJ_HANDLE_TO_FD_FLAGS_EXPORT_SYNC_FILE)
return -EINVAL; return -EINVAL;
if (args->flags & DRM_SYNCOBJ_HANDLE_TO_FD_FLAGS_TIMELINE)
point = args->point;
if (args->flags & DRM_SYNCOBJ_HANDLE_TO_FD_FLAGS_EXPORT_SYNC_FILE) if (args->flags & DRM_SYNCOBJ_HANDLE_TO_FD_FLAGS_EXPORT_SYNC_FILE)
return drm_syncobj_export_sync_file(file_private, args->handle, return drm_syncobj_export_sync_file(file_private, args->handle,
&args->fd); point, &args->fd);
if (args->point)
return -EINVAL;
return drm_syncobj_handle_to_fd(file_private, args->handle, return drm_syncobj_handle_to_fd(file_private, args->handle,
&args->fd); &args->fd);
@ -893,6 +911,9 @@ drm_syncobj_fd_to_handle_ioctl(struct drm_device *dev, void *data,
struct drm_file *file_private) struct drm_file *file_private)
{ {
struct drm_syncobj_handle *args = data; struct drm_syncobj_handle *args = data;
unsigned int valid_flags = DRM_SYNCOBJ_FD_TO_HANDLE_FLAGS_TIMELINE |
DRM_SYNCOBJ_FD_TO_HANDLE_FLAGS_IMPORT_SYNC_FILE;
u64 point = 0;
if (!drm_core_check_feature(dev, DRIVER_SYNCOBJ)) if (!drm_core_check_feature(dev, DRIVER_SYNCOBJ))
return -EOPNOTSUPP; return -EOPNOTSUPP;
@ -900,14 +921,20 @@ drm_syncobj_fd_to_handle_ioctl(struct drm_device *dev, void *data,
if (args->pad) if (args->pad)
return -EINVAL; return -EINVAL;
if (args->flags != 0 && if (args->flags & ~valid_flags)
args->flags != DRM_SYNCOBJ_FD_TO_HANDLE_FLAGS_IMPORT_SYNC_FILE)
return -EINVAL; return -EINVAL;
if (args->flags & DRM_SYNCOBJ_FD_TO_HANDLE_FLAGS_TIMELINE)
point = args->point;
if (args->flags & DRM_SYNCOBJ_FD_TO_HANDLE_FLAGS_IMPORT_SYNC_FILE) if (args->flags & DRM_SYNCOBJ_FD_TO_HANDLE_FLAGS_IMPORT_SYNC_FILE)
return drm_syncobj_import_sync_file_fence(file_private, return drm_syncobj_import_sync_file_fence(file_private,
args->fd, args->fd,
args->handle); args->handle,
point);
if (args->point)
return -EINVAL;
return drm_syncobj_fd_to_handle(file_private, args->fd, return drm_syncobj_fd_to_handle(file_private, args->fd,
&args->handle); &args->handle);

4
include/uapi/drm/drm.h
View file

@ -905,13 +905,17 @@ struct drm_syncobj_destroy {
}; };
#define DRM_SYNCOBJ_FD_TO_HANDLE_FLAGS_IMPORT_SYNC_FILE (1 << 0) #define DRM_SYNCOBJ_FD_TO_HANDLE_FLAGS_IMPORT_SYNC_FILE (1 << 0)
#define DRM_SYNCOBJ_FD_TO_HANDLE_FLAGS_TIMELINE (1 << 1)
#define DRM_SYNCOBJ_HANDLE_TO_FD_FLAGS_EXPORT_SYNC_FILE (1 << 0) #define DRM_SYNCOBJ_HANDLE_TO_FD_FLAGS_EXPORT_SYNC_FILE (1 << 0)
#define DRM_SYNCOBJ_HANDLE_TO_FD_FLAGS_TIMELINE (1 << 1)
struct drm_syncobj_handle { struct drm_syncobj_handle {
__u32 handle; __u32 handle;
__u32 flags; __u32 flags;
__s32 fd; __s32 fd;
__u32 pad; __u32 pad;
__u64 point;
}; };
struct drm_syncobj_transfer { struct drm_syncobj_transfer {