diff --git a/.pick_status.json b/.pick_status.json
index f6c83c60a5e..7f8278b2620 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -4604,7 +4604,7 @@
         "description": "panfrost: Fix incorrect condition in assert",
         "nominated": true,
         "nomination_type": 2,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "d2838f3ceb9d4bb9796dec5324264f44d9586426",
         "notes": null
diff --git a/src/panfrost/compiler/bifrost_compile.c b/src/panfrost/compiler/bifrost_compile.c
index 38337927aa6..2c325573038 100644
--- a/src/panfrost/compiler/bifrost_compile.c
+++ b/src/panfrost/compiler/bifrost_compile.c
@@ -2022,7 +2022,7 @@ bi_emit_intrinsic(bi_builder *b, nir_intrinsic_instr *instr)
          break;
 
       case SCOPE_WORKGROUP:
-         assert(b->shader->stage == MESA_SHADER_COMPUTE);
+         assert(gl_shader_stage_is_compute(b->shader->stage));
          bi_barrier(b);
          /*
           * Blob doesn't seem to do anything for memory barriers, so no need to