From bbfcd473f9974ac3dce4c145c98fe398cc2f2b85 Mon Sep 17 00:00:00 2001
From: Boris Brezillon <boris.brezillon@collabora.com>
Date: Wed, 4 Dec 2024 21:07:19 +0100
Subject: [PATCH] pan/bi: Fix mem_access_size_align_cb() for push constants

bit_size should be at least 32, and alignment at least 4 bytes.

Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
Reviewed-by: Chia-I Wu <olvaffe@gmail.com>
Reviewed-by: Mary Guillemard <mary.guillemard@collabora.com>
Reviewed-by: Lars-Ivar Hesselberg Simonsen <lars-ivar.simonsen@arm.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32415>
---
 src/panfrost/compiler/bifrost_compile.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/panfrost/compiler/bifrost_compile.c b/src/panfrost/compiler/bifrost_compile.c
index e04f28f5c9f..b73f9594d88 100644
--- a/src/panfrost/compiler/bifrost_compile.c
+++ b/src/panfrost/compiler/bifrost_compile.c
@@ -4822,13 +4822,16 @@ mem_access_size_align_cb(nir_intrinsic_op intrin, uint8_t bytes,
          num_comps = (bytes / 4) + 2;
       }
 
-      bit_size = MIN2(bit_size, 32);
+      bit_size = MAX2(bit_size, 32);
+      align = 4;
+   } else {
+      align = bit_size / 8;
    }
 
    return (nir_mem_access_size_align){
       .num_components = num_comps,
       .bit_size = bit_size,
-      .align = bit_size / 8,
+      .align = align,
       .shift = nir_mem_access_shift_method_scalar,
    };
 }