sync drm.h for syncobj part
Subsystems (3)
PATCH 1/5 sync drm.h for syncobj part
Signed-off-by Chunming Zhou <[email protected]>
--- include/drm/drm.h | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+)
include/drm/drm.h +24 -0
@@ -695,6 +695,7 @@ struct drm_prime_handle {struct drm_syncobj_create {__u32 handle;#define DRM_SYNCOBJ_CREATE_SIGNALED (1 << 0) +#define DRM_SYNCOBJ_CREATE_TYPE_TIMELINE (1 << 1)__u32 flags; };
@@ -725,12 +726,32 @@ struct drm_syncobj_wait {__u32 pad; }; +struct drm_syncobj_timeline_wait { +__u64 handles; +/* wait on specific timeline point for every handles*/ +__u64 points; +/* absolute timeout */ +__s64 timeout_nsec; +__u32 count_handles; +__u32 flags; +__u32 first_signaled;/* only valid when not waiting all */ +__u32 pad; +}; +struct drm_syncobj_array {__u64 handles;__u32 count_handles;__u32 pad; }; +struct drm_syncobj_timeline_query { +__u64 handles; +/* points are timeline syncobjs payloads returned by query ioctl */ +__u64 points; +__u32 count_handles; +__u32 pad; +}; +/* Query current scanout sequence number */ struct drm_crtc_get_sequence {__u32 crtc_id;/* requested crtc_id */
@@ -887,6 +908,9 @@ extern "C" {#define DRM_IOCTL_MODE_GET_LEASE DRM_IOWR(0xC8, struct drm_mode_get_lease)#define DRM_IOCTL_MODE_REVOKE_LEASE DRM_IOWR(0xC9, struct drm_mode_revoke_lease) +#define DRM_IOCTL_SYNCOBJ_TIMELINE_WAIT DRM_IOWR(0xCA, struct drm_syncobj_timeline_wait) +#define DRM_IOCTL_SYNCOBJ_QUERY DRM_IOWR(0xCB, struct drm_syncobj_timeline_query) +/** * Device specific ioctls should only be in their respective headers * The device specific ioctl range is from 0x40 to 0x9f.
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/5 addr cs chunk for syncobj timeline
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
@@ -482,6 +482,8 @@ struct drm_amdgpu_gem_va {#define AMDGPU_CHUNK_ID_DEPENDENCIES 0x03#define AMDGPU_CHUNK_ID_SYNCOBJ_IN 0x04#define AMDGPU_CHUNK_ID_SYNCOBJ_OUT 0x05 +#define AMDGPU_CHUNK_ID_SYNCOBJ_TIMELINE_WAIT 0x07 +#define AMDGPU_CHUNK_ID_SYNCOBJ_TIMELINE_SIGNAL 0x08struct drm_amdgpu_cs_chunk {__u32 chunk_id;
@@ -553,6 +555,13 @@ struct drm_amdgpu_cs_chunk_sem {__u32 handle; }; +struct drm_amdgpu_cs_chunk_syncobj { +__u32 handle; +__u32 pad; +__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
PATCH 3/5 : add timeline wait/query ioctl
In reply to a message not in the archiveSigned-off-by Chunming Zhou <[email protected]>
--- xf86drm.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ xf86drm.h | 6 ++++++ 2 files changed, 50 insertions(+)
xf86drm.c +44 -0
@@ -4249,3 +4249,47 @@ int drmSyncobjSignal(int fd, const uint32_t *handles, uint32_t handle_count) ret =drmIoctl (fd,DRM_IOCTL_SYNCOBJ_SIGNAL , &args);return ret; } + +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; +} + + +int drmSyncobjQuery (int fd,uint32_t *handles,uint64_t *points, +uint32_t handle_count) +{ +struct drm_syncobj_timeline_query 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
@@ -875,6 +875,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
PATCH 5/5 add syncobj timeline tests
In reply to a message not in the archiveSigned-off-by Chunming Zhou <[email protected]>
--- tests/amdgpu/Makefile.am | 3 +- tests/amdgpu/amdgpu_test.c | 12 ++ tests/amdgpu/amdgpu_test.h | 21 +++ tests/amdgpu/meson.build | 2 +- tests/amdgpu/syncobj_tests.c | 258 +++++++++++++++++++++++++++++++++++ 5 files changed, 294 insertions(+), 2 deletions(-) create mode 100644 tests/amdgpu/syncobj_tests.c
tests/amdgpu/Makefile.am +2 -1
@@ -32,4 +32,5 @@ amdgpu_test_SOURCES = \ vcn_tests.c \ uve_ib.h \ deadlock_tests.c \ - vm_tests.c + vm_tests.c \ + syncobj_tests.c
tests/amdgpu/amdgpu_test.c +12 -0
@@ -56,6 +56,7 @@#define UVD_ENC_TESTS_STR "UVD ENC Tests"#define DEADLOCK_TESTS_STR "Deadlock Tests"#define VM_TESTS_STR "VM Tests" +#define SYNCOBJ_TIMELINE_TESTS_STR "SYNCOBJ TIMELINE Tests"/** * Open handles for amdgpu devices
@@ -116,6 +117,12 @@ static CU_SuiteInfo suites[] = { .pCleanupFunc = suite_vm_tests_clean, .pTests = vm_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, };
@@ -165,6 +172,11 @@ static Suites_Active_Status suites_active_stat[] = { .pName = VM_TESTS_STR, .pActive = suite_vm_tests_enable, }, + { + .pName = SYNCOBJ_TIMELINE_TESTS_STR, + .pActive = suite_syncobj_timeline_tests_enable, + }, + };
tests/amdgpu/amdgpu_test.h +21 -0
@@ -194,6 +194,27 @@ CU_BOOL suite_vm_tests_enable(void);*/ extern CU_TestInfo vm_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', + 'vm_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 +258 -0
258 lines not on this page · raw message
Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 4/5 : wrap syncobj timeline query and wait for amdgpu
In reply to Chunming ZhouSigned-off-by Chunming Zhou <[email protected]>
--- amdgpu/amdgpu-symbol-check | 2 ++ amdgpu/amdgpu.h | 39 ++++++++++++++++++++++++++++++++++++++ amdgpu/amdgpu_cs.c | 24 +++++++++++++++++++++++ 3 files changed, 65 insertions(+)
amdgpu/amdgpu-symbol-check +2 -0
@@ -50,6 +50,8 @@ amdgpu_cs_syncobj_import_sync_file amdgpu_cs_syncobj_reset amdgpu_cs_syncobj_signal amdgpu_cs_syncobj_wait +amdgpu_cs_syncobj_timeline_wait +amdgpu_cs_syncobj_query amdgpu_cs_wait_fences amdgpu_cs_wait_semaphore amdgpu_device_deinitialize
amdgpu/amdgpu.h +39 -0
@@ -1489,6 +1489,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 +24 -0
@@ -658,6 +658,30 @@ int amdgpu_cs_syncobj_wait(amdgpu_device_handle dev, flags, first_signaled); } +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); +} + +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); +} + +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
Re: [PATCH libdrm 4/5] [libdrm]: wrap syncobj timeline query and wait for amdgpu
Quoted 12 lines · Chunming Zhou
Signed-off-by Chunming Zhou <[email protected]>--- amdgpu/amdgpu-symbol-check | 2 ++ amdgpu/amdgpu.h | 39 ++++++++++++++++++++++++++++++++++++++ amdgpu/amdgpu_cs.c | 24 +++++++++++++++++++++++ 3 files changed, 65 insertions(+)amdgpu/amdgpu-symbol-check +0
-0
amdgpu/amdgpu-symbol-check amdgpu_cs_syncobj_import_sync_file · line 57
Quoted 8 lines
amdgpu/amdgpu-symbol-check +2
-0@@ -50,6 +50,8 @@ amdgpu_cs_syncobj_import_sync_file amdgpu_cs_syncobj_reset amdgpu_cs_syncobj_signal amdgpu_cs_syncobj_wait +amdgpu_cs_syncobj_timeline_wait +amdgpu_cs_syncobj_query amdgpu_cs_wait_fences amdgpu_cs_wait_semaphore amdgpu_device_deinitialize
This file should be sorted in lexical order.
Signature · 6 lines
Earthling Michel Dänzer | http://www.amd.com Libre software enthusiast | Mesa and X developer _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel