diff --git a/src/amd/vulkan/radv_debug.h b/src/amd/vulkan/radv_debug.h
index 54c5a59ee7b..870da72df17 100644
--- a/src/amd/vulkan/radv_debug.h
+++ b/src/amd/vulkan/radv_debug.h
@@ -28,39 +28,38 @@
 
 /* Please keep docs/envvars.rst up-to-date when you add/remove options. */
 enum {
-	RADV_DEBUG_NO_FAST_CLEARS    = 1u << 0,
-	RADV_DEBUG_NO_DCC            = 1u << 1,
-	RADV_DEBUG_DUMP_SHADERS      = 1u << 2,
-	RADV_DEBUG_NO_CACHE          = 1u << 3,
-	RADV_DEBUG_DUMP_SHADER_STATS = 1u << 4,
-	RADV_DEBUG_NO_HIZ            = 1u << 5,
-	RADV_DEBUG_NO_COMPUTE_QUEUE  = 1u << 6,
-	RADV_DEBUG_ALL_BOS           = 1u << 7,
-	RADV_DEBUG_NO_IBS            = 1u << 8,
-	RADV_DEBUG_DUMP_SPIRV        = 1u << 9,
-	RADV_DEBUG_VM_FAULTS         = 1u << 10,
-	RADV_DEBUG_ZERO_VRAM         = 1u << 11,
-	RADV_DEBUG_SYNC_SHADERS      = 1u << 12,
-	RADV_DEBUG_PREOPTIR          = 1u << 13,
-	RADV_DEBUG_NO_DYNAMIC_BOUNDS = 1u << 14,
-	RADV_DEBUG_NO_OUT_OF_ORDER   = 1u << 15,
-	RADV_DEBUG_INFO              = 1u << 16,
-	RADV_DEBUG_ERRORS            = 1u << 17,
-	RADV_DEBUG_STARTUP           = 1u << 18,
-	RADV_DEBUG_CHECKIR           = 1u << 19,
-	RADV_DEBUG_NOTHREADLLVM      = 1u << 20,
-	RADV_DEBUG_NOBINNING         = 1u << 21,
-	RADV_DEBUG_NO_NGG            = 1u << 22,
-        /* spare 1u << 23 */
-	RADV_DEBUG_DUMP_META_SHADERS = 1u << 24,
-	RADV_DEBUG_NO_MEMORY_CACHE   = 1u << 25,
-	RADV_DEBUG_DISCARD_TO_DEMOTE = 1u << 26,
-	RADV_DEBUG_LLVM              = 1u << 27,
-	RADV_DEBUG_FORCE_COMPRESS    = 1u << 28,
-	RADV_DEBUG_HANG              = 1u << 29,
-	RADV_DEBUG_IMG               = 1u << 30,
-	RADV_DEBUG_NO_UMR            = 1u << 31,
-	RADV_DEBUG_INVARIANT_GEOM    = 1ull << 32,
+	RADV_DEBUG_NO_FAST_CLEARS    = 1ull << 0,
+	RADV_DEBUG_NO_DCC            = 1ull << 1,
+	RADV_DEBUG_DUMP_SHADERS      = 1ull << 2,
+	RADV_DEBUG_NO_CACHE          = 1ull << 3,
+	RADV_DEBUG_DUMP_SHADER_STATS = 1ull << 4,
+	RADV_DEBUG_NO_HIZ            = 1ull << 5,
+	RADV_DEBUG_NO_COMPUTE_QUEUE  = 1ull << 6,
+	RADV_DEBUG_ALL_BOS           = 1ull << 7,
+	RADV_DEBUG_NO_IBS            = 1ull << 8,
+	RADV_DEBUG_DUMP_SPIRV        = 1ull << 9,
+	RADV_DEBUG_VM_FAULTS         = 1ull << 10,
+	RADV_DEBUG_ZERO_VRAM         = 1ull << 11,
+	RADV_DEBUG_SYNC_SHADERS      = 1ull << 12,
+	RADV_DEBUG_PREOPTIR          = 1ull << 13,
+	RADV_DEBUG_NO_DYNAMIC_BOUNDS = 1ull << 14,
+	RADV_DEBUG_NO_OUT_OF_ORDER   = 1ull << 15,
+	RADV_DEBUG_INFO              = 1ull << 16,
+	RADV_DEBUG_ERRORS            = 1ull << 17,
+	RADV_DEBUG_STARTUP           = 1ull << 18,
+	RADV_DEBUG_CHECKIR           = 1ull << 19,
+	RADV_DEBUG_NOTHREADLLVM      = 1ull << 20,
+	RADV_DEBUG_NOBINNING         = 1ull << 21,
+	RADV_DEBUG_NO_NGG            = 1ull << 22,
+	RADV_DEBUG_DUMP_META_SHADERS = 1ull << 23,
+	RADV_DEBUG_NO_MEMORY_CACHE   = 1ull << 24,
+	RADV_DEBUG_DISCARD_TO_DEMOTE = 1ull << 25,
+	RADV_DEBUG_LLVM              = 1ull << 26,
+	RADV_DEBUG_FORCE_COMPRESS    = 1ull << 27,
+	RADV_DEBUG_HANG              = 1ull << 28,
+	RADV_DEBUG_IMG               = 1ull << 29,
+	RADV_DEBUG_NO_UMR            = 1ull << 30,
+	RADV_DEBUG_INVARIANT_GEOM    = 1ull << 31,
 };
 
 enum {