fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-22 11:20:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

radv: Add winsys functions for timeline syncobj.

Browse source 
Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5600>
This commit is contained in:
Bas Nieuwenhuizen 2020-07-16 02:43:32 +02:00 • committed by Marge Bot
parent 66e598d0a6
commit 55d8022878
4 changed files with 57 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/amd/vulkan/radv_device.c
View file

@ -7325,7 +7325,7 @@ static VkResult radv_import_sync_fd(struct radv_device *device,
} }
} else { } else {
if (fd == -1) if (fd == -1)
device->ws->signal_syncobj(device->ws, syncobj_handle); device->ws->signal_syncobj(device->ws, syncobj_handle, 0);
} }
if (fd != -1) { if (fd != -1) {

5
src/amd/vulkan/radv_radeon_winsys.h
View file

@ -328,9 +328,12 @@ struct radeon_winsys {
void (*destroy_syncobj)(struct radeon_winsys *ws, uint32_t handle); void (*destroy_syncobj)(struct radeon_winsys *ws, uint32_t handle);
void (*reset_syncobj)(struct radeon_winsys *ws, uint32_t handle); void (*reset_syncobj)(struct radeon_winsys *ws, uint32_t handle);
void (*signal_syncobj)(struct radeon_winsys *ws, uint32_t handle); void (*signal_syncobj)(struct radeon_winsys *ws, uint32_t handle, uint64_t point);
VkResult (*query_syncobj)(struct radeon_winsys *ws, uint32_t handle, uint64_t *point);
bool (*wait_syncobj)(struct radeon_winsys *ws, const uint32_t *handles, uint32_t handle_count, bool (*wait_syncobj)(struct radeon_winsys *ws, const uint32_t *handles, uint32_t handle_count,
bool wait_all, uint64_t timeout); bool wait_all, uint64_t timeout);
bool (*wait_timeline_syncobj)(struct radeon_winsys *ws, const uint32_t *handles, const uint64_t *points,
uint32_t handle_count, bool wait_all, bool available, uint64_t timeout);
int (*export_syncobj)(struct radeon_winsys *ws, uint32_t syncobj, int *fd); int (*export_syncobj)(struct radeon_winsys *ws, uint32_t syncobj, int *fd);
int (*import_syncobj)(struct radeon_winsys *ws, int fd, uint32_t *syncobj); int (*import_syncobj)(struct radeon_winsys *ws, int fd, uint32_t *syncobj);

4
src/amd/vulkan/radv_wsi.c
View file

@ -270,7 +270,7 @@ VkResult radv_AcquireNextImage2KHR(
device->ws->signal_fence(part->fence); device->ws->signal_fence(part->fence);
break; break;
case RADV_FENCE_SYNCOBJ: case RADV_FENCE_SYNCOBJ:
device->ws->signal_syncobj(device->ws, part->syncobj); device->ws->signal_syncobj(device->ws, part->syncobj, 0);
break; break;
default: default:
unreachable("Invalid WSI fence type"); unreachable("Invalid WSI fence type");
@ -289,7 +289,7 @@ VkResult radv_AcquireNextImage2KHR(
case RADV_SEMAPHORE_TIMELINE: case RADV_SEMAPHORE_TIMELINE:
unreachable("WSI only allows binary semaphores."); unreachable("WSI only allows binary semaphores.");
case RADV_SEMAPHORE_SYNCOBJ: case RADV_SEMAPHORE_SYNCOBJ:
device->ws->signal_syncobj(device->ws, part->syncobj); device->ws->signal_syncobj(device->ws, part->syncobj, 0);
break; break;
} }
} }

52
src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.c
View file

@ -1832,10 +1832,30 @@ static void radv_amdgpu_reset_syncobj(struct radeon_winsys *_ws,
} }
static void radv_amdgpu_signal_syncobj(struct radeon_winsys *_ws, static void radv_amdgpu_signal_syncobj(struct radeon_winsys *_ws,
uint32_t handle) uint32_t handle, uint64_t point)
{ {
struct radv_amdgpu_winsys *ws = radv_amdgpu_winsys(_ws); struct radv_amdgpu_winsys *ws = radv_amdgpu_winsys(_ws);
amdgpu_cs_syncobj_signal(ws->dev, &handle, 1); if (point)
amdgpu_cs_syncobj_timeline_signal(ws->dev, &handle, &point, 1);
else
amdgpu_cs_syncobj_signal(ws->dev, &handle, 1);
}
static VkResult radv_amdgpu_query_syncobj(struct radeon_winsys *_ws,
uint32_t handle, uint64_t *point)
{
struct radv_amdgpu_winsys *ws = radv_amdgpu_winsys(_ws);
int ret = amdgpu_cs_syncobj_query(ws->dev, &handle, point, 1);
if (ret == 0)
return VK_SUCCESS;
else if (ret == -ENOMEM)
return VK_ERROR_OUT_OF_HOST_MEMORY;
else {
/* Remaining error are driver internal issues: EFAULT for
* dangling pointers and ENOENT for non-existing syncobj. */
fprintf(stderr, "amdgpu: internal error in radv_amdgpu_query_syncobj. (%d)\n", ret);
return VK_ERROR_UNKNOWN;
}
} }
static bool radv_amdgpu_wait_syncobj(struct radeon_winsys *_ws, const uint32_t *handles, static bool radv_amdgpu_wait_syncobj(struct radeon_winsys *_ws, const uint32_t *handles,
@ -1861,6 +1881,32 @@ static bool radv_amdgpu_wait_syncobj(struct radeon_winsys *_ws, const uint32_t *
} }
} }
static bool radv_amdgpu_wait_timeline_syncobj(struct radeon_winsys *_ws, const uint32_t *handles,
const uint64_t *points, uint32_t handle_count,
bool wait_all, bool available, uint64_t timeout)
{
struct radv_amdgpu_winsys *ws = radv_amdgpu_winsys(_ws);
/* The timeouts are signed, while vulkan timeouts are unsigned. */
timeout = MIN2(timeout, INT64_MAX);
int ret = amdgpu_cs_syncobj_timeline_wait(ws->dev, (uint32_t*)handles, (uint64_t*)points,
handle_count, timeout,
DRM_SYNCOBJ_WAIT_FLAGS_WAIT_FOR_SUBMIT |
(wait_all ? DRM_SYNCOBJ_WAIT_FLAGS_WAIT_ALL : 0) |
(available ? DRM_SYNCOBJ_WAIT_FLAGS_WAIT_AVAILABLE : 0),
NULL);
if (ret == 0) {
return true;
} else if (ret == -ETIME) {
return false;
} else {
fprintf(stderr, "amdgpu: radv_amdgpu_wait_syncobj failed! (%d)\n", errno);
return false;
}
}
static int radv_amdgpu_export_syncobj(struct radeon_winsys *_ws, static int radv_amdgpu_export_syncobj(struct radeon_winsys *_ws,
uint32_t syncobj, uint32_t syncobj,
int *fd) int *fd)
@ -1923,7 +1969,9 @@ void radv_amdgpu_cs_init_functions(struct radv_amdgpu_winsys *ws)
ws->base.destroy_syncobj = radv_amdgpu_destroy_syncobj; ws->base.destroy_syncobj = radv_amdgpu_destroy_syncobj;
ws->base.reset_syncobj = radv_amdgpu_reset_syncobj; ws->base.reset_syncobj = radv_amdgpu_reset_syncobj;
ws->base.signal_syncobj = radv_amdgpu_signal_syncobj; ws->base.signal_syncobj = radv_amdgpu_signal_syncobj;
ws->base.query_syncobj = radv_amdgpu_query_syncobj;
ws->base.wait_syncobj = radv_amdgpu_wait_syncobj; ws->base.wait_syncobj = radv_amdgpu_wait_syncobj;
ws->base.wait_timeline_syncobj = radv_amdgpu_wait_timeline_syncobj;
ws->base.export_syncobj = radv_amdgpu_export_syncobj; ws->base.export_syncobj = radv_amdgpu_export_syncobj;
ws->base.import_syncobj = radv_amdgpu_import_syncobj; ws->base.import_syncobj = radv_amdgpu_import_syncobj;
ws->base.export_syncobj_to_sync_file = radv_amdgpu_export_syncobj_to_sync_file; ws->base.export_syncobj_to_sync_file = radv_amdgpu_export_syncobj_to_sync_file;