From: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Date: Thu, 1 Aug 2019 21:06:02 +0000 (-0700)
Subject: pan/midgard: Fix REGISTER_OFFSET
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=5a572f4b55ab8272d731fee31ecedf375e63f1de;p=mesa.git

pan/midgard: Fix REGISTER_OFFSET

r27 isn't the special one, usually.

Signed-off-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
---

diff --git a/src/panfrost/midgard/helpers.h b/src/panfrost/midgard/helpers.h
index d3ae39ab155..9d04b057126 100644
--- a/src/panfrost/midgard/helpers.h
+++ b/src/panfrost/midgard/helpers.h
@@ -170,8 +170,7 @@ quadword_size(int tag)
 
 #define REGISTER_UNUSED 24
 #define REGISTER_CONSTANT 26
-#define REGISTER_VARYING_BASE 26
-#define REGISTER_OFFSET 27
+#define REGISTER_LDST_BASE 26
 #define REGISTER_TEXTURE_BASE 28
 #define REGISTER_SELECT 31
 
diff --git a/src/panfrost/midgard/midgard_compile.c b/src/panfrost/midgard/midgard_compile.c
index 7314e678c8c..517eabedf32 100644
--- a/src/panfrost/midgard/midgard_compile.c
+++ b/src/panfrost/midgard/midgard_compile.c
@@ -662,7 +662,7 @@ emit_indirect_offset(compiler_context *ctx, nir_src *src)
                 .ssa_args = {
                         .src0 = SSA_UNUSED_1,
                         .src1 = offset,
-                        .dest = SSA_FIXED_REGISTER(REGISTER_OFFSET),
+                        .dest = SSA_FIXED_REGISTER(REGISTER_LDST_BASE + 1),
                 },
                 .alu = {
                         .op = midgard_alu_op_imov,