[libdrm,2/7] add timeline wait/query ioctl v2

Submitted by Zhou, David(ChunMing) on May 13, 2019, 9:53 a.m.

Details

Message ID 20190513095305.14110-2-david1.zhou@amd.com
State New
Headers show
Series "Series without cover letter" ( rev: 1 ) in AMD X.Org drivers

Not browsing as part of any series.

Commit Message

Zhou, David(ChunMing) May 13, 2019, 9:53 a.m.
v2: drop export/import

Signed-off-by: Chunming Zhou <david1.zhou@amd.com>
---
 xf86drm.c | 44 ++++++++++++++++++++++++++++++++++++++++++++
 xf86drm.h |  6 ++++++
 2 files changed, 50 insertions(+)

Patch hide | download patch | download mbox

diff --git a/xf86drm.c b/xf86drm.c
index 2c19376b..17e3d880 100644
--- a/xf86drm.c
+++ b/xf86drm.c
@@ -4256,3 +4256,47 @@  drm_public int drmSyncobjSignal(int fd, const uint32_t *handles,
     ret = drmIoctl(fd, DRM_IOCTL_SYNCOBJ_SIGNAL, &args);
     return ret;
 }
+
+drm_public int drmSyncobjTimelineWait(int fd, uint32_t *handles, uint64_t *points,
+				      unsigned num_handles,
+				      int64_t timeout_nsec, unsigned flags,
+				      uint32_t *first_signaled)
+{
+    struct drm_syncobj_timeline_wait args;
+    int ret;
+
+    memclear(args);
+    args.handles = (uintptr_t)handles;
+    args.points = (uint64_t)(uintptr_t)points;
+    args.timeout_nsec = timeout_nsec;
+    args.count_handles = num_handles;
+    args.flags = flags;
+
+    ret = drmIoctl(fd, DRM_IOCTL_SYNCOBJ_TIMELINE_WAIT, &args);
+    if (ret < 0)
+        return -errno;
+
+    if (first_signaled)
+        *first_signaled = args.first_signaled;
+    return ret;
+}
+
+
+drm_public int drmSyncobjQuery(int fd, uint32_t *handles, uint64_t *points,
+			       uint32_t handle_count)
+{
+    struct drm_syncobj_timeline_array args;
+    int ret;
+
+    memclear(args);
+    args.handles = (uintptr_t)handles;
+    args.points = (uint64_t)(uintptr_t)points;
+    args.count_handles = handle_count;
+
+    ret = drmIoctl(fd, DRM_IOCTL_SYNCOBJ_QUERY, &args);
+    if (ret)
+        return ret;
+    return 0;
+}
+
+
diff --git a/xf86drm.h b/xf86drm.h
index 887ecc76..60c7a84f 100644
--- a/xf86drm.h
+++ b/xf86drm.h
@@ -876,6 +876,12 @@  extern int drmSyncobjWait(int fd, uint32_t *handles, unsigned num_handles,
 			  uint32_t *first_signaled);
 extern int drmSyncobjReset(int fd, const uint32_t *handles, uint32_t handle_count);
 extern int drmSyncobjSignal(int fd, const uint32_t *handles, uint32_t handle_count);
+extern int drmSyncobjTimelineWait(int fd, uint32_t *handles, uint64_t *points,
+				  unsigned num_handles,
+				  int64_t timeout_nsec, unsigned flags,
+				  uint32_t *first_signaled);
+extern int drmSyncobjQuery(int fd, uint32_t *handles, uint64_t *points,
+			   uint32_t handle_count);
 
 #if defined(__cplusplus)
 }

Comments

On 13/05/2019 10:53, Chunming Zhou wrote:
> v2: drop export/import
>
> Signed-off-by: Chunming Zhou <david1.zhou@amd.com>
> ---
>   xf86drm.c | 44 ++++++++++++++++++++++++++++++++++++++++++++
>   xf86drm.h |  6 ++++++
>   2 files changed, 50 insertions(+)
>
> diff --git a/xf86drm.c b/xf86drm.c
> index 2c19376b..17e3d880 100644
> --- a/xf86drm.c
> +++ b/xf86drm.c
> @@ -4256,3 +4256,47 @@ drm_public int drmSyncobjSignal(int fd, const uint32_t *handles,
>       ret = drmIoctl(fd, DRM_IOCTL_SYNCOBJ_SIGNAL, &args);
>       return ret;
>   }
> +
> +drm_public int drmSyncobjTimelineWait(int fd, uint32_t *handles, uint64_t *points,
> +				      unsigned num_handles,
> +				      int64_t timeout_nsec, unsigned flags,
> +				      uint32_t *first_signaled)
> +{
> +    struct drm_syncobj_timeline_wait args;
> +    int ret;
> +
> +    memclear(args);
> +    args.handles = (uintptr_t)handles;
> +    args.points = (uint64_t)(uintptr_t)points;


I don't think you need those uintptr_t -> uint64_t casts.


> +    args.timeout_nsec = timeout_nsec;
> +    args.count_handles = num_handles;
> +    args.flags = flags;
> +
> +    ret = drmIoctl(fd, DRM_IOCTL_SYNCOBJ_TIMELINE_WAIT, &args);
> +    if (ret < 0)
> +        return -errno;
> +
> +    if (first_signaled)
> +        *first_signaled = args.first_signaled;
> +    return ret;
> +}
> +
> +
> +drm_public int drmSyncobjQuery(int fd, uint32_t *handles, uint64_t *points,
> +			       uint32_t handle_count)
> +{
> +    struct drm_syncobj_timeline_array args;
> +    int ret;
> +
> +    memclear(args);
> +    args.handles = (uintptr_t)handles;
> +    args.points = (uint64_t)(uintptr_t)points;


Same here.


> +    args.count_handles = handle_count;
> +
> +    ret = drmIoctl(fd, DRM_IOCTL_SYNCOBJ_QUERY, &args);
> +    if (ret)
> +        return ret;
> +    return 0;
> +}
> +
> +
> diff --git a/xf86drm.h b/xf86drm.h
> index 887ecc76..60c7a84f 100644
> --- a/xf86drm.h
> +++ b/xf86drm.h
> @@ -876,6 +876,12 @@ extern int drmSyncobjWait(int fd, uint32_t *handles, unsigned num_handles,
>   			  uint32_t *first_signaled);
>   extern int drmSyncobjReset(int fd, const uint32_t *handles, uint32_t handle_count);
>   extern int drmSyncobjSignal(int fd, const uint32_t *handles, uint32_t handle_count);
> +extern int drmSyncobjTimelineWait(int fd, uint32_t *handles, uint64_t *points,
> +				  unsigned num_handles,
> +				  int64_t timeout_nsec, unsigned flags,
> +				  uint32_t *first_signaled);
> +extern int drmSyncobjQuery(int fd, uint32_t *handles, uint64_t *points,
> +			   uint32_t handle_count);
>   
>   #if defined(__cplusplus)
>   }