Mesa (staging/20.3): pan/mdg: Fix promoted uniform moves with 64-bit types

[GitLab Mirror]

Module: Mesa
Branch: staging/20.3
Commit: 636a917ca4cb0d0b05308a592b276c1927ce1222
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=636a917ca4cb0d0b05308a592b276c1927ce1222

Author: Icecream95 <ixn at keemail.me>
Date:   Mon Sep  7 21:29:28 2020 +1200

pan/mdg: Fix promoted uniform moves with 64-bit types

The move source is the second src, not the first one.

Fixes: 5e5ea25a0da ("pan/mdg: Explicitly type 64-bit uniform moves")
Reviewed-by: Alyssa Rosenzweig <alyssa.rosenzweig at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8264>
(cherry picked from commit 97929b1aaf4d0bbb9214cd7a31ee938c78f7e8bc)

---

 .pick_status.json                           | 2 +-
 src/panfrost/midgard/mir_promote_uniforms.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index 28aa43ae00d..6fe3f2033c3 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -400,7 +400,7 @@
         "description": "pan/mdg: Fix promoted uniform moves with 64-bit types",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": "5e5ea25a0da97a5dbec6e2fd7409e28ff62714cf"
     },
diff --git a/src/panfrost/midgard/mir_promote_uniforms.c b/src/panfrost/midgard/mir_promote_uniforms.c
index 239020dd219..525ce59b35b 100644
--- a/src/panfrost/midgard/mir_promote_uniforms.c
+++ b/src/panfrost/midgard/mir_promote_uniforms.c
@@ -195,7 +195,7 @@ midgard_promote_uniforms(compiler_context *ctx)
                         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;
+                        mov.src_types[1] = mov.dest_type;
 
                         uint16_t rounded = mir_round_bytemask_up(mir_bytemask(ins), type_size);
                         mir_set_bytemask(&mov, rounded);