Mesa (master): radeonsi/gfx9: prevent a race when the previous shader' s main part is missing

[Marek Olšák]

Module: Mesa
Branch: master
Commit: 3effce4fb062371dd6c08fe57b0c12a20cf7af71
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=3effce4fb062371dd6c08fe57b0c12a20cf7af71

Author: Marek Olšák <marek.olsak at amd.com>
Date:   Thu Jun  1 19:02:16 2017 +0200

radeonsi/gfx9: prevent a race when the previous shader's main part is missing

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

---

 src/gallium/drivers/radeonsi/si_state_shaders.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/gallium/drivers/radeonsi/si_state_shaders.c b/src/gallium/drivers/radeonsi/si_state_shaders.c
index 727bf4bee9..08d647b5a5 100644
--- a/src/gallium/drivers/radeonsi/si_state_shaders.c
+++ b/src/gallium/drivers/radeonsi/si_state_shaders.c
@@ -1634,9 +1634,11 @@ again:
 			else
 				assert(0);
 
+			mtx_lock(&previous_stage_sel->mutex);
 			ok = si_check_missing_main_part(sscreen,
 							previous_stage_sel,
 							compiler_state, &shader1_key);
+			mtx_unlock(&previous_stage_sel->mutex);
 		} else {
 			ok = si_check_missing_main_part(sscreen, sel,
 							compiler_state, key);