From ca04eff60084240f9d8456ef0626069061897427 Mon Sep 17 00:00:00 2001
From: Ben Skeggs <bskeggs@redhat.com>
Date: Fri, 5 Nov 2021 15:58:36 +1000
Subject: [PATCH] nv50/ir: fix OUT.FINAL on ampere

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Reviewed-by: Karol Herbst <kherbst@redhat.com>
Acked-by: Dave Airlie <airlied@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16784>
---
 src/gallium/drivers/nouveau/codegen/nv50_ir_emit_gv100.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/gallium/drivers/nouveau/codegen/nv50_ir_emit_gv100.cpp b/src/gallium/drivers/nouveau/codegen/nv50_ir_emit_gv100.cpp
index da8f71c6fd0..be3d9c22136 100644
--- a/src/gallium/drivers/nouveau/codegen/nv50_ir_emit_gv100.cpp
+++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_emit_gv100.cpp
@@ -1117,8 +1117,11 @@ CodeEmitterGV100::emitOUT()
 
    if (insn->op != OP_FINAL)
       emitFormA(0x124, FA_RRR | FA_RIR, __(0), __(1), EMPTY);
-   else
+   else {
       emitFormA(0x124, FA_RRR | FA_RIR, __(0), EMPTY, EMPTY);
+      if (targ->getChipset() >= 0x170)
+         emitGPR(32);
+   }
    emitField(78, 2, (cut << 1) | emit);
 }