diff --git a/.pick_status.json b/.pick_status.json
index 0b0739aea74..7013d43e9e7 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -544,7 +544,7 @@
         "description": "gallium/util: check nr_samples in pipe_surface_equal()",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null,
         "notes": null
diff --git a/src/gallium/auxiliary/util/u_inlines.h b/src/gallium/auxiliary/util/u_inlines.h
index fee2aa1d716..77edc185486 100644
--- a/src/gallium/auxiliary/util/u_inlines.h
+++ b/src/gallium/auxiliary/util/u_inlines.h
@@ -304,6 +304,7 @@ pipe_surface_equal(struct pipe_surface *s1, struct pipe_surface *s2)
 {
    return s1->texture == s2->texture &&
           s1->format == s2->format &&
+          s1->nr_samples == s2->nr_samples &&
           (s1->texture->target != PIPE_BUFFER ||
            (s1->u.buf.first_element == s2->u.buf.first_element &&
             s1->u.buf.last_element == s2->u.buf.last_element)) &&