From 2388f22a5e5da7228455bd3b84ebd32ee804d4ef Mon Sep 17 00:00:00 2001
From: Karol Herbst <git@karolherbst.de>
Date: Mon, 24 Jul 2023 22:59:49 +0200
Subject: [PATCH] gm107/ir: fix SULDP for loads without a known format

Signed-off-by: Karol Herbst <git@karolherbst.de>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24312>
---
 src/nouveau/codegen/nv50_ir_emit_gm107.cpp | 34 ++++++++++++----------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/src/nouveau/codegen/nv50_ir_emit_gm107.cpp b/src/nouveau/codegen/nv50_ir_emit_gm107.cpp
index 0b2ff3b2468..c7c08867c50 100644
--- a/src/nouveau/codegen/nv50_ir_emit_gm107.cpp
+++ b/src/nouveau/codegen/nv50_ir_emit_gm107.cpp
@@ -3323,26 +3323,30 @@ void
 CodeEmitterGM107::emitSULDx()
 {
    const TexInstruction *insn = this->insn->asTex();
-   int type = 0;
 
    emitInsn(0xeb000000);
-   if (insn->op == OP_SULDB)
-      emitField(0x34, 1, 1);
-   emitSUTarget();
 
-   switch (insn->dType) {
-   case TYPE_S8:   type = 1; break;
-   case TYPE_U16:  type = 2; break;
-   case TYPE_S16:  type = 3; break;
-   case TYPE_U32:  type = 4; break;
-   case TYPE_U64:  type = 5; break;
-   case TYPE_B128: type = 6; break;
-   default:
-      assert(insn->dType == TYPE_U8);
-      break;
+   if (insn->op == OP_SULDB) {
+      int type = 0;
+      emitField(0x34, 1, 1);
+      switch (insn->dType) {
+      case TYPE_S8:   type = 1; break;
+      case TYPE_U16:  type = 2; break;
+      case TYPE_S16:  type = 3; break;
+      case TYPE_U32:  type = 4; break;
+      case TYPE_U64:  type = 5; break;
+      case TYPE_B128: type = 6; break;
+      default:
+         assert(insn->dType == TYPE_U8);
+         break;
+      }
+      emitField(0x14, 3, type);
+   } else {
+      emitField(0x14, 4, 0xf); // rgba
    }
+
+   emitSUTarget();
    emitLDSTc(0x18);
-   emitField(0x14, 3, type);
    emitGPR  (0x00, insn->def(0));
    emitGPR  (0x08, insn->src(0));