geemili
/
drm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libdrm: wrap new flexible syncobj query interface v2 

v2: nit-picks fix

Signed-off-by: Chunming Zhou <david1.zhou@amd.com>
Cc: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Cc: Christian König <Christian.Koenig@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
For the xf86drm.[ch] part : Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
main
Chunming Zhou 2019-07-24 15:55:20 +08:00
parent 07f6717595
commit 0a7ad7df14
5 changed files with 46 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
amdgpu/amdgpu-symbol-check
View File

@ -57,6 +57,7 @@ amdgpu_cs_syncobj_export_sync_file2
amdgpu_cs_syncobj_import_sync_file amdgpu_cs_syncobj_import_sync_file
amdgpu_cs_syncobj_import_sync_file2 amdgpu_cs_syncobj_import_sync_file2
amdgpu_cs_syncobj_query amdgpu_cs_syncobj_query
amdgpu_cs_syncobj_query2
amdgpu_cs_syncobj_reset amdgpu_cs_syncobj_reset
amdgpu_cs_syncobj_signal amdgpu_cs_syncobj_signal
amdgpu_cs_syncobj_timeline_signal amdgpu_cs_syncobj_timeline_signal

18
amdgpu/amdgpu.h
View File

@ -1606,6 +1606,24 @@ int amdgpu_cs_syncobj_timeline_wait(amdgpu_device_handle dev,
int amdgpu_cs_syncobj_query(amdgpu_device_handle dev, int amdgpu_cs_syncobj_query(amdgpu_device_handle dev,
uint32_t *handles, uint64_t *points, uint32_t *handles, uint64_t *points,
unsigned num_handles); unsigned num_handles);
/**
* Query sync objects last signaled or submitted point.
*
* \param dev - \c [in] self-explanatory
* \param handles - \c [in] array of sync object handles
* \param points - \c [out] array of sync points returned, which presents
* syncobj payload.
* \param num_handles - \c [in] self-explanatory
* \param flags - \c [in] a bitmask of DRM_SYNCOBJ_QUERY_FLAGS_*
*
* \return 0 on success\n
* -ETIME - Timeout
* <0 - Negative POSIX Error code
*
*/
int amdgpu_cs_syncobj_query2(amdgpu_device_handle dev,
uint32_t *handles, uint64_t *points,
unsigned num_handles, uint32_t flags);
/** /**
* Export kernel sync object to shareable fd. * Export kernel sync object to shareable fd.

10
amdgpu/amdgpu_cs.c
View File

@ -740,6 +740,16 @@ drm_public int amdgpu_cs_syncobj_query(amdgpu_device_handle dev,
return drmSyncobjQuery(dev->fd, handles, points, num_handles); return drmSyncobjQuery(dev->fd, handles, points, num_handles);
} }
drm_public int amdgpu_cs_syncobj_query2(amdgpu_device_handle dev,
uint32_t *handles, uint64_t *points,
unsigned num_handles, uint32_t flags)
{
if (!dev)
return -EINVAL;
return drmSyncobjQuery2(dev->fd, handles, points, num_handles, flags);
}
drm_public int amdgpu_cs_export_syncobj(amdgpu_device_handle dev, drm_public int amdgpu_cs_export_syncobj(amdgpu_device_handle dev,
uint32_t handle, uint32_t handle,
int *shared_fd) int *shared_fd)

15
xf86drm.c
View File

@ -4252,6 +4252,21 @@ drm_public int drmSyncobjQuery(int fd, uint32_t *handles, uint64_t *points,
return 0; return 0;
} }
drm_public int drmSyncobjQuery2(int fd, uint32_t *handles, uint64_t *points,
uint32_t handle_count, uint32_t flags)
{
struct drm_syncobj_timeline_array args;
memclear(args);
args.handles = (uintptr_t)handles;
args.points = (uintptr_t)points;
args.count_handles = handle_count;
args.flags = flags;
return drmIoctl(fd, DRM_IOCTL_SYNCOBJ_QUERY, &args);
}
drm_public int drmSyncobjTransfer(int fd, drm_public int drmSyncobjTransfer(int fd,
uint32_t dst_handle, uint64_t dst_point, uint32_t dst_handle, uint64_t dst_point,
uint32_t src_handle, uint64_t src_point, uint32_t src_handle, uint64_t src_point,

2
xf86drm.h
View File

@ -896,6 +896,8 @@ extern int drmSyncobjTimelineWait(int fd, uint32_t *handles, uint64_t *points,
uint32_t *first_signaled); uint32_t *first_signaled);
extern int drmSyncobjQuery(int fd, uint32_t *handles, uint64_t *points, extern int drmSyncobjQuery(int fd, uint32_t *handles, uint64_t *points,
uint32_t handle_count); uint32_t handle_count);
extern int drmSyncobjQuery2(int fd, uint32_t *handles, uint64_t *points,
uint32_t handle_count, uint32_t flags);
extern int drmSyncobjTransfer(int fd, extern int drmSyncobjTransfer(int fd,
uint32_t dst_handle, uint64_t dst_point, uint32_t dst_handle, uint64_t dst_point,
uint32_t src_handle, uint64_t src_point, uint32_t src_handle, uint64_t src_point,