diff --git a/.pick_status.json b/.pick_status.json
index 503587313f9..b94228d1b52 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -1454,7 +1454,7 @@
         "description": "ac/spm: fix GRBM broadcasting for global blocks",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null,
         "notes": null
diff --git a/src/amd/common/ac_spm.c b/src/amd/common/ac_spm.c
index e24da87fb69..f11c19ed18e 100644
--- a/src/amd/common/ac_spm.c
+++ b/src/amd/common/ac_spm.c
@@ -7,6 +7,7 @@
 #include "ac_spm.h"
 
 #include "util/bitscan.h"
+#include "util/compiler.h"
 #include "util/u_memory.h"
 #include "ac_perfcounter.h"
 
@@ -202,7 +203,7 @@ ac_spm_init_grbm_gfx_index(const struct ac_pc_block *block,
    case GL2C:
       /* Global blocks. */
       grbm_gfx_index |= S_030800_SE_BROADCAST_WRITES(1);
-      break;
+      FALLTHROUGH;
    case SQ:
       /* Per-SE blocks. */
       grbm_gfx_index |= S_030800_SH_BROADCAST_WRITES(1);