From bed6fba7c87c2a4e97f2eb3338f7cf2c232672a4 Mon Sep 17 00:00:00 2001
From: Faith Ekstrand <faith.ekstrand@collabora.com>
Date: Fri, 3 May 2024 15:35:36 -0500
Subject: [PATCH] nil: Use the right PTE kind for Z32 pre-Turing

This got lost in the Rust rewrite.

Fixes: 426553d61d16 ("nil: Re-implement nil_image in Rust")
Reviewed-by: Dave Airlie <airlied@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24795>
(cherry picked from commit 73c87dbc0c447ed8f1b3e4f1fbd19608e3a4baaa)
---
 .pick_status.json        | 2 +-
 src/nouveau/nil/image.rs | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/.pick_status.json b/.pick_status.json
index ef9a202e961..4852b1d1a42 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -1574,7 +1574,7 @@
         "description": "nil: Use the right PTE kind for Z32 pre-Turing",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "426553d61d164a04ecf540d933f72e16dcbf9e33",
         "notes": null
diff --git a/src/nouveau/nil/image.rs b/src/nouveau/nil/image.rs
index f5e3364e101..1b37fe4197c 100644
--- a/src/nouveau/nil/image.rs
+++ b/src/nouveau/nil/image.rs
@@ -578,6 +578,13 @@ impl Image {
                     NV_MMU_PTE_KIND_S8Z24
                 }
             }
+            PIPE_FORMAT_Z32_FLOAT => {
+                if compressed {
+                    NV_MMU_PTE_KIND_ZF32_2CZ + ms
+                } else {
+                    NV_MMU_PTE_KIND_ZF32
+                }
+            }
             PIPE_FORMAT_X32_S8X24_UINT | PIPE_FORMAT_Z32_FLOAT_S8X24_UINT => {
                 if compressed {
                     NV_MMU_PTE_KIND_ZF32_X24S8_2CSZV + ms