From: Eric Anholt <eric@anholt.net>
Date: Sat, 21 Jan 2017 05:56:27 +0000 (+1100)
Subject: gallium: Weaken assertion about u_mm's align2 field.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=6cc59de9cd56498e176fa3a07326be00a7f5929f;p=mesa.git

gallium: Weaken assertion about u_mm's align2 field.

vc5 MMU mappings are access-controlled at a 128kb boundary, so the 4kb
here was too small for that purpose.  Allowing any valid align2 value that
u_mm's 32-bit addressing can represent will still catch most cases of
people passing in a byte alignment.

Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
---

diff --git a/src/gallium/auxiliary/util/u_mm.c b/src/gallium/auxiliary/util/u_mm.c
index bd4c4e1b106..7a45e291920 100644
--- a/src/gallium/auxiliary/util/u_mm.c
+++ b/src/gallium/auxiliary/util/u_mm.c
@@ -183,7 +183,10 @@ u_mmAllocMem(struct mem_block *heap, int size, int align2, int startSearch)
 
    assert(size >= 0);
    assert(align2 >= 0);
-   assert(align2 <= 12); /* sanity check, 2^12 (4KB) enough? */
+   /* Make sure that a byte alignment isn't getting passed for our
+    * power-of-two alignment arg.
+    */
+   assert(align2 < 32);
 
    if (!heap || align2 < 0 || size <= 0)
       return NULL;