diff options
| author | Olsak, Marek <Marek.Olsak@amd.com> | 2020-09-30 12:19:05 -0400 |
|---|---|---|
| committer | Eric Engestrom <eric@engestrom.ch> | 2020-10-14 19:29:26 +0200 |
| commit | 0be1a042d8827dfff19ec978327e825901fd14eb (patch) | |
| tree | 9bf95a80369bf379526d518c9781b960d16c3502 /src/gallium/drivers/radeonsi/si_pipe.c | |
| parent | 8c8bc24be6961fbfbf319e6c868e234120cf5b60 (diff) | |
radeonsi: Fix dead lock with aux_context_lock in si_screen_clear_buffer.
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 <James.Zhu@amd.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6941>
(cherry picked from commit 5e8791a0bf00384cbd7e3a7231bddbc48bd550a8)
Diffstat (limited to 'src/gallium/drivers/radeonsi/si_pipe.c')
| -rw-r--r-- | src/gallium/drivers/radeonsi/si_pipe.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/gallium/drivers/radeonsi/si_pipe.c b/src/gallium/drivers/radeonsi/si_pipe.c index 81614cbfb01..a13e6277337 100644 --- a/src/gallium/drivers/radeonsi/si_pipe.c +++ b/src/gallium/drivers/radeonsi/si_pipe.c @@ -580,6 +580,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. */ |