summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.pick_status.json2
-rw-r--r--src/gallium/drivers/radeonsi/si_pipe.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/.pick_status.json b/.pick_status.json
index 3d7ad46117d..0b7e39d0b6c 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -9616,7 +9616,7 @@
"description": "radeonsi: Fix dead lock with aux_context_lock in si_screen_clear_buffer.",
"nominated": true,
"nomination_type": 1,
- "resolution": 0,
+ "resolution": 1,
"master_sha": null,
"because_sha": "07a49bf59766b7c40d35608a98bd4a5796dcc2fe"
},
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. */