commit e11bf563dd411edb5260f4b8e28edb3c905725e2
author Marek Olšák <marek.olsak@amd.com> Fri Mar 24 00:17:23 2017 +0100
committer Andres Gomez <agomez@igalia.com> Wed Mar 29 19:13:18 2017 +0300
tree 76df0f03a0b41bc08f1c60ae4eff9a4f5bfc60ef
parent c375c448bf529952afec3df62aff5f9f506c498e

radeonsi: don't hang on shader compile failure

Cc: 17.0 <mesa-stable@lists.freedesktop.org>
Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
(cherry picked from commit 518d8341627ac80f8757fd09cc3cd5c2884f58e0)

src/gallium/drivers/radeonsi/si_state_shaders.c

diff --git a/src/gallium/drivers/radeonsi/si_state_shaders.c b/src/gallium/drivers/radeonsi/si_state_shaders.c
index caf20e5..5a3d238 100644
--- a/src/gallium/drivers/radeonsi/si_state_shaders.c
+++ b/src/gallium/drivers/radeonsi/si_state_shaders.c
@@ -1146,7 +1146,7 @@
 		   memcmp(&current->key, key, sizeof(*key)) == 0 &&
 		   (!current->is_optimized ||
 		    util_queue_fence_is_signalled(&current->optimized_ready))))
-		return 0;
+		return current->compilation_failed ? -1 : 0;
 
 	/* This must be done before the mutex is locked, because async GS
 	 * compilation calls this function too, and therefore must enter