diff --git a/src/gallium/drivers/panfrost/pan_fb_preload.c b/src/gallium/drivers/panfrost/pan_fb_preload.c
index 96dc7e95408..fcc22c3a530 100644
--- a/src/gallium/drivers/panfrost/pan_fb_preload.c
+++ b/src/gallium/drivers/panfrost/pan_fb_preload.c
@@ -708,19 +708,7 @@ pan_preload_get_views(const struct pan_fb_info *fb, bool zs,
 
       if (fb->zs.preload.s) {
          const struct pan_image_view *view = fb->zs.view.s ?: fb->zs.view.zs;
-         enum pipe_format fmt = util_format_get_depth_only(view->format);
-
-         switch (view->format) {
-         case PIPE_FORMAT_Z24_UNORM_S8_UINT:
-            fmt = PIPE_FORMAT_X24S8_UINT;
-            break;
-         case PIPE_FORMAT_Z32_FLOAT_S8X24_UINT:
-            fmt = PIPE_FORMAT_X32_S8X24_UINT;
-            break;
-         default:
-            fmt = view->format;
-            break;
-         }
+         enum pipe_format fmt = util_format_stencil_only(view->format);
 
          if (fmt != view->format) {
             *patched_s = *view;
@@ -864,19 +852,7 @@ pan_preload_emit_textures(struct pan_pool *pool, const struct pan_fb_info *fb,
 
       if (fb->zs.preload.s) {
          const struct pan_image_view *view = fb->zs.view.s ?: fb->zs.view.zs;
-         enum pipe_format fmt = util_format_get_depth_only(view->format);
-
-         switch (view->format) {
-         case PIPE_FORMAT_Z24_UNORM_S8_UINT:
-            fmt = PIPE_FORMAT_X24S8_UINT;
-            break;
-         case PIPE_FORMAT_Z32_FLOAT_S8X24_UINT:
-            fmt = PIPE_FORMAT_X32_S8X24_UINT;
-            break;
-         default:
-            fmt = view->format;
-            break;
-         }
+         enum pipe_format fmt = util_format_stencil_only(view->format);
 
 #if PAN_ARCH >= 7
          struct pan_image_view *pview = &patched_views[patched_count++];
diff --git a/src/panfrost/lib/pan_desc.c b/src/panfrost/lib/pan_desc.c
index 9022c306bfb..20b661933b6 100644
--- a/src/panfrost/lib/pan_desc.c
+++ b/src/panfrost/lib/pan_desc.c
@@ -194,7 +194,6 @@ translate_s_format(enum pipe_format in)
       return MALI_S_FORMAT_X24S8;
 
 #if PAN_ARCH < 9
-   case PIPE_FORMAT_S8_UINT_Z24_UNORM:
    case PIPE_FORMAT_S8X24_UINT:
       return MALI_S_FORMAT_S8X24;
    case PIPE_FORMAT_Z32_FLOAT_S8X24_UINT: