diff --git a/.pick_status.json b/.pick_status.json
index 7c7b8d9f020..a1a90d4573b 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -1594,7 +1594,7 @@
         "description": "r600: fix cayman msaa shading behavior",
         "nominated": true,
         "nomination_type": 2,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "f7796a966d20b04c00025bdc170883f4179a5697",
         "notes": null
diff --git a/src/gallium/drivers/r600/cayman_msaa.c b/src/gallium/drivers/r600/cayman_msaa.c
index ba2ff12c9f1..515ab6d33cd 100644
--- a/src/gallium/drivers/r600/cayman_msaa.c
+++ b/src/gallium/drivers/r600/cayman_msaa.c
@@ -226,7 +226,7 @@ void cayman_emit_msaa_state(struct radeon_cmdbuf *cs, int nr_samples,
 		if (nr_samples > 1) {
 			radeon_set_context_reg(cs, CM_R_028804_DB_EQAA,
 					       S_028804_MAX_ANCHOR_SAMPLES(log_samples) |
-					       S_028804_PS_ITER_SAMPLES(log_ps_iter_samples) |
+					       S_028804_PS_ITER_SAMPLES(log_ps_iter_samples ? log_samples : 0) |
 					       S_028804_MASK_EXPORT_NUM_SAMPLES(log_samples) |
 					       S_028804_ALPHA_TO_MASK_NUM_SAMPLES(log_samples) |
 					       S_028804_HIGH_QUALITY_INTERSECTIONS(1) |