mirror of
https://gitlab.freedesktop.org/mesa/mesa.git
synced 2026-01-01 05:20:09 +01:00
vulkan: Add a common vk_drm_syncobj struct
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com> Acked-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13427>
This commit is contained in:
Jason Ekstrand
parent
fdb636e3a6
commit
13ab3757bb
3 changed files with 462 additions and 0 deletions
|
|
@ -64,6 +64,11 @@ vulkan_runtime_deps = [
|
|||
idep_vulkan_util,
|
||||
]
|
||||
|
||||
if dep_libdrm.found()
|
||||
vulkan_runtime_files += files('vk_drm_syncobj.c', 'vk_drm_syncobj.h')
|
||||
vulkan_runtime_deps += dep_libdrm
|
||||
endif
|
||||
|
||||
vk_common_entrypoints = custom_target(
|
||||
'vk_common_entrypoints',
|
||||
input : [vk_entrypoints_gen, vk_api_xml],
|
||||
|
|
|
|||
393
src/vulkan/runtime/vk_drm_syncobj.c
Normal file
393
src/vulkan/runtime/vk_drm_syncobj.c
Normal file
|
|
@ -0,0 +1,393 @@
|
|||
/*
|
||||
* Copyright © 2021 Intel Corporation
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a
|
||||
* copy of this software and associated documentation files (the "Software"),
|
||||
* to deal in the Software without restriction, including without limitation
|
||||
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
||||
* and/or sell copies of the Software, and to permit persons to whom the
|
||||
* Software is furnished to do so, subject to the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice (including the next
|
||||
* paragraph) shall be included in all copies or substantial portions of the
|
||||
* Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
||||
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
||||
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
|
||||
* IN THE SOFTWARE.
|
||||
*/
|
||||
|
||||
#include "vk_drm_syncobj.h"
|
||||
|
||||
#include <xf86drm.h>
|
||||
|
||||
#include "drm-uapi/drm.h"
|
||||
|
||||
#include "vk_device.h"
|
||||
#include "vk_log.h"
|
||||
#include "vk_util.h"
|
||||
|
||||
static struct vk_drm_syncobj *
|
||||
to_drm_syncobj(struct vk_sync *sync)
|
||||
{
|
||||
assert(vk_sync_type_is_drm_syncobj(sync->type));
|
||||
return container_of(sync, struct vk_drm_syncobj, base);
|
||||
}
|
||||
|
||||
static VkResult
|
||||
vk_drm_binary_syncobj_init(struct vk_device *device,
|
||||
struct vk_sync *sync,
|
||||
uint64_t initial_value)
|
||||
{
|
||||
struct vk_drm_syncobj *sobj = to_drm_syncobj(sync);
|
||||
|
||||
uint32_t flags = 0;
|
||||
if (initial_value)
|
||||
flags |= DRM_SYNCOBJ_CREATE_SIGNALED;
|
||||
|
||||
assert(device->drm_fd >= 0);
|
||||
int err = drmSyncobjCreate(device->drm_fd, flags, &sobj->syncobj);
|
||||
if (err < 0) {
|
||||
return vk_errorf(device, VK_ERROR_OUT_OF_HOST_MEMORY,
|
||||
"DRM_IOCTL_SYNCOBJ_CREATE failed: %m");
|
||||
}
|
||||
|
||||
return VK_SUCCESS;
|
||||
}
|
||||
|
||||
static void
|
||||
vk_drm_syncobj_finish(struct vk_device *device,
|
||||
struct vk_sync *sync)
|
||||
{
|
||||
struct vk_drm_syncobj *sobj = to_drm_syncobj(sync);
|
||||
|
||||
assert(device->drm_fd >= 0);
|
||||
ASSERTED int err = drmSyncobjDestroy(device->drm_fd, sobj->syncobj);
|
||||
assert(err == 0);
|
||||
}
|
||||
|
||||
static VkResult
|
||||
vk_drm_timeline_syncobj_init(struct vk_device *device,
|
||||
struct vk_sync *sync,
|
||||
uint64_t initial_value)
|
||||
{
|
||||
struct vk_drm_syncobj *sobj = to_drm_syncobj(sync);
|
||||
|
||||
assert(device->drm_fd >= 0);
|
||||
int err = drmSyncobjCreate(device->drm_fd, 0, &sobj->syncobj);
|
||||
if (err < 0) {
|
||||
return vk_errorf(device, VK_ERROR_OUT_OF_HOST_MEMORY,
|
||||
"DRM_IOCTL_SYNCOBJ_CREATE failed: %m");
|
||||
}
|
||||
|
||||
if (initial_value) {
|
||||
err = drmSyncobjTimelineSignal(device->drm_fd, &sobj->syncobj,
|
||||
&initial_value, 1);
|
||||
if (err < 0) {
|
||||
vk_drm_syncobj_finish(device, sync);
|
||||
return vk_errorf(device, VK_ERROR_OUT_OF_HOST_MEMORY,
|
||||
"DRM_IOCTL_SYNCOBJ_CREATE failed: %m");
|
||||
}
|
||||
}
|
||||
|
||||
return VK_SUCCESS;
|
||||
}
|
||||
|
||||
static VkResult
|
||||
vk_drm_syncobj_signal(struct vk_device *device,
|
||||
struct vk_sync *sync,
|
||||
uint64_t value)
|
||||
{
|
||||
struct vk_drm_syncobj *sobj = to_drm_syncobj(sync);
|
||||
|
||||
assert(device->drm_fd >= 0);
|
||||
int err;
|
||||
if (sync->flags & VK_SYNC_IS_TIMELINE)
|
||||
err = drmSyncobjTimelineSignal(device->drm_fd, &sobj->syncobj, &value, 1);
|
||||
else
|
||||
err = drmSyncobjSignal(device->drm_fd, &sobj->syncobj, 1);
|
||||
if (err) {
|
||||
return vk_errorf(device, VK_ERROR_UNKNOWN,
|
||||
"DRM_IOCTL_SYNCOBJ_SIGNAL failed: %m");
|
||||
}
|
||||
|
||||
return VK_SUCCESS;
|
||||
}
|
||||
|
||||
static VkResult
|
||||
vk_drm_syncobj_get_value(struct vk_device *device,
|
||||
struct vk_sync *sync,
|
||||
uint64_t *value)
|
||||
{
|
||||
struct vk_drm_syncobj *sobj = to_drm_syncobj(sync);
|
||||
|
||||
assert(device->drm_fd >= 0);
|
||||
int err = drmSyncobjQuery(device->drm_fd, &sobj->syncobj, value, 1);
|
||||
if (err) {
|
||||
return vk_errorf(device, VK_ERROR_UNKNOWN,
|
||||
"DRM_IOCTL_SYNCOBJ_QUERY failed: %m");
|
||||
}
|
||||
|
||||
return VK_SUCCESS;
|
||||
}
|
||||
|
||||
static VkResult
|
||||
vk_drm_syncobj_reset(struct vk_device *device,
|
||||
struct vk_sync *sync)
|
||||
{
|
||||
struct vk_drm_syncobj *sobj = to_drm_syncobj(sync);
|
||||
|
||||
assert(device->drm_fd >= 0);
|
||||
int err = drmSyncobjReset(device->drm_fd, &sobj->syncobj, 1);
|
||||
if (err) {
|
||||
return vk_errorf(device, VK_ERROR_UNKNOWN,
|
||||
"DRM_IOCTL_SYNCOBJ_RESET failed: %m");
|
||||
}
|
||||
|
||||
return VK_SUCCESS;
|
||||
}
|
||||
|
||||
static VkResult
|
||||
vk_drm_syncobj_wait_many(struct vk_device *device,
|
||||
uint32_t wait_count,
|
||||
const struct vk_sync_wait *waits,
|
||||
enum vk_sync_wait_flags wait_flags,
|
||||
uint64_t abs_timeout_ns)
|
||||
{
|
||||
/* Syncobj timeouts are signed */
|
||||
abs_timeout_ns = MIN2(abs_timeout_ns, (uint64_t)INT64_MAX);
|
||||
|
||||
STACK_ARRAY(uint32_t, handles, wait_count);
|
||||
STACK_ARRAY(uint64_t, wait_values, wait_count);
|
||||
|
||||
uint32_t j = 0;
|
||||
bool has_timeline = false;
|
||||
for (uint32_t i = 0; i < wait_count; i++) {
|
||||
/* The syncobj API doesn't like wait values of 0 but it's safe to skip
|
||||
* them because a wait for 0 is a no-op.
|
||||
*/
|
||||
if (waits[i].sync->flags & VK_SYNC_IS_TIMELINE) {
|
||||
if (waits[i].wait_value == 0)
|
||||
continue;
|
||||
|
||||
has_timeline = true;
|
||||
}
|
||||
|
||||
handles[j] = to_drm_syncobj(waits[i].sync)->syncobj;
|
||||
wait_values[j] = waits[i].wait_value;
|
||||
j++;
|
||||
}
|
||||
assert(j <= wait_count);
|
||||
wait_count = j;
|
||||
|
||||
uint32_t syncobj_wait_flags = DRM_SYNCOBJ_WAIT_FLAGS_WAIT_FOR_SUBMIT;
|
||||
if (!(wait_flags & VK_SYNC_WAIT_ANY))
|
||||
syncobj_wait_flags |= DRM_SYNCOBJ_WAIT_FLAGS_WAIT_ALL;
|
||||
|
||||
assert(device->drm_fd >= 0);
|
||||
int err;
|
||||
if (wait_count == 0) {
|
||||
err = 0;
|
||||
} else if (wait_flags & VK_SYNC_WAIT_PENDING) {
|
||||
/* We always use a timeline wait for WAIT_PENDING, even for binary
|
||||
* syncobjs because the non-timeline wait doesn't support
|
||||
* DRM_SYNCOBJ_WAIT_FLAGS_WAIT_AVAILABLE.
|
||||
*/
|
||||
err = drmSyncobjTimelineWait(device->drm_fd, handles, wait_values,
|
||||
wait_count, abs_timeout_ns,
|
||||
syncobj_wait_flags |
|
||||
DRM_SYNCOBJ_WAIT_FLAGS_WAIT_AVAILABLE,
|
||||
NULL /* first_signaled */);
|
||||
} else if (has_timeline) {
|
||||
err = drmSyncobjTimelineWait(device->drm_fd, handles, wait_values,
|
||||
wait_count, abs_timeout_ns,
|
||||
syncobj_wait_flags,
|
||||
NULL /* first_signaled */);
|
||||
} else {
|
||||
err = drmSyncobjWait(device->drm_fd, handles,
|
||||
wait_count, abs_timeout_ns,
|
||||
syncobj_wait_flags,
|
||||
NULL /* first_signaled */);
|
||||
}
|
||||
|
||||
STACK_ARRAY_FINISH(handles);
|
||||
STACK_ARRAY_FINISH(wait_values);
|
||||
|
||||
if (err && errno == ETIME) {
|
||||
return VK_TIMEOUT;
|
||||
} else if (err) {
|
||||
return vk_errorf(device, VK_ERROR_UNKNOWN,
|
||||
"DRM_IOCTL_SYNCOBJ_WAIT failed: %m");
|
||||
}
|
||||
|
||||
return VK_SUCCESS;
|
||||
}
|
||||
|
||||
static VkResult
|
||||
vk_drm_syncobj_import_opaque_fd(struct vk_device *device,
|
||||
struct vk_sync *sync,
|
||||
int fd)
|
||||
{
|
||||
struct vk_drm_syncobj *sobj = to_drm_syncobj(sync);
|
||||
|
||||
assert(device->drm_fd >= 0);
|
||||
uint32_t new_handle;
|
||||
int err = drmSyncobjFDToHandle(device->drm_fd, fd, &new_handle);
|
||||
if (err) {
|
||||
return vk_errorf(device, VK_ERROR_UNKNOWN,
|
||||
"DRM_IOCTL_SYNCOBJ_HANDLE_TO_FD failed: %m");
|
||||
}
|
||||
|
||||
err = drmSyncobjDestroy(device->drm_fd, sobj->syncobj);
|
||||
assert(!err);
|
||||
|
||||
sobj->syncobj = new_handle;
|
||||
|
||||
return VK_SUCCESS;
|
||||
}
|
||||
|
||||
static VkResult
|
||||
vk_drm_syncobj_export_opaque_fd(struct vk_device *device,
|
||||
struct vk_sync *sync,
|
||||
int *fd)
|
||||
{
|
||||
struct vk_drm_syncobj *sobj = to_drm_syncobj(sync);
|
||||
|
||||
assert(device->drm_fd >= 0);
|
||||
int err = drmSyncobjHandleToFD(device->drm_fd, sobj->syncobj, fd);
|
||||
if (err) {
|
||||
return vk_errorf(device, VK_ERROR_UNKNOWN,
|
||||
"DRM_IOCTL_SYNCOBJ_HANDLE_TO_FD failed: %m");
|
||||
}
|
||||
|
||||
return VK_SUCCESS;
|
||||
}
|
||||
|
||||
static VkResult
|
||||
vk_drm_syncobj_import_sync_file(struct vk_device *device,
|
||||
struct vk_sync *sync,
|
||||
int sync_file)
|
||||
{
|
||||
struct vk_drm_syncobj *sobj = to_drm_syncobj(sync);
|
||||
|
||||
assert(device->drm_fd >= 0);
|
||||
int err = drmSyncobjImportSyncFile(device->drm_fd, sobj->syncobj, sync_file);
|
||||
if (err) {
|
||||
return vk_errorf(device, VK_ERROR_UNKNOWN,
|
||||
"DRM_IOCTL_SYNCOBJ_FD_TO_HANDLE failed: %m");
|
||||
}
|
||||
|
||||
return VK_SUCCESS;
|
||||
}
|
||||
|
||||
static VkResult
|
||||
vk_drm_syncobj_export_sync_file(struct vk_device *device,
|
||||
struct vk_sync *sync,
|
||||
int *sync_file)
|
||||
{
|
||||
struct vk_drm_syncobj *sobj = to_drm_syncobj(sync);
|
||||
|
||||
assert(device->drm_fd >= 0);
|
||||
int err = drmSyncobjExportSyncFile(device->drm_fd, sobj->syncobj, sync_file);
|
||||
if (err) {
|
||||
return vk_errorf(device, VK_ERROR_UNKNOWN,
|
||||
"DRM_IOCTL_SYNCOBJ_HANDLE_TO_FD failed: %m");
|
||||
}
|
||||
|
||||
return VK_SUCCESS;
|
||||
}
|
||||
|
||||
static VkResult
|
||||
vk_drm_syncobj_move(struct vk_device *device,
|
||||
struct vk_sync *dst,
|
||||
struct vk_sync *src)
|
||||
{
|
||||
struct vk_drm_syncobj *dst_sobj = to_drm_syncobj(dst);
|
||||
struct vk_drm_syncobj *src_sobj = to_drm_syncobj(src);
|
||||
VkResult result;
|
||||
|
||||
if (!(dst->flags & VK_SYNC_IS_SHARED) &&
|
||||
!(src->flags & VK_SYNC_IS_SHARED)) {
|
||||
result = vk_drm_syncobj_reset(device, dst);
|
||||
if (unlikely(result != VK_SUCCESS))
|
||||
return result;
|
||||
|
||||
uint32_t tmp = dst_sobj->syncobj;
|
||||
dst_sobj->syncobj = src_sobj->syncobj;
|
||||
src_sobj->syncobj = tmp;
|
||||
|
||||
return VK_SUCCESS;
|
||||
} else {
|
||||
int fd;
|
||||
result = vk_drm_syncobj_export_sync_file(device, src, &fd);
|
||||
if (result != VK_SUCCESS)
|
||||
return result;
|
||||
|
||||
result = vk_drm_syncobj_import_sync_file(device, dst, fd);
|
||||
if (fd >= 0)
|
||||
close(fd);
|
||||
if (result != VK_SUCCESS)
|
||||
return result;
|
||||
|
||||
return vk_drm_syncobj_reset(device, src);
|
||||
}
|
||||
}
|
||||
|
||||
const struct vk_sync_type vk_drm_binary_syncobj_no_wait_type = {
|
||||
.size = sizeof(struct vk_drm_syncobj),
|
||||
.features = VK_SYNC_FEATURE_BINARY |
|
||||
VK_SYNC_FEATURE_GPU_WAIT |
|
||||
VK_SYNC_FEATURE_CPU_RESET |
|
||||
VK_SYNC_FEATURE_CPU_SIGNAL,
|
||||
.init = vk_drm_binary_syncobj_init,
|
||||
.finish = vk_drm_syncobj_finish,
|
||||
.signal = vk_drm_syncobj_signal,
|
||||
.reset = vk_drm_syncobj_reset,
|
||||
.move = vk_drm_syncobj_move,
|
||||
.import_opaque_fd = vk_drm_syncobj_import_opaque_fd,
|
||||
.export_opaque_fd = vk_drm_syncobj_export_opaque_fd,
|
||||
.import_sync_file = vk_drm_syncobj_import_sync_file,
|
||||
.export_sync_file = vk_drm_syncobj_export_sync_file,
|
||||
};
|
||||
|
||||
const struct vk_sync_type vk_drm_binary_syncobj_type = {
|
||||
.size = sizeof(struct vk_drm_syncobj),
|
||||
.features = VK_SYNC_FEATURE_BINARY |
|
||||
VK_SYNC_FEATURE_GPU_WAIT |
|
||||
VK_SYNC_FEATURE_CPU_WAIT |
|
||||
VK_SYNC_FEATURE_CPU_RESET |
|
||||
VK_SYNC_FEATURE_CPU_SIGNAL |
|
||||
VK_SYNC_FEATURE_WAIT_ANY |
|
||||
VK_SYNC_FEATURE_WAIT_PENDING,
|
||||
.init = vk_drm_binary_syncobj_init,
|
||||
.finish = vk_drm_syncobj_finish,
|
||||
.signal = vk_drm_syncobj_signal,
|
||||
.reset = vk_drm_syncobj_reset,
|
||||
.move = vk_drm_syncobj_move,
|
||||
.wait_many = vk_drm_syncobj_wait_many,
|
||||
.import_opaque_fd = vk_drm_syncobj_import_opaque_fd,
|
||||
.export_opaque_fd = vk_drm_syncobj_export_opaque_fd,
|
||||
.import_sync_file = vk_drm_syncobj_import_sync_file,
|
||||
.export_sync_file = vk_drm_syncobj_export_sync_file,
|
||||
};
|
||||
|
||||
const struct vk_sync_type vk_drm_timeline_syncobj_type = {
|
||||
.size = sizeof(struct vk_drm_syncobj),
|
||||
.features = VK_SYNC_FEATURE_TIMELINE |
|
||||
VK_SYNC_FEATURE_GPU_WAIT |
|
||||
VK_SYNC_FEATURE_CPU_WAIT |
|
||||
VK_SYNC_FEATURE_CPU_SIGNAL |
|
||||
VK_SYNC_FEATURE_WAIT_ANY |
|
||||
VK_SYNC_FEATURE_WAIT_PENDING,
|
||||
.init = vk_drm_timeline_syncobj_init,
|
||||
.finish = vk_drm_syncobj_finish,
|
||||
.signal = vk_drm_syncobj_signal,
|
||||
.get_value = vk_drm_syncobj_get_value,
|
||||
.wait_many = vk_drm_syncobj_wait_many,
|
||||
.import_opaque_fd = vk_drm_syncobj_import_opaque_fd,
|
||||
.export_opaque_fd = vk_drm_syncobj_export_opaque_fd,
|
||||
};
|
||||
64
src/vulkan/runtime/vk_drm_syncobj.h
Normal file
64
src/vulkan/runtime/vk_drm_syncobj.h
Normal file
|
|
@ -0,0 +1,64 @@
|
|||
/*
|
||||
* Copyright © 2021 Intel Corporation
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a
|
||||
* copy of this software and associated documentation files (the "Software"),
|
||||
* to deal in the Software without restriction, including without limitation
|
||||
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
||||
* and/or sell copies of the Software, and to permit persons to whom the
|
||||
* Software is furnished to do so, subject to the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice (including the next
|
||||
* paragraph) shall be included in all copies or substantial portions of the
|
||||
* Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
||||
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
||||
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
|
||||
* IN THE SOFTWARE.
|
||||
*/
|
||||
#ifndef VK_DRM_SYNCOBJ_H
|
||||
#define VK_DRM_SYNCOBJ_H
|
||||
|
||||
#include "vk_sync.h"
|
||||
|
||||
#include "util/macros.h"
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
extern const struct vk_sync_type vk_drm_binary_syncobj_no_wait_type;
|
||||
extern const struct vk_sync_type vk_drm_binary_syncobj_type;
|
||||
extern const struct vk_sync_type vk_drm_timeline_syncobj_type;
|
||||
|
||||
struct vk_drm_syncobj {
|
||||
struct vk_sync base;
|
||||
uint32_t syncobj;
|
||||
};
|
||||
|
||||
static inline bool
|
||||
vk_sync_type_is_drm_syncobj(const struct vk_sync_type *type)
|
||||
{
|
||||
return type == &vk_drm_binary_syncobj_no_wait_type ||
|
||||
type == &vk_drm_binary_syncobj_type ||
|
||||
type == &vk_drm_timeline_syncobj_type;
|
||||
}
|
||||
|
||||
static inline struct vk_drm_syncobj *
|
||||
vk_sync_as_drm_syncobj(struct vk_sync *sync)
|
||||
{
|
||||
if (!vk_sync_type_is_drm_syncobj(sync->type))
|
||||
return NULL;
|
||||
|
||||
return container_of(sync, struct vk_drm_syncobj, base);
|
||||
}
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif /* VK_DRM_SYNCOBJ_H */
|
||||
Loading…
Add table
Reference in a new issue