diff --git a/src/panfrost/vulkan/panvk_cmd_meta.h b/src/panfrost/vulkan/panvk_cmd_meta.h
index c1ace59abdd..fadb372f433 100644
--- a/src/panfrost/vulkan/panvk_cmd_meta.h
+++ b/src/panfrost/vulkan/panvk_cmd_meta.h
@@ -31,14 +31,6 @@ struct panvk_cmd_meta_compute_save_ctx {
    struct panvk_push_constant_state push_constants;
 };
 
-void panvk_per_arch(cmd_meta_compute_start)(
-   struct panvk_cmd_buffer *cmdbuf,
-   struct panvk_cmd_meta_compute_save_ctx *save_ctx);
-
-void panvk_per_arch(cmd_meta_compute_end)(
-   struct panvk_cmd_buffer *cmdbuf,
-   const struct panvk_cmd_meta_compute_save_ctx *save_ctx);
-
 struct panvk_cmd_meta_graphics_save_ctx {
    const struct panvk_graphics_pipeline *pipeline;
    const struct panvk_descriptor_set *set0;
@@ -69,14 +61,6 @@ struct panvk_cmd_meta_graphics_save_ctx {
    struct panvk_occlusion_query_state occlusion_query;
 };
 
-void panvk_per_arch(cmd_meta_gfx_start)(
-   struct panvk_cmd_buffer *cmdbuf,
-   struct panvk_cmd_meta_graphics_save_ctx *save_ctx);
-
-void panvk_per_arch(cmd_meta_gfx_end)(
-   struct panvk_cmd_buffer *cmdbuf,
-   const struct panvk_cmd_meta_graphics_save_ctx *save_ctx);
-
 void panvk_per_arch(cmd_meta_resolve_attachments)(
    struct panvk_cmd_buffer *cmdbuf);
 
diff --git a/src/panfrost/vulkan/panvk_vX_cmd_meta.c b/src/panfrost/vulkan/panvk_vX_cmd_meta.c
index 4e28fa44e92..01332087f4e 100644
--- a/src/panfrost/vulkan/panvk_vX_cmd_meta.c
+++ b/src/panfrost/vulkan/panvk_vX_cmd_meta.c
@@ -31,10 +31,9 @@ copy_to_image_use_gfx_pipeline(struct panvk_image *dst_img)
    return false;
 }
 
-void
-panvk_per_arch(cmd_meta_compute_start)(
-   struct panvk_cmd_buffer *cmdbuf,
-   struct panvk_cmd_meta_compute_save_ctx *save_ctx)
+static void
+meta_compute_start(struct panvk_cmd_buffer *cmdbuf,
+                   struct panvk_cmd_meta_compute_save_ctx *save_ctx)
 {
    const struct panvk_descriptor_set *set0 =
       cmdbuf->state.compute.desc_state.sets[0];
@@ -59,10 +58,9 @@ panvk_per_arch(cmd_meta_compute_start)(
 #endif
 }
 
-void
-panvk_per_arch(cmd_meta_compute_end)(
-   struct panvk_cmd_buffer *cmdbuf,
-   const struct panvk_cmd_meta_compute_save_ctx *save_ctx)
+static void
+meta_compute_end(struct panvk_cmd_buffer *cmdbuf,
+                 const struct panvk_cmd_meta_compute_save_ctx *save_ctx)
 {
    struct panvk_descriptor_set *push_set0 =
       cmdbuf->state.compute.desc_state.push_sets[0];
@@ -91,10 +89,9 @@ panvk_per_arch(cmd_meta_compute_end)(
    compute_state_set_dirty(cmdbuf, DESC_STATE);
 }
 
-void
-panvk_per_arch(cmd_meta_gfx_start)(
-   struct panvk_cmd_buffer *cmdbuf,
-   struct panvk_cmd_meta_graphics_save_ctx *save_ctx)
+static void
+meta_gfx_start(struct panvk_cmd_buffer *cmdbuf,
+               struct panvk_cmd_meta_graphics_save_ctx *save_ctx)
 {
    const struct panvk_descriptor_set *set0 =
       cmdbuf->state.gfx.desc_state.sets[0];
@@ -136,10 +133,9 @@ panvk_per_arch(cmd_meta_gfx_start)(
 #endif
 }
 
-void
-panvk_per_arch(cmd_meta_gfx_end)(
-   struct panvk_cmd_buffer *cmdbuf,
-   const struct panvk_cmd_meta_graphics_save_ctx *save_ctx)
+static void
+meta_gfx_end(struct panvk_cmd_buffer *cmdbuf,
+             const struct panvk_cmd_meta_graphics_save_ctx *save_ctx)
 {
    struct panvk_descriptor_set *push_set0 =
       cmdbuf->state.gfx.desc_state.push_sets[0];
@@ -209,9 +205,9 @@ panvk_per_arch(CmdBlitImage2)(VkCommandBuffer commandBuffer,
    struct panvk_device *dev = to_panvk_device(cmdbuf->vk.base.device);
    struct panvk_cmd_meta_graphics_save_ctx save = {0};
 
-   panvk_per_arch(cmd_meta_gfx_start)(cmdbuf, &save);
+   meta_gfx_start(cmdbuf, &save);
    vk_meta_blit_image2(&cmdbuf->vk, &dev->meta, pBlitImageInfo);
-   panvk_per_arch(cmd_meta_gfx_end)(cmdbuf, &save);
+   meta_gfx_end(cmdbuf, &save);
 }
 
 VKAPI_ATTR void VKAPI_CALL
@@ -222,9 +218,9 @@ panvk_per_arch(CmdResolveImage2)(VkCommandBuffer commandBuffer,
    struct panvk_device *dev = to_panvk_device(cmdbuf->vk.base.device);
    struct panvk_cmd_meta_graphics_save_ctx save = {0};
 
-   panvk_per_arch(cmd_meta_gfx_start)(cmdbuf, &save);
+   meta_gfx_start(cmdbuf, &save);
    vk_meta_resolve_image2(&cmdbuf->vk, &dev->meta, pResolveImageInfo);
-   panvk_per_arch(cmd_meta_gfx_end)(cmdbuf, &save);
+   meta_gfx_end(cmdbuf, &save);
 }
 
 VKAPI_ATTR void VKAPI_CALL
@@ -252,10 +248,10 @@ panvk_per_arch(CmdClearAttachments)(VkCommandBuffer commandBuffer,
           VK_COLOR_COMPONENT_B_BIT | VK_COLOR_COMPONENT_A_BIT;
    }
 
-   panvk_per_arch(cmd_meta_gfx_start)(cmdbuf, &save);
+   meta_gfx_start(cmdbuf, &save);
    vk_meta_clear_attachments(&cmdbuf->vk, &dev->meta, &render, attachmentCount,
                              pAttachments, rectCount, pRects);
-   panvk_per_arch(cmd_meta_gfx_end)(cmdbuf, &save);
+   meta_gfx_end(cmdbuf, &save);
 }
 
 VKAPI_ATTR void VKAPI_CALL
@@ -269,11 +265,11 @@ panvk_per_arch(CmdClearDepthStencilImage)(
    struct panvk_device *dev = to_panvk_device(cmdbuf->vk.base.device);
    struct panvk_cmd_meta_graphics_save_ctx save = {0};
 
-   panvk_per_arch(cmd_meta_gfx_start)(cmdbuf, &save);
+   meta_gfx_start(cmdbuf, &save);
    vk_meta_clear_depth_stencil_image(&cmdbuf->vk, &dev->meta, &img->vk,
                                      imageLayout, pDepthStencil, rangeCount,
                                      pRanges);
-   panvk_per_arch(cmd_meta_gfx_end)(cmdbuf, &save);
+   meta_gfx_end(cmdbuf, &save);
 }
 
 VKAPI_ATTR void VKAPI_CALL
@@ -288,10 +284,10 @@ panvk_per_arch(CmdClearColorImage)(VkCommandBuffer commandBuffer, VkImage image,
    struct panvk_device *dev = to_panvk_device(cmdbuf->vk.base.device);
    struct panvk_cmd_meta_graphics_save_ctx save = {0};
 
-   panvk_per_arch(cmd_meta_gfx_start)(cmdbuf, &save);
+   meta_gfx_start(cmdbuf, &save);
    vk_meta_clear_color_image(&cmdbuf->vk, &dev->meta, &img->vk, imageLayout,
                              img->vk.format, pColor, rangeCount, pRanges);
-   panvk_per_arch(cmd_meta_gfx_end)(cmdbuf, &save);
+   meta_gfx_end(cmdbuf, &save);
 }
 
 VKAPI_ATTR void VKAPI_CALL
@@ -302,9 +298,9 @@ panvk_per_arch(CmdCopyBuffer2)(VkCommandBuffer commandBuffer,
    struct panvk_device *dev = to_panvk_device(cmdbuf->vk.base.device);
    struct panvk_cmd_meta_compute_save_ctx save = {0};
 
-   panvk_per_arch(cmd_meta_compute_start)(cmdbuf, &save);
+   meta_compute_start(cmdbuf, &save);
    vk_meta_copy_buffer(&cmdbuf->vk, &dev->meta, pCopyBufferInfo);
-   panvk_per_arch(cmd_meta_compute_end)(cmdbuf, &save);
+   meta_compute_end(cmdbuf, &save);
 }
 
 static bool
@@ -401,19 +397,19 @@ panvk_per_arch(CmdCopyBufferToImage2)(
    if (use_gfx_pipeline) {
       struct panvk_cmd_meta_graphics_save_ctx save = {0};
 
-      panvk_per_arch(cmd_meta_gfx_start)(cmdbuf, &save);
+      meta_gfx_start(cmdbuf, &save);
       vk_meta_copy_buffer_to_image(&cmdbuf->vk, &dev->meta,
                                    pCopyBufferToImageInfo, &img_props,
                                    VK_PIPELINE_BIND_POINT_GRAPHICS);
-      panvk_per_arch(cmd_meta_gfx_end)(cmdbuf, &save);
+      meta_gfx_end(cmdbuf, &save);
    } else {
       struct panvk_cmd_meta_compute_save_ctx save = {0};
 
-      panvk_per_arch(cmd_meta_compute_start)(cmdbuf, &save);
+      meta_compute_start(cmdbuf, &save);
       vk_meta_copy_buffer_to_image(&cmdbuf->vk, &dev->meta,
                                    pCopyBufferToImageInfo, &img_props,
                                    VK_PIPELINE_BIND_POINT_COMPUTE);
-      panvk_per_arch(cmd_meta_compute_end)(cmdbuf, &save);
+      meta_compute_end(cmdbuf, &save);
    }
 }
 
@@ -429,10 +425,10 @@ panvk_per_arch(CmdCopyImageToBuffer2)(
       panvk_meta_copy_get_image_properties(img, false, false);
    struct panvk_cmd_meta_compute_save_ctx save = {0};
 
-   panvk_per_arch(cmd_meta_compute_start)(cmdbuf, &save);
+   meta_compute_start(cmdbuf, &save);
    vk_meta_copy_image_to_buffer(&cmdbuf->vk, &dev->meta, pCopyImageToBufferInfo,
                                 &img_props);
-   panvk_per_arch(cmd_meta_compute_end)(cmdbuf, &save);
+   meta_compute_end(cmdbuf, &save);
 }
 
 VKAPI_ATTR void VKAPI_CALL
@@ -444,10 +440,10 @@ panvk_per_arch(CmdFillBuffer)(VkCommandBuffer commandBuffer, VkBuffer dstBuffer,
    struct panvk_device *dev = to_panvk_device(cmdbuf->vk.base.device);
    struct panvk_cmd_meta_compute_save_ctx save = {0};
 
-   panvk_per_arch(cmd_meta_compute_start)(cmdbuf, &save);
+   meta_compute_start(cmdbuf, &save);
    vk_meta_fill_buffer(&cmdbuf->vk, &dev->meta, dstBuffer, dstOffset, fillSize,
                        data);
-   panvk_per_arch(cmd_meta_compute_end)(cmdbuf, &save);
+   meta_compute_end(cmdbuf, &save);
 }
 
 VKAPI_ATTR void VKAPI_CALL
@@ -459,10 +455,10 @@ panvk_per_arch(CmdUpdateBuffer)(VkCommandBuffer commandBuffer,
    struct panvk_device *dev = to_panvk_device(cmdbuf->vk.base.device);
    struct panvk_cmd_meta_compute_save_ctx save = {0};
 
-   panvk_per_arch(cmd_meta_compute_start)(cmdbuf, &save);
+   meta_compute_start(cmdbuf, &save);
    vk_meta_update_buffer(&cmdbuf->vk, &dev->meta, dstBuffer, dstOffset,
                          dataSize, pData);
-   panvk_per_arch(cmd_meta_compute_end)(cmdbuf, &save);
+   meta_compute_end(cmdbuf, &save);
 }
 
 static bool
@@ -560,19 +556,19 @@ panvk_per_arch(CmdCopyImage2)(VkCommandBuffer commandBuffer,
    if (use_gfx_pipeline) {
       struct panvk_cmd_meta_graphics_save_ctx save = {0};
 
-      panvk_per_arch(cmd_meta_gfx_start)(cmdbuf, &save);
+      meta_gfx_start(cmdbuf, &save);
       vk_meta_copy_image(&cmdbuf->vk, &dev->meta, pCopyImageInfo,
                          &src_img_props, &dst_img_props,
                          VK_PIPELINE_BIND_POINT_GRAPHICS);
-      panvk_per_arch(cmd_meta_gfx_end)(cmdbuf, &save);
+      meta_gfx_end(cmdbuf, &save);
    } else {
       struct panvk_cmd_meta_compute_save_ctx save = {0};
 
-      panvk_per_arch(cmd_meta_compute_start)(cmdbuf, &save);
+      meta_compute_start(cmdbuf, &save);
       vk_meta_copy_image(&cmdbuf->vk, &dev->meta, pCopyImageInfo,
                          &src_img_props, &dst_img_props,
                          VK_PIPELINE_BIND_POINT_COMPUTE);
-      panvk_per_arch(cmd_meta_compute_end)(cmdbuf, &save);
+      meta_compute_end(cmdbuf, &save);
    }
 }
 
@@ -760,7 +756,7 @@ panvk_per_arch(cmd_meta_resolve_attachments)(struct panvk_cmd_buffer *cmdbuf)
    struct panvk_device *dev = to_panvk_device(cmdbuf->vk.base.device);
    struct panvk_cmd_meta_graphics_save_ctx save = {0};
 
-   panvk_per_arch(cmd_meta_gfx_start)(cmdbuf, &save);
+   meta_gfx_start(cmdbuf, &save);
    vk_meta_resolve_rendering(&cmdbuf->vk, &dev->meta, &render_info);
-   panvk_per_arch(cmd_meta_gfx_end)(cmdbuf, &save);
+   meta_gfx_end(cmdbuf, &save);
 }