fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-25 01:30:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

zink: add a screen function for waiting on a batch id

Browse source 
this is super hacky for the non-timeline case but whatever

Reviewed-by: Dave Airlie <airlied@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11686>
This commit is contained in:
Mike Blumenkrantz 2021-05-12 11:36:46 -04:00 • committed by Marge Bot
parent 347163aec2
commit fd633c2444
2 changed files with 74 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

71
src/gallium/drivers/zink/zink_screen.c
View file

@ -1517,6 +1517,77 @@ zink_screen_timeline_wait(struct zink_screen *screen, uint32_t batch_id, uint64_
return success;
}
struct noop_submit_info {
struct zink_screen *screen;
VkFence fence;
};
static void
noop_submit(void *data, void *gdata, int thread_index)
{
struct noop_submit_info *n = data;
VkSubmitInfo si = {0};
si.sType = VK_STRUCTURE_TYPE_SUBMIT_INFO;
if (vkQueueSubmit(n->screen->threaded ? n->screen->thread_queue : n->screen->queue,
1, &si, n->fence) != VK_SUCCESS) {
debug_printf("ZINK: vkQueueSubmit() failed\n");
n->screen->device_lost = true;
}
}
bool
zink_screen_batch_id_wait(struct zink_screen *screen, uint32_t batch_id, uint64_t timeout)
{
if (zink_screen_check_last_finished(screen, batch_id))
return true;
if (screen->info.have_KHR_timeline_semaphore)
return zink_screen_timeline_wait(screen, batch_id, timeout);
if (!timeout)
return false;
uint32_t new_id = 0;
while (!new_id)
new_id = p_atomic_inc_return(&screen->curr_batch);
VkResult ret;
struct noop_submit_info n;
uint64_t abs_timeout = os_time_get_absolute_timeout(timeout);
uint64_t remaining = PIPE_TIMEOUT_INFINITE;
VkFenceCreateInfo fci = {0};
struct util_queue_fence fence;
util_queue_fence_init(&fence);
fci.sType = VK_STRUCTURE_TYPE_FENCE_CREATE_INFO;
if (vkCreateFence(screen->dev, &fci, NULL, &n.fence) != VK_SUCCESS)
return false;
n.screen = screen;
if (screen->threaded) {
/* must use thread dispatch for sanity */
util_queue_add_job(&screen->flush_queue, &n, &fence, noop_submit, NULL, 0);
util_queue_fence_wait(&fence);
} else {
noop_submit(&n, NULL, 0);
}
if (timeout != PIPE_TIMEOUT_INFINITE) {
int64_t time_ns = os_time_get_nano();
remaining = abs_timeout > time_ns ? abs_timeout - time_ns : 0;
}
if (remaining)
ret = vkWaitForFences(screen->dev, 1, &n.fence, VK_TRUE, remaining);
else
ret = vkGetFenceStatus(screen->dev, n.fence);
vkDestroyFence(screen->dev, n.fence, NULL);
bool success = zink_screen_handle_vkresult(screen, ret);
if (success)
zink_screen_update_last_finished(screen, new_id);
return success;
}
static uint32_t
zink_get_loader_version(void)
{

3
src/gallium/drivers/zink/zink_screen.h
View file

@ -225,6 +225,9 @@ struct mem_cache_entry {
VkFormat
zink_get_format(struct zink_screen *screen, enum pipe_format format);
bool
zink_screen_batch_id_wait(struct zink_screen *screen, uint32_t batch_id, uint64_t timeout);
bool
zink_screen_timeline_wait(struct zink_screen *screen, uint32_t batch_id, uint64_t timeout);