addr cs chunk for syncobj timeline
Subsystems (2)
PATCH 1/7 addr cs chunk for syncobj timeline
--- include/drm/amdgpu_drm.h | 9 +++++++++ 1 file changed, 9 insertions(+)
include/drm/amdgpu_drm.h +9 -0
@@ -528,6 +528,8 @@ struct drm_amdgpu_gem_va {#define AMDGPU_CHUNK_ID_SYNCOBJ_OUT 0x05#define AMDGPU_CHUNK_ID_BO_HANDLES 0x06#define AMDGPU_CHUNK_ID_SCHEDULED_DEPENDENCIES 0x07 +#define AMDGPU_CHUNK_ID_SYNCOBJ_TIMELINE_WAIT 0x08 +#define AMDGPU_CHUNK_ID_SYNCOBJ_TIMELINE_SIGNAL 0x09struct drm_amdgpu_cs_chunk {__u32 chunk_id;
@@ -608,6 +610,13 @@ struct drm_amdgpu_cs_chunk_sem {__u32 handle; }; +struct drm_amdgpu_cs_chunk_syncobj { +__u32 handle; +__u32 flags; +__u64 point; +}; + +#define AMDGPU_FENCE_TO_HANDLE_GET_SYNCOBJ 0#define AMDGPU_FENCE_TO_HANDLE_GET_SYNCOBJ_FD 1#define AMDGPU_FENCE_TO_HANDLE_GET_SYNC_FILE_FD 2
Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH 2/7 add timeline wait/query ioctl v2
v2: drop export/import
--- xf86drm.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ xf86drm.h | 6 ++++++ 2 files changed, 50 insertions(+)
xf86drm.c +44 -0
@@ -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 ; +} + +
xf86drm.h +6 -0
@@ -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) }
Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Re: [PATCH libdrm 2/7] add timeline wait/query ioctl v2
Quoted 18 lines · Chunming Zhou
v2: drop export/import
Signed-off-by Chunming Zhou <[email protected]>--- xf86drm.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ xf86drm.h | 6 ++++++ 2 files changed, 50 insertions(+)xf86drm.c +2
-0@@ -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,
xf86drm.c drm_public int drmSyncobjSignal(int fd, const uint32_t *handles, · line 4270
Quoted 10 lines
xf86drm.c +10
-0+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.
Quoted 13 lines
xf86drm.c +13
-0+ 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; +} +
xf86drm.c drm_public int drmSyncobjSignal(int fd, const uint32_t *handles, · line 4293
Quoted 10 lines
xf86drm.c +10
-0+ +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.
Quoted 16 lines
xf86drm.c +9
-0+ args.count_handles = handle_count; + + ret =drmIoctl (fd,DRM_IOCTL_SYNCOBJ_QUERY , &args); +if (ret) +return ret; +return 0 ; +} + +xf86drm.h +0
-0@@ -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);
xf86drm.h extern int drmSyncobjWait(int fd, uint32_t *handles, unsigned num_handles, · line 887
Quoted 10 lines
xf86drm.h +6
-0extern 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) }
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
ping... for patch set.
Quoted 37 lines · Chunming Zhou
[CAUTION: External Email]
Signed-off-by Chunming Zhou <[email protected]>--- include/drm/amdgpu_drm.h | 9 +++++++++ 1 file changed, 9 insertions(+)include/drm/amdgpu_drm.h +9
-1@@ -528,6 +528,8 @@ struct drm_amdgpu_gem_va {#define AMDGPU_CHUNK_ID_SYNCOBJ_OUT 0x05#define AMDGPU_CHUNK_ID_BO_HANDLES 0x06#define AMDGPU_CHUNK_ID_SCHEDULED_DEPENDENCIES 0x07 +#define AMDGPU_CHUNK_ID_SYNCOBJ_TIMELINE_WAIT 0x08 +#define AMDGPU_CHUNK_ID_SYNCOBJ_TIMELINE_SIGNAL 0x09struct drm_amdgpu_cs_chunk {__u32 chunk_id;@@ -608,6 +610,13 @@ struct drm_amdgpu_cs_chunk_sem {__u32 handle; }; +struct drm_amdgpu_cs_chunk_syncobj { +__u32 handle; +__u32 flags; +__u64 point; +}; + +#define AMDGPU_FENCE_TO_HANDLE_GET_SYNCOBJ 0#define AMDGPU_FENCE_TO_HANDLE_GET_SYNCOBJ_FD 1#define AMDGPU_FENCE_TO_HANDLE_GET_SYNC_FILE_FD 2 --2.17.1
Quoted 4 lines
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 9179e6bc-77f3-f284-d1ad-13d8956e1919-5C7GfCeVMHo@public.gmane.org
Sorry for the delay, I'll try to review this tomorrow.
-Lionel
Quoted 41 lines · On 13/05/2019 11:15, zhoucm1 wrote:
ping... for patch set.
Quoted 37 lines · Chunming Zhou
[CAUTION: External Email]
Signed-off-by Chunming Zhou <[email protected]>---
include/drm/amdgpu_drm.h| 9 +++++++++1 file changed, 9 insertions(+)include/drm/amdgpu_drm.h +9
-0@@ -528,6 +528,8 @@ struct drm_amdgpu_gem_va { #define AMDGPU_CHUNK_ID_SYNCOBJ_OUT 0x05 #define AMDGPU_CHUNK_ID_BO_HANDLES 0x06 #define AMDGPU_CHUNK_ID_SCHEDULED_DEPENDENCIES 0x07 +#define AMDGPU_CHUNK_ID_SYNCOBJ_TIMELINE_WAIT 0x08 +#define AMDGPU_CHUNK_ID_SYNCOBJ_TIMELINE_SIGNAL 0x09 struct drm_amdgpu_cs_chunk { __u32 chunk_id;@@ -608,6 +610,13 @@ struct drm_amdgpu_cs_chunk_sem { __u32 handle; }; +struct drm_amdgpu_cs_chunk_syncobj { + __u32 handle; + __u32 flags; + __u64 point; +}; + + #define AMDGPU_FENCE_TO_HANDLE_GET_SYNCOBJ 0 #define AMDGPU_FENCE_TO_HANDLE_GET_SYNCOBJ_FD 1 #define AMDGPU_FENCE_TO_HANDLE_GET_SYNC_FILE_FD 2Signature · 1 line
2.17.1
Quoted 6 lines
Quoted 4 lines
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
With the small nits, patches 2 & 4 are : Reviewed-by: Lionel Landwerlin <[email protected]>
The other patches are a bit amdgpu specific so maybe you might want someone more familiar with amdgpu to review them. Still I didn't see anything wrong with them so remaining patches are : Acked-by: Lionel Landwerlin <[email protected]>
I'll send the IGT stuff shortly.
Thanks,
-Lionel
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Thank you, Lionel.
-David
Quoted 7 lines · Lionel Landwerlin
[CAUTION: External Email]
With the small nits, patches 2 & 4 are : Reviewed-by: Lionel Landwerlin <[email protected]>
The other patches are a bit amdgpu specific so maybe you might want someone more familiar with amdgpu to review them.
Still I didn't see anything wrong with them so remaining patches are :
Quoted 7 lines
I'll send the IGT stuff shortly.
Thanks,
-Lionel
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 3/7 wrap syncobj timeline query/wait APIs for amdgpu v3
In reply to Chunming Zhouv2: symbos are stored in lexical order.
v3: drop export/import and extra query indirection
--- amdgpu/amdgpu-symbol-check | 2 ++ amdgpu/amdgpu.h | 39 ++++++++++++++++++++++++++++++++++++++ amdgpu/amdgpu_cs.c | 23 ++++++++++++++++++++++ 3 files changed, 64 insertions(+)
amdgpu/amdgpu-symbol-check +2 -0
@@ -53,8 +53,10 @@ amdgpu_cs_submit_raw amdgpu_cs_submit_raw2 amdgpu_cs_syncobj_export_sync_file amdgpu_cs_syncobj_import_sync_file +amdgpu_cs_syncobj_query amdgpu_cs_syncobj_reset amdgpu_cs_syncobj_signal +amdgpu_cs_syncobj_timeline_wait amdgpu_cs_syncobj_wait amdgpu_cs_wait_fences amdgpu_cs_wait_semaphore
amdgpu/amdgpu.h +39 -0
@@ -1536,6 +1536,45 @@ int amdgpu_cs_syncobj_wait(amdgpu_device_handle dev, int64_t timeout_nsec, unsigned flags, uint32_t *first_signaled); +/** +* Wait for one or all sync objects on their points to signal. +* +* \param dev - \c [in] self-explanatory +* \param handles - \c [in] array of sync object handles +* \param points - \c [in] array of sync points to wait +* \param num_handles - \c [in] self-explanatory +* \param timeout_nsec - \c [in] self-explanatory +* \param flags - \c [in] a bitmask of DRM_SYNCOBJ_WAIT_FLAGS_* +* \param first_signaled - \c [in] self-explanatory +* +* \return 0 on success\n +* -ETIME - Timeout +* <0 - Negative POSIX Error code +* +*/ +int amdgpu_cs_syncobj_timeline_wait (amdgpu_device_handle dev, +uint32_t *handles,uint64_t *points, +unsigned num_handles, +int64_t timeout_nsec,unsigned flags, +uint32_t *first_signaled); +/** +* 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 +* +* \return 0 on success\n +* -ETIME - Timeout +* <0 - Negative POSIX Error code +* +*/ +int amdgpu_cs_syncobj_query (amdgpu_device_handle dev, +uint32_t *handles,uint64_t *points, +unsigned num_handles); +/** * Export kernel sync object to shareable fd. *
amdgpu/amdgpu_cs.c +23 -0
@@ -686,6 +686,29 @@ drm_public int amdgpu_cs_syncobj_wait(amdgpu_device_handle dev, flags, first_signaled); } +drm_public int amdgpu_cs_syncobj_timeline_wait(amdgpu_device_handle dev, +uint32_t *handles,uint64_t *points, +unsigned num_handles, +int64_t timeout_nsec,unsigned flags, +uint32_t *first_signaled) +{ +if (NULL == dev) +return -EINVAL ; + +return drmSyncobjTimelineWait (dev->fd, handles, points, num_handles, + timeout_nsec, flags, first_signaled); +} + +drm_public int amdgpu_cs_syncobj_query(amdgpu_device_handle dev, +uint32_t *handles,uint64_t *points, +unsigned num_handles) +{ +if (NULL == dev) +return -EINVAL ; + +return drmSyncobjQuery (dev->fd, handles, points, num_handles); +} + drm_public int amdgpu_cs_export_syncobj(amdgpu_device_handle dev,uint32_t handle,int *shared_fd)
Signature · 6 lines
2.17.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 4/7 add timeline signal/transfer ioctls v2
In reply to Chunming Zhouv2: use one transfer ioctl
--- xf86drm.c | 33 +++++++++++++++++++++++++++++++++ xf86drm.h | 6 ++++++ 2 files changed, 39 insertions(+)
xf86drm.c +33 -0
@@ -4257,6 +4257,21 @@ drm_public int drmSyncobjSignal(int fd, const uint32_t *handles,return ret; } +drm_public int drmSyncobjTimelineSignal(int fd, const 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_TIMELINE_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,
@@ -4299,4 +4314,22 @@ drm_public int drmSyncobjQuery(int fd, uint32_t *handles, uint64_t *points,return 0 ; } +drm_public int drmSyncobjTransfer(int fd, +uint32_t dst_handle,uint64_t dst_point, +uint32_t src_handle,uint64_t src_point, +uint32_t flags) +{ +struct drm_syncobj_transfer args; +int ret; + +memclear (args); + args.src_handle = src_handle; + args.dst_handle = dst_handle; + args.src_point = src_point; + args.dst_point = dst_point; + args.flags = flags; + + ret =drmIoctl (fd,DRM_IOCTL_SYNCOBJ_TRANSFER , &args); +return ret; +}
xf86drm.h +6 -0
@@ -876,12 +876,18 @@ 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 drmSyncobjTimelineSignal (int fd,const uint32_t *handles, +uint64_t *points,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); +extern int drmSyncobjTransfer (int fd, +uint32_t dst_handle,uint64_t dst_point, +uint32_t src_handle,uint64_t src_point, +uint32_t flags);#if defined(__cplusplus) }
Signature · 6 lines
2.17.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
A message that is not in the archive (sent off-list or not yet received): [email protected]
Re: [PATCH libdrm 4/7] add timeline signal/transfer ioctls v2
Quoted 15 lines · Chunming Zhou
v2: use one transfer ioctl
Signed-off-by Chunming Zhou <[email protected]>--- xf86drm.c | 33 +++++++++++++++++++++++++++++++++ xf86drm.h | 6 ++++++ 2 files changed, 39 insertions(+)xf86drm.c +0
-0@@ -4257,6 +4257,21 @@ drm_public int drmSyncobjSignal(int fd, const uint32_t *handles,return ret; }
xf86drm.c drm_public int drmSyncobjSignal(int fd, const uint32_t *handles, · line 4268
Quoted 10 lines
xf86drm.c +9
-0+drm_public int drmSyncobjTimelineSignal(int fd, const 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;
I think you can drop the uint64_t cast.
Quoted 45 lines
xf86drm.c +24
-0+ args.count_handles = handle_count; + + ret =drmIoctl (fd,DRM_IOCTL_SYNCOBJ_TIMELINE_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,@@ -4299,4 +4314,22 @@ drm_public int drmSyncobjQuery(int fd, uint32_t *handles, uint64_t *points,return 0 ; } +drm_public int drmSyncobjTransfer(int fd, +uint32_t dst_handle,uint64_t dst_point, +uint32_t src_handle,uint64_t src_point, +uint32_t flags) +{ +struct drm_syncobj_transfer args; +int ret; + +memclear (args); + args.src_handle = src_handle; + args.dst_handle = dst_handle; + args.src_point = src_point; + args.dst_point = dst_point; + args.flags = flags; + + ret =drmIoctl (fd,DRM_IOCTL_SYNCOBJ_TRANSFER , &args); +return ret; +}xf86drm.h +2
-0@@ -876,12 +876,18 @@ 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 drmSyncobjTimelineSignal (int fd,const uint32_t *handles, +uint64_t *points,uint32_t handle_count); extern int drmSyncobjTimelineWait(int fd, uint32_t *handles, uint64_t *points, unsigned num_handles, int64_t timeout_nsec, unsigned flags,
xf86drm.h extern int drmSyncobjWait(int fd, uint32_t *handles, unsigned num_handles, · line 893
Quoted 10 lines
xf86drm.h +4
-0uint32_t *first_signaled);extern int drmSyncobjQuery (int fd,uint32_t *handles,uint64_t *points,uint32_t handle_count); +extern int drmSyncobjTransfer (int fd, +uint32_t dst_handle,uint64_t dst_point, +uint32_t src_handle,uint64_t src_point, +uint32_t flags);#if defined(__cplusplus) }
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 5/7 expose timeline signal/export/import interfaces v2
In reply to Chunming Zhouv2: adapt to new one transfer ioctl
--- amdgpu/amdgpu-symbol-check | 3 ++ amdgpu/amdgpu.h | 51 ++++++++++++++++++++++++++++ amdgpu/amdgpu_cs.c | 68 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 122 insertions(+)
amdgpu/amdgpu-symbol-check +3 -0
@@ -52,10 +52,13 @@ amdgpu_cs_submit amdgpu_cs_submit_raw amdgpu_cs_submit_raw2 amdgpu_cs_syncobj_export_sync_file +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_reset amdgpu_cs_syncobj_signal +amdgpu_cs_syncobj_timeline_signal amdgpu_cs_syncobj_timeline_wait amdgpu_cs_syncobj_wait amdgpu_cs_wait_fences
amdgpu/amdgpu.h +51 -0
64 lines not on this page · raw message
amdgpu/amdgpu_cs.c +68 -0
80 lines not on this page · raw message
Signature · 6 lines
2.17.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 6/7 wrap transfer interfaces
In reply to Chunming Zhou--- amdgpu/amdgpu.h | 22 ++++++++++++++++++++++ amdgpu/amdgpu_cs.c | 16 ++++++++++++++++ 2 files changed, 38 insertions(+)
amdgpu/amdgpu.h +22 -0
@@ -1685,6 +1685,28 @@ int amdgpu_cs_syncobj_import_sync_file2(amdgpu_device_handle dev,uint32_t syncobj, uint64_t point, int sync_file_fd); + +/** +* transfer between syncbojs. +* +* \param dev - \c [in] device handle +* \param dst_handle - \c [in] sync object handle +* \param dst_point - \c [in] timeline point, 0 presents dst is binary +* \param src_handle - \c [in] sync object handle +* \param src_point - \c [in] timeline point, 0 presents src is binary +* \param flags - \c [in] flags +* +* \return 0 on success\n +* <0 - Negative POSIX Error code +* +*/ +int amdgpu_cs_syncobj_transfer (amdgpu_device_handle dev, +uint32_t dst_handle, +uint64_t dst_point, +uint32_t src_handle, +uint64_t src_point, +uint32_t flags); +/** * Export an amdgpu fence as a handle (syncobj or fd). *
amdgpu/amdgpu_cs.c +16 -0
@@ -817,6 +817,22 @@ out:return ret; } +drm_public int amdgpu_cs_syncobj_transfer(amdgpu_device_handle dev, +uint32_t dst_handle, +uint64_t dst_point, +uint32_t src_handle, +uint64_t src_point, +uint32_t flags) +{ +if (NULL == dev) +return -EINVAL ; + +return drmSyncobjTransfer (dev->fd, + dst_handle, dst_point, + src_handle, src_point, + flags); +} + drm_public int amdgpu_cs_submit_raw(amdgpu_device_handle dev, amdgpu_context_handle context, amdgpu_bo_list_handle bo_list_handle,
Signature · 6 lines
2.17.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 7/7 add syncobj timeline tests v3
In reply to Chunming Zhouv2: drop DRM_SYNCOBJ_CREATE_TYPE_TIMELINE, fix timeout calculation,
fix some warnings
v3: add export/import and cpu signal testing cases
--- tests/amdgpu/Makefile.am | 3 +- tests/amdgpu/amdgpu_test.c | 11 ++ tests/amdgpu/amdgpu_test.h | 21 +++ tests/amdgpu/meson.build | 2 +- tests/amdgpu/syncobj_tests.c | 290 +++++++++++++++++++++++++++++++++++ 5 files changed, 325 insertions(+), 2 deletions(-) create mode 100644 tests/amdgpu/syncobj_tests.c
tests/amdgpu/Makefile.am +2 -1
@@ -34,4 +34,5 @@ amdgpu_test_SOURCES = \ uve_ib.h \ deadlock_tests.c \ vm_tests.c \ - ras_tests.c + ras_tests.c \ + syncobj_tests.c
tests/amdgpu/amdgpu_test.c +11 -0
@@ -57,6 +57,7 @@#define DEADLOCK_TESTS_STR "Deadlock Tests"#define VM_TESTS_STR "VM Tests"#define RAS_TESTS_STR "RAS Tests" +#define SYNCOBJ_TIMELINE_TESTS_STR "SYNCOBJ TIMELINE Tests"/** * Open handles for amdgpu devices
@@ -123,6 +124,12 @@ static CU_SuiteInfo suites[] = { .pCleanupFunc = suite_ras_tests_clean, .pTests = ras_tests, }, + { + .pName = SYNCOBJ_TIMELINE_TESTS_STR, + .pInitFunc = suite_syncobj_timeline_tests_init, + .pCleanupFunc = suite_syncobj_timeline_tests_clean, + .pTests = syncobj_timeline_tests, + }, CU_SUITE_INFO_NULL, };
@@ -176,6 +183,10 @@ static Suites_Active_Status suites_active_stat[] = { .pName = RAS_TESTS_STR, .pActive = suite_ras_tests_enable, }, + { + .pName = SYNCOBJ_TIMELINE_TESTS_STR, + .pActive = suite_syncobj_timeline_tests_enable, + }, };
tests/amdgpu/amdgpu_test.h +21 -0
@@ -216,6 +216,27 @@ CU_BOOL suite_ras_tests_enable(void);extern CU_TestInfo ras_tests[]; +/** +* Initialize syncobj timeline test suite +*/ +int suite_syncobj_timeline_tests_init (); + +/** +* Deinitialize syncobj timeline test suite +*/ +int suite_syncobj_timeline_tests_clean (); + +/** +* Decide if the suite is enabled by default or not. +*/ +CU_BOOL suite_syncobj_timeline_tests_enable (void ); + +/** +* Tests in syncobj timeline test suite +*/ +extern CU_TestInfo syncobj_timeline_tests[]; + +/** * Helper functions */
tests/amdgpu/meson.build +1 -1
@@ -24,7 +24,7 @@ if dep_cunit.found() files( 'amdgpu_test.c', 'basic_tests.c', 'bo_tests.c', 'cs_tests.c', 'vce_tests.c', 'uvd_enc_tests.c', 'vcn_tests.c', 'deadlock_tests.c', - 'vm_tests.c', 'ras_tests.c', + 'vm_tests.c', 'ras_tests.c', 'syncobj_tests.c', ), dependencies : [dep_cunit, dep_threads], include_directories : [inc_root, inc_drm, include_directories('../../amdgpu')],
tests/amdgpu/syncobj_tests.c new file +290 -0
290 lines not on this page · raw message
Signature · 6 lines
2.17.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel