diff --git a/.pick_status.json b/.pick_status.json
index 22ee31280f8..bc69ae1c250 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -4294,7 +4294,7 @@
         "description": "panvk/csf: rework cache flush reduction",
         "nominated": true,
         "nomination_type": 2,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "28e4d2249725ddc3d4dd031820e209c3bc4183ad",
         "notes": null
diff --git a/src/panfrost/vulkan/csf/panvk_cmd_buffer.h b/src/panfrost/vulkan/csf/panvk_cmd_buffer.h
index b26c041d23b..092372bbe79 100644
--- a/src/panfrost/vulkan/csf/panvk_cmd_buffer.h
+++ b/src/panfrost/vulkan/csf/panvk_cmd_buffer.h
@@ -382,8 +382,6 @@ struct panvk_cmd_buffer {
    struct panvk_pool tls_pool;
    struct list_head push_sets;
 
-   uint32_t flush_id;
-
    struct {
       struct u_trace uts[PANVK_SUBQUEUE_COUNT];
    } utrace;
diff --git a/src/panfrost/vulkan/csf/panvk_vX_cmd_buffer.c b/src/panfrost/vulkan/csf/panvk_vX_cmd_buffer.c
index 2dfa71d1634..1081bf4f125 100644
--- a/src/panfrost/vulkan/csf/panvk_vX_cmd_buffer.c
+++ b/src/panfrost/vulkan/csf/panvk_vX_cmd_buffer.c
@@ -189,7 +189,6 @@ VKAPI_ATTR VkResult VKAPI_CALL
 panvk_per_arch(EndCommandBuffer)(VkCommandBuffer commandBuffer)
 {
    VK_FROM_HANDLE(panvk_cmd_buffer, cmdbuf, commandBuffer);
-   struct panvk_device *dev = to_panvk_device(cmdbuf->vk.base.device);
 
    emit_tls(cmdbuf);
    flush_sync_points(cmdbuf);
@@ -205,8 +204,6 @@ panvk_per_arch(EndCommandBuffer)(VkCommandBuffer commandBuffer)
       }
    }
 
-   cmdbuf->flush_id = panthor_kmod_get_flush_id(dev->kmod.dev);
-
    return vk_command_buffer_end(&cmdbuf->vk);
 }
 
diff --git a/src/panfrost/vulkan/csf/panvk_vX_queue.c b/src/panfrost/vulkan/csf/panvk_vX_queue.c
index b67713f330f..dc1a0322376 100644
--- a/src/panfrost/vulkan/csf/panvk_vX_queue.c
+++ b/src/panfrost/vulkan/csf/panvk_vX_queue.c
@@ -937,7 +937,7 @@ panvk_queue_submit_init_cmdbufs(struct panvk_queue_submit *submit,
                .queue_index = j,
                .stream_size = cs_root_chunk_size(b),
                .stream_addr = cs_root_chunk_gpu_addr(b),
-               .latest_flush = cmdbuf->flush_id,
+               .latest_flush = panthor_kmod_get_flush_id(dev->kmod.dev),
             };
       }