diff --git a/.pick_status.json b/.pick_status.json
index f78ffc427c0..7a6bef5f855 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -44,7 +44,7 @@
         "description": "panfrost: report correct MAX_VARYINGS",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null,
         "notes": null
diff --git a/src/gallium/drivers/panfrost/pan_screen.c b/src/gallium/drivers/panfrost/pan_screen.c
index 1a3497b1b88..9ddce2b7e82 100644
--- a/src/gallium/drivers/panfrost/pan_screen.c
+++ b/src/gallium/drivers/panfrost/pan_screen.c
@@ -301,9 +301,7 @@ panfrost_get_param(struct pipe_screen *screen, enum pipe_cap param)
       return 4;
 
    case PIPE_CAP_MAX_VARYINGS:
-      /* Return the GLSL maximum. The internal maximum
-       * PAN_MAX_VARYINGS accommodates internal varyings. */
-      return MAX_VARYING;
+      return dev->arch >= 9 ? 16 : 32;
 
    /* Removed in v6 (Bifrost) */
    case PIPE_CAP_GL_CLAMP: