Mesa (main): panfrost: Move panfrost_modifier_to_layout() to pan_texture.c

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: 56a4aa933211471850ebfef711ef6a2e17f4be48
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=56a4aa933211471850ebfef711ef6a2e17f4be48

Author: Boris Brezillon <boris.brezillon at collabora.com>
Date:   Fri Aug  6 14:16:18 2021 +0200

panfrost: Move panfrost_modifier_to_layout() to pan_texture.c

This function is not used outside pan_texture.c.

Signed-off-by: Boris Brezillon <boris.brezillon at collabora.com>
Reviewed-by: Alyssa Rosenzweig <alyssa.rosenzweig at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12551>

---

 src/panfrost/lib/pan_texture.c | 15 +++++++++++++++
 src/panfrost/lib/pan_texture.h | 15 ---------------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/panfrost/lib/pan_texture.c b/src/panfrost/lib/pan_texture.c
index 06d68c82845..49da5340d0a 100644
--- a/src/panfrost/lib/pan_texture.c
+++ b/src/panfrost/lib/pan_texture.c
@@ -404,6 +404,21 @@ panfrost_emit_texture_payload(const struct panfrost_device *dev,
         }
 }
 
+/* Map modifiers to mali_texture_layout for packing in a texture descriptor */
+
+static enum mali_texture_layout
+panfrost_modifier_to_layout(uint64_t modifier)
+{
+        if (drm_is_afbc(modifier))
+                return MALI_TEXTURE_LAYOUT_AFBC;
+        else if (modifier == DRM_FORMAT_MOD_ARM_16X16_BLOCK_U_INTERLEAVED)
+                return MALI_TEXTURE_LAYOUT_TILED;
+        else if (modifier == DRM_FORMAT_MOD_LINEAR)
+                return MALI_TEXTURE_LAYOUT_LINEAR;
+        else
+                unreachable("Invalid modifer");
+}
+
 void
 panfrost_new_texture(const struct panfrost_device *dev,
                      const struct pan_image_view *iview,
diff --git a/src/panfrost/lib/pan_texture.h b/src/panfrost/lib/pan_texture.h
index d33a14c2b19..0b797b9fc11 100644
--- a/src/panfrost/lib/pan_texture.h
+++ b/src/panfrost/lib/pan_texture.h
@@ -185,21 +185,6 @@ struct pan_scoreboard;
         ((mod >> 52) == (DRM_FORMAT_MOD_ARM_TYPE_AFBC | \
                 (DRM_FORMAT_MOD_VENDOR_ARM << 4)))
 
-/* Map modifiers to mali_texture_layout for packing in a texture descriptor */
-
-static inline enum mali_texture_layout
-panfrost_modifier_to_layout(uint64_t modifier)
-{
-        if (drm_is_afbc(modifier))
-                return MALI_TEXTURE_LAYOUT_AFBC;
-        else if (modifier == DRM_FORMAT_MOD_ARM_16X16_BLOCK_U_INTERLEAVED)
-                return MALI_TEXTURE_LAYOUT_TILED;
-        else if (modifier == DRM_FORMAT_MOD_LINEAR)
-                return MALI_TEXTURE_LAYOUT_LINEAR;
-        else
-                unreachable("Invalid modifer");
-}
-
 struct pan_image_explicit_layout {
         unsigned offset;
         unsigned line_stride;