diff options
| author | Marek Olšák <marek.olsak@amd.com> | 2023-07-16 03:24:21 -0400 |
|---|---|---|
| committer | Eric Engestrom <eric@engestrom.ch> | 2023-07-18 22:48:05 +0100 |
| commit | e2406205504bb728aec1a50692846c73c87dfac8 (patch) | |
| tree | e11d12f79a16fa7b5304eba9cb5576398f070baa /.pick_status.json | |
| parent | 6d67864d29c4a3b079a7dc3a3bc1610858c94730 (diff) | |
| download | mesa-e2406205504bb728aec1a50692846c73c87dfac8.tar.gz mesa-e2406205504bb728aec1a50692846c73c87dfac8.tar.bz2 mesa-e2406205504bb728aec1a50692846c73c87dfac8.zip | |
util/u_queue: fix util_queue_finish deadlock by merging lock and finish_lock
and by disabling the on-demand thread creation, which breaks the finish logic.
Fixes: 3713dc6b2a7 - util/u_queue: add UTIL_QUEUE_INIT_SCALE_THREADS flag
Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/8363
Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24173>
(cherry picked from commit bfdfe5aa82f349d055d2e69aaf1b46325a6772ca)
Diffstat (limited to '.pick_status.json')
| -rw-r--r-- | .pick_status.json | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.pick_status.json b/.pick_status.json index 8d9646cc1dd..fe2832a62f5 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -193,7 +193,7 @@ "description": "util/u_queue: fix util_queue_finish deadlock by merging lock and finish_lock", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "3713dc6b2a7472a838885b9ff1e4e07f9b9b7713" }, |