From: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Date: Tue, 5 Nov 2019 14:06:41 +0000 (-0500)
Subject: pan/midgard: Use generic constant packing for 8/64-bit
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=ea232c7cfd492fffb1dcf3ba07459c159e8bc112;p=mesa.git

pan/midgard: Use generic constant packing for 8/64-bit

Eventually, we will want to combine constants across types, but for now
let's not break the world.

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

diff --git a/src/panfrost/midgard/midgard_schedule.c b/src/panfrost/midgard/midgard_schedule.c
index 2e794687e66..418589a6192 100644
--- a/src/panfrost/midgard/midgard_schedule.c
+++ b/src/panfrost/midgard/midgard_schedule.c
@@ -369,7 +369,7 @@ mir_adjust_constants(midgard_instruction *ins,
         if (!ins->has_constants)
                 return true;
 
-        if (ins->alu.reg_mode == midgard_reg_mode_16) {
+        if (ins->alu.reg_mode != midgard_reg_mode_32) {
                 /* TODO: 16-bit constant combining */
                 if (pred->constant_count)
                         return false;