From 5e5ea25a0da97a5dbec6e2fd7409e28ff62714cf Mon Sep 17 00:00:00 2001
From: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Date: Fri, 12 Jun 2020 12:20:52 -0400
Subject: [PATCH] pan/mdg: Explicitly type 64-bit uniform moves

Instead of relying on reg_mode.

Signed-off-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5443>
---
 src/panfrost/midgard/mir_promote_uniforms.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/panfrost/midgard/mir_promote_uniforms.c b/src/panfrost/midgard/mir_promote_uniforms.c
index 0cd3a86a9dc..a7f2d9e03a0 100644
--- a/src/panfrost/midgard/mir_promote_uniforms.c
+++ b/src/panfrost/midgard/mir_promote_uniforms.c
@@ -194,6 +194,8 @@ midgard_promote_uniforms(compiler_context *ctx)
                 if (needs_move) {
                         unsigned type_size = nir_alu_type_get_type_size(ins->dest_type);
                         midgard_instruction mov = v_mov(promoted, ins->dest);
+                        mov.dest_type = nir_type_uint | type_size;
+                        mov.src_types[0] = mov.dest_type;
 
                         if (type_size == 64)
                                 mov.alu.reg_mode = midgard_reg_mode_64;
-- 
2.30.2