diff --git a/src/freedreno/vulkan/tu_clear_blit.cc b/src/freedreno/vulkan/tu_clear_blit.cc
index 5ab25d81bf0..bf9dce1a98b 100644
--- a/src/freedreno/vulkan/tu_clear_blit.cc
+++ b/src/freedreno/vulkan/tu_clear_blit.cc
@@ -1755,7 +1755,7 @@ copy_format(VkFormat vk_format, VkImageAspectFlags aspect_mask)
    /* For VK_FORMAT_D32_SFLOAT_S8_UINT and YCbCr formats use our existing helpers */
    if (vk_format == VK_FORMAT_D32_SFLOAT_S8_UINT ||
        vk_format_get_ycbcr_info(vk_format))
-      return tu6_plane_format(vk_format, tu6_plane_index(vk_format, aspect_mask));
+      return tu_aspects_to_plane(vk_format, aspect_mask);
 
    /* Otherwise, simply return the pipe_format */
    return format;
@@ -2151,9 +2151,7 @@ tu_image_view_blit(struct fdl6_view *iview,
                    const VkImageSubresourceLayers *subres,
                    uint32_t layer)
 {
-   enum pipe_format format =
-      tu6_plane_format(image->vk.format, tu6_plane_index(image->vk.format,
-                                                         subres->aspectMask));
+   enum pipe_format format = tu_aspects_to_plane(image->vk.format, subres->aspectMask);
    tu_image_view_copy_blit<CHIP>(iview, image, format, subres, layer, false);
 }
 
@@ -2220,17 +2218,11 @@ tu6_blit_image(struct tu_cmd_buffer *cmd,
       blit_param = z_scale ? R3D_Z_SCALE : 0;
    }
 
-   /* use the right format in setup() for D32_S8
-    * TODO: this probably should use a helper
-    */
-   enum pipe_format src_format =
-      tu6_plane_format(src_image->vk.format,
-                       tu6_plane_index(src_image->vk.format,
-                                       info->srcSubresource.aspectMask));
-   enum pipe_format dst_format =
-      tu6_plane_format(dst_image->vk.format,
-                       tu6_plane_index(src_image->vk.format,
-                                       info->srcSubresource.aspectMask));
+   /* use the right format in setup() for D32_S8 */
+   enum pipe_format src_format = tu_aspects_to_plane(
+      src_image->vk.format, info->srcSubresource.aspectMask);
+   enum pipe_format dst_format = tu_aspects_to_plane(
+      dst_image->vk.format, info->dstSubresource.aspectMask);
    trace_start_blit(&cmd->trace, cs,
                   ops == &r3d_ops<CHIP>,
                   src_image->vk.format,
@@ -3080,9 +3072,7 @@ clear_image_cp_blit(struct tu_cmd_buffer *cmd,
    if (image->vk.format == VK_FORMAT_E5B9G9R9_UFLOAT_PACK32) {
       format = PIPE_FORMAT_R32_UINT;
    } else {
-      format = tu6_plane_format(image->vk.format,
-                                tu6_plane_index(image->vk.format,
-                                                aspect_mask));
+      format = tu_aspects_to_plane(image->vk.format, aspect_mask);
    }
 
    if (image->layout[0].depth0 > 1) {
diff --git a/src/freedreno/vulkan/tu_image.cc b/src/freedreno/vulkan/tu_image.cc
index 19248d8a3a2..aca71e5a6c3 100644
--- a/src/freedreno/vulkan/tu_image.cc
+++ b/src/freedreno/vulkan/tu_image.cc
@@ -212,7 +212,7 @@ tu_image_view_init(struct tu_device *device,
 
    enum pipe_format format;
    if (vk_format == VK_FORMAT_D32_SFLOAT_S8_UINT)
-      format = tu6_plane_format(vk_format, tu6_plane_index(vk_format, aspect_mask));
+      format = tu_aspects_to_plane(vk_format, aspect_mask);
    else
       format = vk_format_to_pipe_format(vk_format);
 
diff --git a/src/freedreno/vulkan/tu_image.h b/src/freedreno/vulkan/tu_image.h
index 1bb63cfb5d6..ca8dcd01cbf 100644
--- a/src/freedreno/vulkan/tu_image.h
+++ b/src/freedreno/vulkan/tu_image.h
@@ -76,6 +76,7 @@ VK_DEFINE_NONDISP_HANDLE_CASTS(tu_image_view, vk.base, VkImageView,
                                VK_OBJECT_TYPE_IMAGE_VIEW);
 
 uint32_t tu6_plane_count(VkFormat format);
+
 enum pipe_format tu6_plane_format(VkFormat format, uint32_t plane);
 
 uint32_t tu6_plane_index(VkFormat format, VkImageAspectFlags aspect_mask);
@@ -83,6 +84,13 @@ uint32_t tu6_plane_index(VkFormat format, VkImageAspectFlags aspect_mask);
 enum pipe_format tu_format_for_aspect(enum pipe_format format,
                                       VkImageAspectFlags aspect_mask);
 
+static inline enum pipe_format
+tu_aspects_to_plane(VkFormat format, VkImageAspectFlags aspect_mask)
+{
+   uint32_t plane = tu6_plane_index(format, aspect_mask);
+   return tu6_plane_format(format, plane);
+}
+
 uint64_t
 tu_layer_address(const struct fdl6_view *iview, uint32_t layer);