From 4a330b69134b0f9a49509169f36d08ecafebba9b Mon Sep 17 00:00:00 2001 From: Lars-Ivar Hesselberg Simonsen Date: Wed, 22 Apr 2026 15:40:48 +0200 Subject: [PATCH] panvk: Fix debug flag overlap PANVK_DEBUG_HSR_PREPASS and PANVK_DEBUG_NO_EXTENDED_VA_RANGE have the same value, meaning they both get toggled when one is. This commit moves PANVK_DEBUG_HSR_PREPASS to the following value. Fixes: 2d9be417065 ("panvk/v13: Support HSR Prepass") Reviewed-by: John Anthony (cherry picked from commit 82592433e605cdaa8d2e0593eba0353254e9500e) Part-of: --- .pick_status.json | 2 +- src/panfrost/vulkan/panvk_instance.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 16ceec83b4b..c8d897f3edb 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -2854,7 +2854,7 @@ "description": "panvk: Fix debug flag overlap", "nominated": true, "nomination_type": 2, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "2d9be417065801124eac3845f71df280f1ebc2bb", "notes": null diff --git a/src/panfrost/vulkan/panvk_instance.h b/src/panfrost/vulkan/panvk_instance.h index 4f991165436..7ea91a9bac7 100644 --- a/src/panfrost/vulkan/panvk_instance.h +++ b/src/panfrost/vulkan/panvk_instance.h @@ -33,7 +33,7 @@ enum panvk_debug_flags { PANVK_DEBUG_NO_USER_MMAP_SYNC = 1 << 15, PANVK_DEBUG_COHERENT_BEFORE_CACHED = 1 << 16, PANVK_DEBUG_NO_EXTENDED_VA_RANGE = 1 << 17, - PANVK_DEBUG_HSR_PREPASS = 1 << 17, + PANVK_DEBUG_HSR_PREPASS = 1 << 18, }; extern uint64_t panvk_debug;