From: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Date: Thu, 7 May 2020 14:13:35 +0000 (-0400)
Subject: pan/mdg: Fix constant combining crash
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=40e9bee714ebecd8ebbba39d81712ba3714319f4;p=mesa.git

pan/mdg: Fix constant combining crash

We need to round up.

Signed-off-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5151>
---

diff --git a/src/panfrost/midgard/midgard_schedule.c b/src/panfrost/midgard/midgard_schedule.c
index 77737410cfd..c77eee16fce 100644
--- a/src/panfrost/midgard/midgard_schedule.c
+++ b/src/panfrost/midgard/midgard_schedule.c
@@ -399,7 +399,9 @@ mir_adjust_constants(midgard_instruction *ins,
                 midgard_reg_mode src_mode = mir_srcsize(ins, src);
                 unsigned type_size = mir_bytes_for_mode(src_mode);
                 unsigned max_comp = 16 / type_size;
-                unsigned comp_mask = mir_from_bytemask(mir_bytemask_of_read_components_index(ins, src),
+                unsigned comp_mask = mir_from_bytemask(mir_round_bytemask_up(
+                                        mir_bytemask_of_read_components_index(ins, src),
+                                        dst_mode),
                                                        dst_mode);
                 unsigned type_mask = (1 << type_size) - 1;