From 8771d45a741da6c6b764826a95f99e453e7afeb9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= <marek.olsak@amd.com>
Date: Wed, 7 Apr 2021 17:20:53 -0400
Subject: [PATCH] ac/surface/tests: fix a random segfault in the modifier test

Acked-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10003>
---
 src/amd/common/ac_surface_modifier_test.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/amd/common/ac_surface_modifier_test.c b/src/amd/common/ac_surface_modifier_test.c
index b6acd6cfe7b..8c2f90fc8cc 100644
--- a/src/amd/common/ac_surface_modifier_test.c
+++ b/src/amd/common/ac_surface_modifier_test.c
@@ -43,6 +43,9 @@ struct test_entry {
 
    /* u_vector requires power of two sizing */
    char padding[8];
+#ifdef PIPE_ARCH_X86
+   char padding2[8];
+#endif
 };
 
 static uint64_t
@@ -394,8 +397,10 @@ static void print_test_entry(const struct test_entry *e)
 
 int main()
 {
+   STATIC_ASSERT(sizeof(struct test_entry) == 64);
+
    struct u_vector test_entries;
-   u_vector_init(&test_entries,  util_next_power_of_two(sizeof(struct test_entry)), 4096);
+   u_vector_init(&test_entries,  sizeof(struct test_entry), 4096);
 
    for (unsigned i = 0; i < ARRAY_SIZE(testcases); ++i) {
       struct radeon_info info = get_radeon_info(&testcases[i]);