diff --git a/src/panfrost/lib/pan_afbc.c b/src/panfrost/lib/pan_afbc.c
index bf9b117f41e..cfd715f608f 100644
--- a/src/panfrost/lib/pan_afbc.c
+++ b/src/panfrost/lib/pan_afbc.c
@@ -92,17 +92,13 @@ panfrost_format_supports_afbc(enum pipe_format format)
         if (util_format_is_rgba8_variant(desc))
                 return true;
 
-        /* Only Z24S8 variants are compressible as Z/S */
-
-        if (panfrost_is_z24s8_variant(format))
-                return true;
-
-        /* Lookup special formats */
         switch (format) {
         case PIPE_FORMAT_R8G8B8_UNORM:
         case PIPE_FORMAT_B8G8R8_UNORM:
         case PIPE_FORMAT_R5G6B5_UNORM:
         case PIPE_FORMAT_B5G6R5_UNORM:
+        case PIPE_FORMAT_Z24_UNORM_S8_UINT:
+        case PIPE_FORMAT_Z24X8_UNORM:
         case PIPE_FORMAT_Z16_UNORM:
                 return true;
         default:
diff --git a/src/panfrost/lib/pan_format.c b/src/panfrost/lib/pan_format.c
index acd7b37438a..3df72158f12 100644
--- a/src/panfrost/lib/pan_format.c
+++ b/src/panfrost/lib/pan_format.c
@@ -388,20 +388,6 @@ struct panfrost_format panfrost_pipe_format_table[PIPE_FORMAT_COUNT] = {
 #undef _T
 #undef _R
 
-/* Is a format encoded like Z24S8 and therefore compatible for render? */
-
-bool
-panfrost_is_z24s8_variant(enum pipe_format fmt)
-{
-        switch (fmt) {
-                case PIPE_FORMAT_Z24_UNORM_S8_UINT:
-                case PIPE_FORMAT_Z24X8_UNORM:
-                        return true;
-                default:
-                        return false;
-        }
-}
-
 /* Translate a PIPE swizzle quad to a 12-bit Mali swizzle code. PIPE
  * swizzles line up with Mali swizzles for the XYZW01, but PIPE swizzles have
  * an additional "NONE" field that we have to mask out to zero. Additionally,
diff --git a/src/panfrost/lib/pan_texture.h b/src/panfrost/lib/pan_texture.h
index 70f2ca211d6..e6ea7012258 100644
--- a/src/panfrost/lib/pan_texture.h
+++ b/src/panfrost/lib/pan_texture.h
@@ -153,9 +153,6 @@ panfrost_blend_format(enum pipe_format format);
 
 extern struct panfrost_format panfrost_pipe_format_table[PIPE_FORMAT_COUNT];
 
-bool
-panfrost_is_z24s8_variant(enum pipe_format fmt);
-
 enum mali_z_internal_format
 panfrost_get_z_internal_format(enum pipe_format fmt);