From 3b23995a8c9a034a0d608731815ced1981ceffc6 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Mon, 15 May 2023 09:24:48 -0400 Subject: [PATCH] zink: flag 'has_work' on batch when promoting a cmd has_work controls whether a flush can be deferred, i.e., when unset a flush may be deferred since a promoted cmd must still be flushed to take effect, ensure this is always set when promoted cmds are pending cc: mesa-stable Part-of: (cherry picked from commit 0f510040dcb23905eac6e8ec86a56ab28c5a097a) --- .pick_status.json | 2 +- src/gallium/drivers/zink/zink_synchronization.cpp | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.pick_status.json b/.pick_status.json index c9f395430c4..224ad7ef367 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -409,7 +409,7 @@ "description": "zink: flag 'has_work' on batch when promoting a cmd", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null }, diff --git a/src/gallium/drivers/zink/zink_synchronization.cpp b/src/gallium/drivers/zink/zink_synchronization.cpp index c33c3765ce0..a19117ce357 100644 --- a/src/gallium/drivers/zink/zink_synchronization.cpp +++ b/src/gallium/drivers/zink/zink_synchronization.cpp @@ -280,6 +280,7 @@ zink_get_cmdbuf(struct zink_context *ctx, struct zink_resource *src, struct zink zink_batch_no_rp(ctx); if (unordered_exec) { ctx->batch.state->has_barriers = true; + ctx->batch.has_work = true; return ctx->batch.state->barrier_cmdbuf; } return ctx->batch.state->cmdbuf;