diff --git a/.pick_status.json b/.pick_status.json
index 382628062e0..0c9f725c424 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -175,7 +175,7 @@
         "description": "panfrost: Inline pan_fbd_has_zs_crc_ext",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null
     },
diff --git a/src/panfrost/lib/pan_cs.c b/src/panfrost/lib/pan_cs.c
index c52285a87fc..63b311509c3 100644
--- a/src/panfrost/lib/pan_cs.c
+++ b/src/panfrost/lib/pan_cs.c
@@ -637,7 +637,7 @@ GENX(pan_emit_fbd)(const struct panfrost_device *dev,
         unsigned tile_size;
         unsigned internal_cbuf_size = pan_internal_cbuf_size(fb, &tile_size);
         int crc_rt = GENX(pan_select_crc_rt)(fb);
-        bool has_zs_crc_ext = pan_fbd_has_zs_crc_ext(fb);
+        bool has_zs_crc_ext = (fb->zs.view.zs || fb->zs.view.s || crc_rt >= 0);
 
         pan_section_pack(fbd, FRAMEBUFFER, PARAMETERS, cfg) {
 #if PAN_ARCH >= 6
diff --git a/src/panfrost/lib/pan_cs.h b/src/panfrost/lib/pan_cs.h
index 27d030efdf2..b6a5cc34321 100644
--- a/src/panfrost/lib/pan_cs.h
+++ b/src/panfrost/lib/pan_cs.h
@@ -151,14 +151,6 @@ GENX(pan_emit_tls)(const struct pan_tls_info *info,
 int
 GENX(pan_select_crc_rt)(const struct pan_fb_info *fb);
 
-static inline bool
-pan_fbd_has_zs_crc_ext(const struct pan_fb_info *fb)
-{
-        return PAN_ARCH >= 5 &&
-               (fb->zs.view.zs || fb->zs.view.s ||
-                GENX(pan_select_crc_rt)(fb) >= 0);
-}
-
 unsigned
 GENX(pan_emit_fbd)(const struct panfrost_device *dev,
                    const struct pan_fb_info *fb,