diff --git a/.pick_status.json b/.pick_status.json
index b3a641a76dd..208892885df 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -644,7 +644,7 @@
         "description": "radeonsi: fix a typo in si_shader_update_spi_shader_formats",
         "nominated": true,
         "nomination_type": 2,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "88986dcc9c81342a26951d576924d00a21d812c7",
         "notes": null
diff --git a/src/gallium/drivers/radeonsi/si_shader_variant_info.c b/src/gallium/drivers/radeonsi/si_shader_variant_info.c
index 99d47b699c2..376268707ff 100644
--- a/src/gallium/drivers/radeonsi/si_shader_variant_info.c
+++ b/src/gallium/drivers/radeonsi/si_shader_variant_info.c
@@ -38,7 +38,7 @@ void si_shader_update_spi_shader_formats(struct si_shader *shader, nir_shader *n
    for (i = 0; i < num_targets; i++) {
       unsigned spi_format = (spi_shader_col_format >> (i * 4)) & 0xf;
 
-      if (spi_format && (colors_written & 1u << num_mrts)) {
+      if (spi_format && (colors_written & 1u << i)) {
          value |= spi_format << (num_mrts * 4);
          num_mrts++;
       }