From bc58620e1eba84b9ea6bc98cf66b5f920f7aaef4 Mon Sep 17 00:00:00 2001
From: Faith Ekstrand <faith.ekstrand@collabora.com>
Date: Wed, 25 Oct 2023 11:03:48 -0500
Subject: [PATCH] nak: Use the simplified BAR.SYNC encoding

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24998>
---
 src/nouveau/compiler/nak_encode_sm75.rs | 36 +++++++++++++------------
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/src/nouveau/compiler/nak_encode_sm75.rs b/src/nouveau/compiler/nak_encode_sm75.rs
index c84ffce8800..dd95a02ff96 100644
--- a/src/nouveau/compiler/nak_encode_sm75.rs
+++ b/src/nouveau/compiler/nak_encode_sm75.rs
@@ -1695,27 +1695,29 @@ impl SM75Instr {
     }
 
     fn encode_bar(&mut self, _op: &OpBar) {
-        self.set_opcode(0x31d);
+        self.set_opcode(0xb1d);
 
-        /* src0 == src1 */
-        self.set_reg_src(32..40, SrcRef::Zero.into());
+        // self.set_opcode(0x31d);
 
-        /*
-         * 00: RED.POPC
-         * 01: RED.AND
-         * 02: RED.OR
-         */
-        self.set_field(74..76, 0_u8);
+        // /* src0 == src1 */
+        // self.set_reg_src(32..40, SrcRef::Zero.into());
 
-        /*
-         * 00: SYNC
-         * 01: ARV
-         * 02: RED
-         * 03: SCAN
-         */
-        self.set_field(77..79, 0_u8);
+        // /*
+        //  * 00: RED.POPC
+        //  * 01: RED.AND
+        //  * 02: RED.OR
+        //  */
+        // self.set_field(74..76, 0_u8);
 
-        self.set_pred_src(87..90, 90, SrcRef::True.into());
+        // /*
+        //  * 00: SYNC
+        //  * 01: ARV
+        //  * 02: RED
+        //  * 03: SCAN
+        //  */
+        // self.set_field(77..79, 0_u8);
+
+        // self.set_pred_src(87..90, 90, SrcRef::True.into());
     }
 
     fn encode_cs2r(&mut self, op: &OpCS2R) {