From: Marek Olšák <marek.olsak@amd.com>
Date: Fri, 9 Mar 2018 21:25:42 +0000 (-0500)
Subject: radeonsi: add a workaround for GFX9 hang with init_config alignment
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=2bdb54bce77828ef20b730ad869b66c5889b5347;p=mesa.git

radeonsi: add a workaround for GFX9 hang with init_config alignment

Fixes: 75c5d25f0f34cd702 "radeonsi: align command buffer starting address to fix some Raven hangs"
Cc: 17.3 18.0 <mesa-stable@lists.freedesktop.org>
---

diff --git a/src/gallium/drivers/radeonsi/si_pm4.c b/src/gallium/drivers/radeonsi/si_pm4.c
index f4c41f5ffa5..1fe2fb74604 100644
--- a/src/gallium/drivers/radeonsi/si_pm4.c
+++ b/src/gallium/drivers/radeonsi/si_pm4.c
@@ -166,10 +166,11 @@ void si_pm4_upload_indirect_buffer(struct si_context *sctx,
 	assert(aligned_ndw <= SI_PM4_MAX_DW);
 
 	r600_resource_reference(&state->indirect_buffer, NULL);
+	/* TODO: this hangs with 1024 or higher alignment on GFX9. */
 	state->indirect_buffer = (struct r600_resource*)
 		si_aligned_buffer_create(screen, 0,
 					 PIPE_USAGE_DEFAULT, aligned_ndw * 4,
-					 sctx->screen->info.ib_start_alignment);
+					 256);
 	if (!state->indirect_buffer)
 		return;