[PATCH libdrm] libdrm: wrap new flexible syncobj query interface

[Lionel Landwerlin]

On 24/07/2019 11:01, Chunming Zhou wrote:
> Signed-off-by: Chunming Zhou <david1.zhou at amd.com>
> Cc: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
> Cc: Christian König <Christian.Koenig at amd.com>
> ---
>   amdgpu/amdgpu-symbol-check |  1 +
>   amdgpu/amdgpu.h            | 18 ++++++++++++++++++
>   amdgpu/amdgpu_cs.c         | 10 ++++++++++
>   include/drm/drm.h          |  3 ++-
>   xf86drm.c                  | 19 +++++++++++++++++++
>   xf86drm.h                  |  2 ++
>   6 files changed, 52 insertions(+), 1 deletion(-)
>
> diff --git a/amdgpu/amdgpu-symbol-check b/amdgpu/amdgpu-symbol-check
> index 274b4c6d..3bc1a9f1 100755
> --- a/amdgpu/amdgpu-symbol-check
> +++ b/amdgpu/amdgpu-symbol-check
> @@ -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_query1
>   amdgpu_cs_syncobj_reset
>   amdgpu_cs_syncobj_signal
>   amdgpu_cs_syncobj_timeline_signal
> diff --git a/amdgpu/amdgpu.h b/amdgpu/amdgpu.h
> index 9d9b0832..ce7e2bbb 100644
> --- a/amdgpu/amdgpu.h
> +++ b/amdgpu/amdgpu.h
> @@ -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 payloads.
> + *
> + * \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_query1(amdgpu_device_handle dev,
> +			     uint32_t *handles, uint64_t *points,
> +			     unsigned num_handles, uint32_t flags);
>   
>   /**
>    *  Export kernel sync object to shareable fd.
> diff --git a/amdgpu/amdgpu_cs.c b/amdgpu/amdgpu_cs.c
> index 977fa3cf..e2287fa0 100644
> --- a/amdgpu/amdgpu_cs.c
> +++ b/amdgpu/amdgpu_cs.c
> @@ -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_query1(amdgpu_device_handle dev,
> +					uint32_t *handles, uint64_t *points,
> +					unsigned num_handles, uint32_t flags)
> +{
> +	if (NULL == dev)
> +		return -EINVAL;
> +
> +	return drmSyncobjQuery1(dev->fd, handles, points, num_handles, flags);
> +}
> +
>   drm_public int amdgpu_cs_export_syncobj(amdgpu_device_handle dev,
>   					uint32_t handle,
>   					int *shared_fd)
> diff --git a/include/drm/drm.h b/include/drm/drm.h
> index 532787bf..af37a80b 100644
> --- a/include/drm/drm.h
> +++ b/include/drm/drm.h
> @@ -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;
>   };
>   
>   
> diff --git a/xf86drm.c b/xf86drm.c
> index 953fc762..fb7d5cc5 100644
> --- a/xf86drm.c
> +++ b/xf86drm.c
> @@ -4314,6 +4314,25 @@ drm_public int drmSyncobjQuery(int fd, uint32_t *handles, uint64_t *points,
>       return 0;
>   }
>   
> +drm_public int drmSyncobjQuery1(int fd, uint32_t *handles, uint64_t *points,
> +				uint32_t handle_count, uint32_t flags)


It seems the pattern has been to name with the "2" suffix 
(drmGetDevice2(), drmModeAddFB2, drmModeSetCursor2).

Just a suggestion ;)


> +{
> +    struct drm_syncobj_timeline_array args;
> +    int ret;
> +
> +    memclear(args);
> +    args.handles = (uintptr_t)handles;
> +    args.points = (uintptr_t)points;
> +    args.count_handles = handle_count;
> +    args.flags = flags;
> +
> +    ret = drmIoctl(fd, DRM_IOCTL_SYNCOBJ_QUERY, &args);
> +    if (ret)
> +        return ret;
> +    return 0;


I guess you can return drmIoct(...); straight.


> +}
> +
> +
>   drm_public int drmSyncobjTransfer(int fd,
>   				  uint32_t dst_handle, uint64_t dst_point,
>   				  uint32_t src_handle, uint64_t src_point,
> diff --git a/xf86drm.h b/xf86drm.h
> index 3fb1d1ca..29c1df6d 100644
> --- a/xf86drm.h
> +++ b/xf86drm.h
> @@ -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 drmSyncobjQuery1(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,