From: Eric Anholt <eric@anholt.net>
Date: Sun, 11 Jan 2015 20:16:26 +0000 (+1300)
Subject: vc4: Don't swap the raddr on instructions doing unpacks.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=8f2fb68026d11feedb5d94cf17e719affe7b9423;p=mesa.git

vc4: Don't swap the raddr on instructions doing unpacks.

It would mean different unpacking behavior, since only the A file does
unpack (with PM==0).
---

diff --git a/src/gallium/drivers/vc4/vc4_qpu.c b/src/gallium/drivers/vc4/vc4_qpu.c
index 434e664fa83..f67e3f8b768 100644
--- a/src/gallium/drivers/vc4/vc4_qpu.c
+++ b/src/gallium/drivers/vc4/vc4_qpu.c
@@ -337,6 +337,11 @@ try_swap_ra_file(uint64_t *merge, uint64_t *a, uint64_t *b)
                 return false;
         }
 
+        if (!(*merge & QPU_PM) &&
+            QPU_GET_FIELD(*merge, QPU_UNPACK) != QPU_UNPACK_NOP) {
+                return false;
+        }
+
         if (raddr_b_b != QPU_R_NOP &&
             raddr_b_b != raddr_a_a)
                 return false;