From 67569b3c236852789264049fb91b6d04db4ea271 Mon Sep 17 00:00:00 2001
From: Alyssa Rosenzweig <alyssa@collabora.com>
Date: Wed, 11 May 2022 12:15:54 -0400
Subject: [PATCH] pan/va: Use split for 64-bit lowering

Written in this way, this pass looks pretty silly...

Signed-off-by: Alyssa Rosenzweig <alyssa@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16585>
---
 src/panfrost/bifrost/valhall/va_lower_split_64bit.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/panfrost/bifrost/valhall/va_lower_split_64bit.c b/src/panfrost/bifrost/valhall/va_lower_split_64bit.c
index 17bff06a256..0c562c0780e 100644
--- a/src/panfrost/bifrost/valhall/va_lower_split_64bit.c
+++ b/src/panfrost/bifrost/valhall/va_lower_split_64bit.c
@@ -56,10 +56,15 @@ lower_split_src(bi_context *ctx, bi_instr *I, unsigned s)
    bi_instr *collect = bi_collect_i32_to(&b, vec);
    collect->nr_srcs = 2;
 
+   bi_instr *split = bi_split_i32_to(&b, bi_null(), vec);
+   split->nr_dests = 2;
+
    /* Emit collect */
    for (unsigned w = 0; w < 2; ++w) {
       collect->src[w] = I->src[s + w];
-      I->src[s + w] = bi_word(vec, w);
+
+      split->dest[w] = bi_temp(ctx);
+      I->src[s + w] = split->dest[w];
    }
 }