diff --git a/.pick_status.json b/.pick_status.json
index 15da1e85770..bb8be321354 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -84,7 +84,7 @@
         "description": "v3d/compiler: Fixup output types for all 8 outputs",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null,
         "notes": null
diff --git a/src/broadcom/compiler/vir.c b/src/broadcom/compiler/vir.c
index ee9824b4fc1..96bcb956ad8 100644
--- a/src/broadcom/compiler/vir.c
+++ b/src/broadcom/compiler/vir.c
@@ -1114,6 +1114,10 @@ v3d_fixup_fs_output_types(struct v3d_compile *c)
                 case FRAG_RESULT_DATA1:
                 case FRAG_RESULT_DATA2:
                 case FRAG_RESULT_DATA3:
+                case FRAG_RESULT_DATA4:
+                case FRAG_RESULT_DATA5:
+                case FRAG_RESULT_DATA6:
+                case FRAG_RESULT_DATA7:
                         mask = 1 << (var->data.location - FRAG_RESULT_DATA0);
                         break;
                 }