From 11926342e398b072706a9229329ec8dbd7748863 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Mon, 22 Mar 2021 11:39:21 -0400 Subject: [PATCH] zink: also check for device lost reset on flush if there's a reset callback available, call that instead of cycling Reviewed-by: Dave Airlie Part-of: --- src/gallium/drivers/zink/zink_context.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/gallium/drivers/zink/zink_context.c b/src/gallium/drivers/zink/zink_context.c index 4cef7b468de..681cc2d9764 100644 --- a/src/gallium/drivers/zink/zink_context.c +++ b/src/gallium/drivers/zink/zink_context.c @@ -1381,11 +1381,16 @@ flush_batch(struct zink_context *ctx) zink_end_render_pass(ctx, batch); zink_end_batch(ctx, batch); - incr_curr_batch(ctx); + if (ctx->batch.state->is_device_lost && ctx->reset.reset) { + ctx->is_device_lost = true; + ctx->reset.reset(ctx->reset.data, PIPE_GUILTY_CONTEXT_RESET); + } else { + incr_curr_batch(ctx); - zink_start_batch(ctx, batch); - if (zink_screen(ctx->base.screen)->info.have_EXT_transform_feedback && ctx->num_so_targets) - ctx->dirty_so_targets = true; + zink_start_batch(ctx, batch); + if (zink_screen(ctx->base.screen)->info.have_EXT_transform_feedback && ctx->num_so_targets) + ctx->dirty_so_targets = true; + } } struct zink_batch *