From f3969bf7df259ed97c76de3b21c3e94abf0455ec Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Thu, 13 Apr 2023 16:54:38 -0400 Subject: [PATCH] zink: remove atomics from zink_query this is never accessed from threads anymore and hasn't been for a long time Part-of: (cherry picked from commit cb83606279db22869c0095dbf5ad9cd1f70ecb89) --- .pick_status.json | 2 +- src/gallium/drivers/zink/zink_query.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 84413e0b4c4..99c70029b6b 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -733,7 +733,7 @@ "description": "zink: remove atomics from zink_query", "nominated": false, "nomination_type": null, - "resolution": 4, + "resolution": 1, "main_sha": null, "because_sha": null }, diff --git a/src/gallium/drivers/zink/zink_query.c b/src/gallium/drivers/zink/zink_query.c index 3370b49c5bb..86da0160c6f 100644 --- a/src/gallium/drivers/zink/zink_query.c +++ b/src/gallium/drivers/zink/zink_query.c @@ -549,7 +549,7 @@ zink_destroy_query(struct pipe_context *pctx, * otherwise just mark dead and wait */ if (query->batch_uses) { - p_atomic_set(&query->dead, true); + query->dead = true; return; } @@ -562,7 +562,7 @@ zink_prune_query(struct zink_screen *screen, struct zink_batch_state *bs, struct if (!zink_batch_usage_matches(query->batch_uses, bs)) return; query->batch_uses = NULL; - if (p_atomic_read(&query->dead)) + if (query->dead) destroy_query(screen, query); }