geemili
/
drm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wrap syncobj timeline query/wait APIs for amdgpu v3 

v2: symbos are stored in lexical order.
v3: drop export/import and extra query indirection

Signed-off-by: Chunming Zhou <david1.zhou@amd.com>
Acked-by: Christian König <christian.koenig@amd.com>
Acked-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
main
Chunming Zhou 2019-05-16 16:07:10 +08:00 committed by Christian König
parent ec6ae51e80
commit 46f930d962
3 changed files with 64 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
amdgpu/amdgpu-symbol-check
View File

@ -53,8 +53,10 @@ amdgpu_cs_submit_raw
amdgpu_cs_submit_raw2 amdgpu_cs_submit_raw2
amdgpu_cs_syncobj_export_sync_file amdgpu_cs_syncobj_export_sync_file
amdgpu_cs_syncobj_import_sync_file amdgpu_cs_syncobj_import_sync_file
amdgpu_cs_syncobj_query
amdgpu_cs_syncobj_reset amdgpu_cs_syncobj_reset
amdgpu_cs_syncobj_signal amdgpu_cs_syncobj_signal
amdgpu_cs_syncobj_timeline_wait
amdgpu_cs_syncobj_wait amdgpu_cs_syncobj_wait
amdgpu_cs_wait_fences amdgpu_cs_wait_fences
amdgpu_cs_wait_semaphore amdgpu_cs_wait_semaphore

39
amdgpu/amdgpu.h
View File

@ -1536,6 +1536,45 @@ int amdgpu_cs_syncobj_wait(amdgpu_device_handle dev,
int64_t timeout_nsec, unsigned flags, int64_t timeout_nsec, unsigned flags,
uint32_t *first_signaled); 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. * Export kernel sync object to shareable fd.
* *

23
amdgpu/amdgpu_cs.c
View File

@ -686,6 +686,29 @@ drm_public int amdgpu_cs_syncobj_wait(amdgpu_device_handle dev,
flags, first_signaled); 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, drm_public int amdgpu_cs_export_syncobj(amdgpu_device_handle dev,
uint32_t handle, uint32_t handle,
int *shared_fd) int *shared_fd)