From 40676da3816266164b83153e881b3db85ef9fc2b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timur=20Krist=C3=B3f?= <timur.kristof@gmail.com>
Date: Wed, 15 Mar 2023 13:50:52 -0700
Subject: [PATCH] aco: Use zero for MUBUF/MTBUF when soffset is undefined.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

No Fossil DB changes on Rembrandt (GFX10.3).

Signed-off-by: Timur Kristóf <timur.kristof@gmail.com>
Reviewed-by: Rhys Perry <pendingchaos02@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21930>
---
 src/amd/compiler/aco_instruction_selection.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/amd/compiler/aco_instruction_selection.cpp b/src/amd/compiler/aco_instruction_selection.cpp
index fb6e4cbc682..af5d1336649 100644
--- a/src/amd/compiler/aco_instruction_selection.cpp
+++ b/src/amd/compiler/aco_instruction_selection.cpp
@@ -4428,6 +4428,9 @@ mubuf_load_callback(Builder& bld, const LoadEmitInfo& info, Temp offset, unsigne
       soffset = Operand(info.soffset);
    }
 
+   if (soffset.isUndefined())
+      soffset = Operand::zero();
+
    bool offen = !vaddr.isUndefined();
    bool idxen = info.idx.id();
 
@@ -5486,6 +5489,9 @@ mtbuf_load_callback(Builder& bld, const LoadEmitInfo& info, Temp offset, unsigne
       soffset = Operand(info.soffset);
    }
 
+   if (soffset.isUndefined())
+      soffset = Operand::zero();
+
    const bool offen = !vaddr.isUndefined();
    const bool idxen = info.idx.id();