diff --git a/.pick_status.json b/.pick_status.json
index 0a5c45e45bd..9a56244cde7 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -22,7 +22,7 @@
         "description": "tu: Fix vk2tu_*_stage flag type",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "59259a0167184e0cf9f472d379ac9723a2842139"
     },
diff --git a/src/freedreno/vulkan/tu_cmd_buffer.cc b/src/freedreno/vulkan/tu_cmd_buffer.cc
index 88e9fa24205..7faa5c155b5 100644
--- a/src/freedreno/vulkan/tu_cmd_buffer.cc
+++ b/src/freedreno/vulkan/tu_cmd_buffer.cc
@@ -3922,10 +3922,10 @@ vk2tu_single_stage(VkPipelineStageFlags2 vk_stage, bool dst)
 }
 
 static enum tu_stage
-vk2tu_src_stage(VkPipelineStageFlags vk_stages)
+vk2tu_src_stage(VkPipelineStageFlags2 vk_stages)
 {
    enum tu_stage stage = TU_STAGE_CP;
-   u_foreach_bit (bit, vk_stages) {
+   u_foreach_bit64 (bit, vk_stages) {
       enum tu_stage new_stage = vk2tu_single_stage(1ull << bit, false);
       stage = MAX2(stage, new_stage);
    }
@@ -3934,10 +3934,10 @@ vk2tu_src_stage(VkPipelineStageFlags vk_stages)
 }
 
 static enum tu_stage
-vk2tu_dst_stage(VkPipelineStageFlags vk_stages)
+vk2tu_dst_stage(VkPipelineStageFlags2 vk_stages)
 {
    enum tu_stage stage = TU_STAGE_PS;
-   u_foreach_bit (bit, vk_stages) {
+   u_foreach_bit64 (bit, vk_stages) {
       enum tu_stage new_stage = vk2tu_single_stage(1ull << bit, true);
       stage = MIN2(stage, new_stage);
    }