From 5f36e5961e2ffb4ca0e501d2aa2d21152b63b36a Mon Sep 17 00:00:00 2001 From: Faith Ekstrand Date: Wed, 16 Apr 2025 17:52:32 -0500 Subject: [PATCH] nak/sm70: Fix the bit74_75_ar_mod assert It's used for src2, not src0. Fixes: 40422927dcb1 ("nak: Pass has_mod to all form of src2 requiring it") Part-of: (cherry picked from commit 47fc46894414be0e98c2f0c5bc76cc0c9d866fbe) --- .pick_status.json | 2 +- src/nouveau/compiler/nak/sm70.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 5278269595e..677b2fd7a26 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -2484,7 +2484,7 @@ "description": "nak/sm70: Fix the bit74_75_ar_mod assert", "nominated": true, "nomination_type": 2, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "40422927dcb1249cdb1444557aca671387140428", "notes": null diff --git a/src/nouveau/compiler/nak/sm70.rs b/src/nouveau/compiler/nak/sm70.rs index 296367586c0..9162427cce1 100644 --- a/src/nouveau/compiler/nak/sm70.rs +++ b/src/nouveau/compiler/nak/sm70.rs @@ -575,7 +575,7 @@ impl SM70Encoder<'_> { let bit74_75_are_mod = !is_fp16_alu || matches!(src1, ALUSrc::None) || matches!(src2, ALUSrc::None); - debug_assert!(bit74_75_are_mod || !src0.has_src_mod()); + debug_assert!(bit74_75_are_mod || !src2.has_src_mod()); self.encode_alu_src0(&src0, RegFile::GPR, is_fp16_alu);