libdrm: wrap new flexible syncobj query interface v2
Subsystems (2)
PATCH 1/1 libdrm: wrap new flexible syncobj query interface v2
v2: nit-picks fix
--- amdgpu/amdgpu-symbol-check | 1 + amdgpu/amdgpu.h | 18 ++++++++++++++++++ amdgpu/amdgpu_cs.c | 10 ++++++++++ include/drm/drm.h | 3 ++- xf86drm.c | 15 +++++++++++++++ xf86drm.h | 2 ++ 6 files changed, 48 insertions(+), 1 deletion(-)
amdgpu/amdgpu-symbol-check +1 -0
@@ -56,6 +56,7 @@ amdgpu_cs_syncobj_export_sync_file2 amdgpu_cs_syncobj_import_sync_file amdgpu_cs_syncobj_import_sync_file2 amdgpu_cs_syncobj_query +amdgpu_cs_syncobj_query2 amdgpu_cs_syncobj_reset amdgpu_cs_syncobj_signal amdgpu_cs_syncobj_timeline_signal
amdgpu/amdgpu.h +18 -0
@@ -1591,6 +1591,24 @@ int amdgpu_cs_syncobj_timeline_wait(amdgpu_device_handle dev,int amdgpu_cs_syncobj_query (amdgpu_device_handle dev,uint32_t *handles,uint64_t *points,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.
amdgpu/amdgpu_cs.c +10 -0
@@ -721,6 +721,16 @@ drm_public int amdgpu_cs_syncobj_query(amdgpu_device_handle dev,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 (NULL == dev) +return -EINVAL ; + +return drmSyncobjQuery2 (dev->fd, handles, points, num_handles, flags); +} + drm_public int amdgpu_cs_export_syncobj(amdgpu_device_handle dev,uint32_t handle,int *shared_fd)
include/drm/drm.h +2 -1
@@ -771,11 +771,12 @@ struct drm_syncobj_array {__u32 pad; }; +#define DRM_SYNCOBJ_QUERY_FLAGS_LAST_SUBMITTED (1 << 0)/* last available point on timeline syncobj */ struct drm_syncobj_timeline_array {__u64 handles;__u64 points;__u32 count_handles; -__u32 pad; +__u32 flags; };
xf86drm.c +15 -0
@@ -4314,6 +4314,21 @@ drm_public int drmSyncobjQuery(int fd, uint32_t *handles, uint64_t *points,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, uint32_t dst_handle, uint64_t dst_point, uint32_t src_handle, uint64_t src_point,
xf86drm.h +2 -0
@@ -884,6 +884,8 @@ extern int drmSyncobjTimelineWait(int fd, uint32_t *handles, uint64_t *points, uint32_t *first_signaled);extern int drmSyncobjQuery (int fd,uint32_t *handles,uint64_t *points,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, uint32_t dst_handle, uint64_t dst_point, uint32_t src_handle, uint64_t src_point,
Signature · 6 lines
2.17.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Quoted 5 lines · Chunming Zhou
v2: nit-picks fix
Signed-off-by Chunming Zhou <[email protected]>Cc Lionel Landwerlin <[email protected]>Cc Christian König <[email protected]>
For the xf86drm.[ch] part : Reviewed-by: Lionel Landwerlin <[email protected]>
I'll let someone from AMD look at the amdgpu bit.
Thanks!
-Lionel
Quoted 120 lines
--- amdgpu/amdgpu-symbol-check | 1 + amdgpu/amdgpu.h | 18 ++++++++++++++++++ amdgpu/amdgpu_cs.c | 10 ++++++++++ include/drm/drm.h | 3 ++- xf86drm.c | 15 +++++++++++++++ xf86drm.h | 2 ++ 6 files changed, 48 insertions(+), 1 deletion(-)amdgpu/amdgpu-symbol-check +1
-0@@ -56,6 +56,7 @@ amdgpu_cs_syncobj_export_sync_file2 amdgpu_cs_syncobj_import_sync_file amdgpu_cs_syncobj_import_sync_file2 amdgpu_cs_syncobj_query +amdgpu_cs_syncobj_query2 amdgpu_cs_syncobj_reset amdgpu_cs_syncobj_signal amdgpu_cs_syncobj_timeline_signalamdgpu/amdgpu.h +18
-0@@ -1591,6 +1591,24 @@ int amdgpu_cs_syncobj_timeline_wait(amdgpu_device_handle dev,int amdgpu_cs_syncobj_query (amdgpu_device_handle dev,uint32_t *handles,uint64_t *points,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. amdgpu/amdgpu_cs.c +10
-0@@ -721,6 +721,16 @@ drm_public int amdgpu_cs_syncobj_query(amdgpu_device_handle dev,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 (NULL == dev) +return -EINVAL ; + +return drmSyncobjQuery2 (dev->fd, handles, points, num_handles, flags); +} + drm_public int amdgpu_cs_export_syncobj(amdgpu_device_handle dev,uint32_t handle,int *shared_fd)include/drm/drm.h +2
-1@@ -771,11 +771,12 @@ struct drm_syncobj_array {__u32 pad; }; +#define DRM_SYNCOBJ_QUERY_FLAGS_LAST_SUBMITTED (1 << 0)/* last available point on timeline syncobj */ struct drm_syncobj_timeline_array {__u64 handles;__u64 points;__u32 count_handles; -__u32 pad; +__u32 flags; };xf86drm.c +15
-0@@ -4314,6 +4314,21 @@ drm_public int drmSyncobjQuery(int fd, uint32_t *handles, uint64_t *points,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, uint32_t dst_handle, uint64_t dst_point, uint32_t src_handle, uint64_t src_point,xf86drm.h +0
-0
xf86drm.h extern int drmSyncobjTimelineWait(int fd, uint32_t *handles, uint64_t *points, · line 891
Quoted 8 lines
xf86drm.h +2
-0@@ -884,6 +884,8 @@ extern int drmSyncobjTimelineWait(int fd, uint32_t *handles, uint64_t *points, uint32_t *first_signaled);extern int drmSyncobjQuery (int fd,uint32_t *handles,uint64_t *points,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, uint32_t dst_handle, uint64_t dst_point, uint32_t src_handle, uint64_t src_point,
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Am 25.07.19 um 10:02 schrieb Lionel Landwerlin:
Quoted 77 lines · Chunming Zhou
Quoted 5 lines
v2: nit-picks fix
Signed-off-by Chunming Zhou <[email protected]>Cc Lionel Landwerlin <[email protected]>Cc Christian König <[email protected]>For the xf86drm.[ch] part : Reviewed-by: Lionel Landwerlin <[email protected]>
I'll let someone from AMD look at the amdgpu bit.
Thanks!
-Lionel
Quoted 57 lines
---
amdgpu/amdgpu-symbol-check | 1 + amdgpu/amdgpu.h | 18 ++++++++++++++++++ amdgpu/amdgpu_cs.c | 10 ++++++++++ include/drm/drm.h | 3 ++- xf86drm.c | 15 +++++++++++++++ xf86drm.h | 2 ++6 files changed, 48 insertions(+), 1 deletion(-)amdgpu/amdgpu-symbol-check +0
-0@@ -56,6 +56,7 @@ amdgpu_cs_syncobj_export_sync_file2
amdgpu_cs_syncobj_import_sync_file
amdgpu_cs_syncobj_import_sync_file2
amdgpu_cs_syncobj_query
+amdgpu_cs_syncobj_query2
amdgpu_cs_syncobj_reset
amdgpu_cs_syncobj_signal
amdgpu_cs_syncobj_timeline_signalamdgpu/amdgpu.h +6
-0@@ -1591,6 +1591,24 @@ int amdgpu_cs_syncobj_timeline_wait(amdgpu_device_handle dev, int amdgpu_cs_syncobj_query(amdgpu_device_handle dev, uint32_t *handles, uint64_t *points, 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.
+ * \paramnum_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,
+ unsignednum_handles,uint32_tflags); /**
* Export kernel sync object to shareable fd.amdgpu/amdgpu_cs.c +0
-0@@ -721,6 +721,16 @@ drm_public int amdgpu_cs_syncobj_query(amdgpu_device_handle dev,
Quoted 8 lines
amdgpu/amdgpu_cs.c drm_public int amdgpu_cs_syncobj_query(amdgpu_device_handle dev, · line 729
Quoted 8 lines
amdgpu/amdgpu_cs.c +5
-0return 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 (NULL == dev) + return -EINVAL;
One nit pick: coding style for NULL checks seems be !dev in this file.
Apart from that the patch is Reviewed-by: Christian König <[email protected]>
Quoted 59 lines
Quoted 59 lines
amdgpu/amdgpu_cs.c +4
-0+ + return drmSyncobjQuery2(dev->fd, handles, points, num_handles, flags); +} + drm_public int amdgpu_cs_export_syncobj(amdgpu_device_handle dev,
uint32_thandle,
int*shared_fd)include/drm/drm.h +0
-0@@ -771,11 +771,12 @@ struct drm_syncobj_array { __u32 pad; };+#define
DRM_SYNCOBJ_QUERY_FLAGS_LAST_SUBMITTED(1 << 0) /* last available point on timeline syncobj */
structdrm_syncobj_timeline_array{
__u64handles;
__u64points;
__u32count_handles;
-__u32pad;
+__u32flags;
};
diff --gita/xf86drm.cb/xf86drm.c
index953fc762..28a61264100644xf86drm.c +14
-0@@ -4314,6 +4314,21 @@ drm_public int drmSyncobjQuery(int fd, uint32_t *handles, uint64_t *points, 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,
uint32_tdst_handle,uint64_tdst_point,uint32_tsrc_handle,uint64_tsrc_point,xf86drm.h +0
-0@@ -884,6 +884,8 @@ extern int drmSyncobjTimelineWait(int fd, uint32_t *handles, uint64_t *points, uint32_t *first_signaled);extern int drmSyncobjQuery(int fd,
uint32_t*handles,uint64_t
Quoted 10 lines
Quoted 8 lines
*points,
uint32_thandle_count);
+extern int drmSyncobjQuery2(int fd,uint32_t*handles,uint64_t*points,
+uint32_thandle_count,uint32_tflags); extern int drmSyncobjTransfer(int fd,
uint32_tdst_handle,uint64_tdst_point,uint32_tsrc_handle,uint64_tsrc_point,
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel