Module: Mesa Branch: master Commit: 827ae79b2c6cf53e26b3467e4c3965ce6acab3c6 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=827ae79b2c6cf53e26b3467e4c3965ce6acab3c6
Author: Marek Olšák <[email protected]> Date: Mon Mar 20 16:39:02 2017 +0100 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]> --- src/gallium/drivers/radeonsi/si_compute.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/gallium/drivers/radeonsi/si_compute.c b/src/gallium/drivers/radeonsi/si_compute.c index ed02f4930f..19a9189e73 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. */ _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
