diff --git a/.pick_status.json b/.pick_status.json
index 47cfec2a5f8..5d103dc4341 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -4801,7 +4801,7 @@
         "description": "panfrost: Enable NV_primitive_restart on Valhall",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "30c14f54cf2bbf86f3d8f16a3d46edad6d0fce7c"
     },
diff --git a/src/gallium/drivers/panfrost/pan_screen.c b/src/gallium/drivers/panfrost/pan_screen.c
index a3855f9302e..36f15c2a5d8 100644
--- a/src/gallium/drivers/panfrost/pan_screen.c
+++ b/src/gallium/drivers/panfrost/pan_screen.c
@@ -132,6 +132,7 @@ panfrost_get_param(struct pipe_screen *screen, enum pipe_cap param)
                 return 1;
 
         case PIPE_CAP_OCCLUSION_QUERY:
+        case PIPE_CAP_PRIMITIVE_RESTART:
         case PIPE_CAP_PRIMITIVE_RESTART_FIXED_INDEX:
                 return true;
 
@@ -298,8 +299,8 @@ panfrost_get_param(struct pipe_screen *screen, enum pipe_cap param)
         /* Removed in v9 (Valhall). PRIMTIIVE_RESTART_FIXED_INDEX is of course
          * still supported as it is core GLES3.0 functionality
          */
-        case PIPE_CAP_PRIMITIVE_RESTART:
-                return dev->arch <= 7;
+        case PIPE_CAP_EMULATE_NONFIXED_PRIMITIVE_RESTART:
+                return dev->arch <= 9;
 
         case PIPE_CAP_FLATSHADE:
         case PIPE_CAP_TWO_SIDED_COLOR: