From 3c843b69338e3fb9a815ac7f81b4e78cec384b5a Mon Sep 17 00:00:00 2001
From: Faith Ekstrand <faith.ekstrand@collabora.com>
Date: Thu, 6 Feb 2025 07:33:42 -0600
Subject: [PATCH] nak: Add more MemEvictionPriorities

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/33427>
---
 src/nouveau/compiler/nak/ir.rs   | 4 ++++
 src/nouveau/compiler/nak/sm70.rs | 4 +++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/nouveau/compiler/nak/ir.rs b/src/nouveau/compiler/nak/ir.rs
index cdbe1062292..ed03a44990a 100644
--- a/src/nouveau/compiler/nak/ir.rs
+++ b/src/nouveau/compiler/nak/ir.rs
@@ -2403,6 +2403,8 @@ pub enum MemEvictionPriority {
     Normal,
     Last,
     LastUse,
+    Unchanged,
+    NoAllocate,
 }
 
 impl fmt::Display for MemEvictionPriority {
@@ -2412,6 +2414,8 @@ impl fmt::Display for MemEvictionPriority {
             MemEvictionPriority::Normal => Ok(()),
             MemEvictionPriority::Last => write!(f, ".el"),
             MemEvictionPriority::LastUse => write!(f, ".lu"),
+            MemEvictionPriority::Unchanged => write!(f, ".eu"),
+            MemEvictionPriority::NoAllocate => write!(f, ".na"),
         }
     }
 }
diff --git a/src/nouveau/compiler/nak/sm70.rs b/src/nouveau/compiler/nak/sm70.rs
index 25f22047bb5..333a6a9968a 100644
--- a/src/nouveau/compiler/nak/sm70.rs
+++ b/src/nouveau/compiler/nak/sm70.rs
@@ -2617,12 +2617,14 @@ impl SM70Encoder<'_> {
 
     fn set_eviction_priority(&mut self, pri: &MemEvictionPriority) {
         self.set_field(
-            84..86,
+            84..87,
             match pri {
                 MemEvictionPriority::First => 0_u8,
                 MemEvictionPriority::Normal => 1_u8,
                 MemEvictionPriority::Last => 2_u8,
                 MemEvictionPriority::LastUse => 3_u8,
+                MemEvictionPriority::Unchanged => 4_u8,
+                MemEvictionPriority::NoAllocate => 5_u8,
             },
         );
     }