From 2583fde8bce46c43dfb8efd0cd37bc39f8ca2b49 Mon Sep 17 00:00:00 2001
From: Mel Henning <drawoc@darkrefraction.com>
Date: Wed, 5 Feb 2025 18:19:02 -0500
Subject: [PATCH] nak/opt_copy_prop: Fix IAdd3 overflow check

Cc: mesa-stable
Reviewed-by: Mary Guillemard <mary.guillemard@collabora.com>
Reviewed-by: Faith Ekstrand <None>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/33420>
(cherry picked from commit a5b267980ab0c64f4644f16137781fa9a4a8c5f8)
---
 .pick_status.json                         | 2 +-
 src/nouveau/compiler/nak/opt_copy_prop.rs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index 14858564862..1f5481560ad 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -194,7 +194,7 @@
         "description": "nak/opt_copy_prop: Fix IAdd3 overflow check",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null,
         "notes": null
diff --git a/src/nouveau/compiler/nak/opt_copy_prop.rs b/src/nouveau/compiler/nak/opt_copy_prop.rs
index 657f14c9844..bc7d78d7156 100644
--- a/src/nouveau/compiler/nak/opt_copy_prop.rs
+++ b/src/nouveau/compiler/nak/opt_copy_prop.rs
@@ -659,7 +659,7 @@ impl CopyPropPass {
                         use SrcType::{ALU, I32};
                         let [src0, src1, src2] = &mut add.srcs;
                         if add.overflow[0].is_none()
-                            && add.overflow[0].is_none()
+                            && add.overflow[1].is_none()
                         {
                             self.prop_to_src(I32, &cbuf_rule, src0);
                             self.prop_to_src(I32, &cbuf_rule, src1);