fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-07 15:48:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

zink: make timeline_wait use only a screen param

Browse source 
Reviewed-by: Dave Airlie <airlied@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10882>
This commit is contained in:
Mike Blumenkrantz 2021-05-12 11:06:11 -04:00
parent b27e729c0d
commit 6766c983f0
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/gallium/drivers/zink/zink_context.c
View file

@ -2240,9 +2240,8 @@ zink_fence_wait(struct pipe_context *pctx)
}
static bool
timeline_wait(struct zink_context *ctx, uint32_t batch_id, uint64_t timeout)
timeline_wait(struct zink_screen *screen, uint32_t batch_id, uint64_t timeout)
{
struct zink_screen *screen = zink_screen(ctx->base.screen);
VkSemaphoreWaitInfo wi = {};
wi.sType = VK_STRUCTURE_TYPE_SEMAPHORE_WAIT_INFO;
wi.semaphoreCount = 1;
@ -2258,8 +2257,6 @@ timeline_wait(struct zink_context *ctx, uint32_t batch_id, uint64_t timeout)
if (success)
zink_screen_update_last_finished(screen, batch_id);
else
check_device_lost(ctx);
return success;
}
@ -2273,7 +2270,8 @@ zink_wait_on_batch(struct zink_context *ctx, uint32_t batch_id)
/* not submitted yet */
flush_batch(ctx, true);
if (ctx->have_timelines) {
timeline_wait(ctx, batch_id, UINT64_MAX);
if (!timeline_wait(zink_screen(ctx->base.screen), batch_id, UINT64_MAX))
check_device_lost(ctx);
return;
}
simple_mtx_lock(&ctx->batch_mtx);
@ -2315,8 +2313,12 @@ zink_check_batch_completion(struct zink_context *ctx, uint32_t batch_id)
if (zink_screen_check_last_finished(zink_screen(ctx->base.screen), batch_id))
return true;
if (ctx->have_timelines)
return timeline_wait(ctx, batch_id, 0);
if (ctx->have_timelines) {
bool success = timeline_wait(zink_screen(ctx->base.screen), batch_id, 0);
if (!success)
check_device_lost(ctx);
return success;
}
struct zink_fence *fence;
simple_mtx_lock(&ctx->batch_mtx);