From 5e8791a0bf00384cbd7e3a7231bddbc48bd550a8 Mon Sep 17 00:00:00 2001 From: "Olsak, Marek" Date: Wed, 30 Sep 2020 12:19:05 -0400 Subject: radeonsi: Fix dead lock with aux_context_lock in si_screen_clear_buffer. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit After disable SDMA on Arcturus(gfx9), dead lock with aux_context_lock is detected since si_screen_clear_buffer is called recursively before release lock. The call trace is: si_clear_render_target->si_compute_clear_render_target-> si_launch_grid_internal->si_launch_grid->si_emit_cache_flush-> si_prim_discard_signal_next_compute_ib_start->u_suballocator_alloc-> si_resource_create->si_buffer_create->si_alloc_resource-> si_screen_clear_buffer->simple_mtx_lock-> si_sdma_clear_buffer->si_pipe_clear_buffer-> si_clear_buffer->si_compute_do_clear_or_copy-> si_launch_grid_internal->si_launch_grid->si_emit_cache_flush-> si_prim_discard_signal_next_compute_ib_start->u_suballocator_alloc-> si_resource_create->si_buffer_create->si_alloc_resource-> si_screen_clear_buffer->simple_mtx_lock Fixes: 07a49bf5976 "radeonsi: disable SDMA on gfx9" Signed-off-by: James Zhu Reviewed-by: Marek Olšák Part-of: --- src/gallium/drivers/radeonsi/si_pipe.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/gallium/drivers/radeonsi/si_pipe.c b/src/gallium/drivers/radeonsi/si_pipe.c index a8e67c32855..ab476013873 100644 --- a/src/gallium/drivers/radeonsi/si_pipe.c +++ b/src/gallium/drivers/radeonsi/si_pipe.c @@ -601,6 +601,8 @@ static struct pipe_context *si_create_context(struct pipe_screen *screen, unsign si_initialize_prim_discard_tunables(sscreen, is_aux_context, &sctx->prim_discard_vertex_count_threshold, &sctx->index_ring_size_per_ib); + } else { + sctx->prim_discard_vertex_count_threshold = UINT_MAX; } /* Initialize SDMA functions. */ -- cgit v1.2.3