summaryrefslogtreecommitdiffstats
path: root/src/gallium/drivers
diff options
context:
space:
mode:
authorMarek Olšák <[email protected]>2017-03-20 16:39:02 +0100
committerMarek Olšák <[email protected]>2017-03-20 23:17:14 +0100
commit827ae79b2c6cf53e26b3467e4c3965ce6acab3c6 (patch)
treeffdb1ee73b115d8ac6dac172ebebe394bffb654b /src/gallium/drivers
parent40840831244e3d7e46411119b9013d83eef0b6b7 (diff)
radeonsi: check the IR type before waiting for a compute compilation fence
This should fix OpenCL getting stuck. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=100288 Reviewed-by: Samuel Pitoiset <[email protected]>
Diffstat (limited to 'src/gallium/drivers')
-rw-r--r--src/gallium/drivers/radeonsi/si_compute.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/gallium/drivers/radeonsi/si_compute.c b/src/gallium/drivers/radeonsi/si_compute.c
index ed02f4930f8..19a9189e739 100644
--- a/src/gallium/drivers/radeonsi/si_compute.c
+++ b/src/gallium/drivers/radeonsi/si_compute.c
@@ -746,7 +746,9 @@ static void si_launch_grid(
sctx->b.flags |= SI_CONTEXT_PS_PARTIAL_FLUSH |
SI_CONTEXT_CS_PARTIAL_FLUSH;
- util_queue_fence_wait(&program->ready);
+ if (program->ir_type == PIPE_SHADER_IR_TGSI)
+ util_queue_fence_wait(&program->ready);
+
si_decompress_compute_textures(sctx);
/* Add buffer sizes for memory checking in need_cs_space. */