From ffd79476ece07abf41219199e4916a2963a63bb0 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Wed, 21 Feb 2024 11:10:10 -0500 Subject: [PATCH] zink: assert that batch_id is valid in zink_screen_check_last_finished() 0 is never a valid batch_id cc: mesa-stable Part-of: (cherry picked from commit 35185ad9df8efa84981607cec3dd495c875a534b) --- .pick_status.json | 2 +- src/gallium/drivers/zink/zink_screen.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.pick_status.json b/.pick_status.json index 4594d0b9bba..cb5435e1b82 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -304,7 +304,7 @@ "description": "zink: assert that batch_id is valid in zink_screen_check_last_finished()", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null, "notes": null diff --git a/src/gallium/drivers/zink/zink_screen.h b/src/gallium/drivers/zink/zink_screen.h index 886700b65ad..c907bc6e85d 100644 --- a/src/gallium/drivers/zink/zink_screen.h +++ b/src/gallium/drivers/zink/zink_screen.h @@ -61,6 +61,7 @@ static inline bool zink_screen_check_last_finished(struct zink_screen *screen, uint32_t batch_id) { const uint32_t check_id = (uint32_t)batch_id; + assert(check_id); /* last_finished may have wrapped */ if (screen->last_finished < UINT_MAX / 2) { /* last_finished has wrapped, batch_id has not */