diff --git a/src/gallium/drivers/panfrost/pan_resource.c b/src/gallium/drivers/panfrost/pan_resource.c
index 30f3ed26011..330ee8f213b 100644
--- a/src/gallium/drivers/panfrost/pan_resource.c
+++ b/src/gallium/drivers/panfrost/pan_resource.c
@@ -380,7 +380,7 @@ static bool
 panfrost_should_tile_afbc(const struct panfrost_device *dev,
                           const struct panfrost_resource *pres)
 {
-   return panfrost_afbc_can_tile(dev) && pres->base.width0 >= 128 &&
+   return panfrost_afbc_can_tile(dev->arch) && pres->base.width0 >= 128 &&
           pres->base.height0 >= 128 && !(dev->debug & PAN_DBG_FORCE_PACK);
 }
 
diff --git a/src/gallium/drivers/panfrost/pan_screen.c b/src/gallium/drivers/panfrost/pan_screen.c
index 200e7287d8f..3fd9ce4e733 100644
--- a/src/gallium/drivers/panfrost/pan_screen.c
+++ b/src/gallium/drivers/panfrost/pan_screen.c
@@ -619,7 +619,7 @@ panfrost_walk_dmabuf_modifiers(struct pipe_screen *screen,
    bool afbc =
       dev->has_afbc && panfrost_format_supports_afbc(dev->arch, format);
    bool ytr = panfrost_afbc_can_ytr(format);
-   bool tiled_afbc = panfrost_afbc_can_tile(dev);
+   bool tiled_afbc = panfrost_afbc_can_tile(dev->arch);
 
    unsigned count = 0;
 
diff --git a/src/panfrost/lib/pan_afbc.c b/src/panfrost/lib/pan_afbc.c
index 9f56dbf88ac..461d35b3174 100644
--- a/src/panfrost/lib/pan_afbc.c
+++ b/src/panfrost/lib/pan_afbc.c
@@ -191,13 +191,3 @@ panfrost_afbc_can_pack(enum pipe_format format)
 
    return desc->colorspace == UTIL_FORMAT_COLORSPACE_RGB;
 }
-
-/*
- * Check if the device supports AFBC with tiled headers (and hence also solid
- * colour blocks).
- */
-bool
-panfrost_afbc_can_tile(const struct panfrost_device *dev)
-{
-   return (dev->arch >= 7);
-}
diff --git a/src/panfrost/lib/pan_texture.h b/src/panfrost/lib/pan_texture.h
index 6998d368ba4..9179e574c7a 100644
--- a/src/panfrost/lib/pan_texture.h
+++ b/src/panfrost/lib/pan_texture.h
@@ -240,7 +240,14 @@ bool panfrost_afbc_can_ytr(enum pipe_format format);
 
 bool panfrost_afbc_can_pack(enum pipe_format format);
 
-bool panfrost_afbc_can_tile(const struct panfrost_device *dev);
+/*
+ * Check if a gen supports AFBC with tiled headers (and hence also solid
+ * colour blocks).
+ */
+static inline bool panfrost_afbc_can_tile(unsigned arch)
+{
+   return arch >= 7;
+}
 
 /*
  * Represents the block size of a single plane. For AFBC, this represents the