From: Marek Olšák <marek.olsak@amd.com>
Date: Thu, 23 Mar 2017 23:17:23 +0000 (+0100)
Subject: radeonsi: don't hang on shader compile failure
X-Git-Tag: upstream/17.1.0~1041
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=518d8341627ac80f8757fd09cc3cd5c2884f58e0;p=platform%2Fupstream%2Fmesa.git

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>
---

diff --git a/src/gallium/drivers/radeonsi/si_state_shaders.c b/src/gallium/drivers/radeonsi/si_state_shaders.c
index 30856b0..e1286b8 100644
--- a/src/gallium/drivers/radeonsi/si_state_shaders.c
+++ b/src/gallium/drivers/radeonsi/si_state_shaders.c
@@ -1246,7 +1246,7 @@ again:
 		   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