diff --git a/.pick_status.json b/.pick_status.json
index 5e3a7bf4126..68902006bee 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -1210,7 +1210,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 2b351c395e4..6789f27c346 100644
--- a/src/gallium/drivers/radeonsi/si_pipe.c
+++ b/src/gallium/drivers/radeonsi/si_pipe.c
@@ -588,6 +588,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. */