From: Eric Anholt <eric@anholt.net>
Date: Wed, 1 Nov 2017 17:28:01 +0000 (-0700)
Subject: broadcom/vc5: Make sure the TMU indirect struct is appropriately aligned.
X-Git-Tag: upstream/18.1.0~4447
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=949ac638bc9d5f16abd1666bb465c7f935286d87;p=platform%2Fupstream%2Fmesa.git

broadcom/vc5: Make sure the TMU indirect struct is appropriately aligned.

I was hoping that this would help with fbo-generatemipmap hangs, but no
luck.
---

diff --git a/src/gallium/drivers/vc5/vc5_emit.c b/src/gallium/drivers/vc5/vc5_emit.c
index 83ea3c4..9df4c1e 100644
--- a/src/gallium/drivers/vc5/vc5_emit.c
+++ b/src/gallium/drivers/vc5/vc5_emit.c
@@ -170,6 +170,8 @@ emit_one_texture(struct vc5_context *vc5, struct vc5_texture_stateobj *stage_tex
         for (int i = 0; i < ARRAY_SIZE(packed); i++)
                 packed[i] |= sview->texture_shader_state[i] | sampler->texture_shader_state[i];
 
+        /* TMU indirect structs need to be 32b aligned. */
+        vc5_cl_ensure_space(&job->indirect, ARRAY_SIZE(packed), 32);
         cl_emit_prepacked(&job->indirect, &packed);
 }