fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-02-01 22:00:26 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

panfrost: Fix inverted indirect dispatch condition

Browse source 
Inverted condition -- indirect dispatch gets disabled when WLS is in use, not
the other way around. Not sure how this worked before...

Fixes: fd7b44882c ("panfrost: Use direct dispatch with shared memory")
Signed-off-by: Alyssa Rosenzweig <alyssa@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16916>
(cherry picked from commit 3c5f1595b8)
This commit is contained in:
Alyssa Rosenzweig 2022-06-06 16:48:57 -04:00 • committed by Dylan Baker
parent 6022ed0079
commit 364767c445
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -283,7 +283,7 @@
"description": "panfrost: Fix inverted indirect dispatch condition",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": "fd7b44882ce3c7604be592f484264097125dfa52"
},

2
src/gallium/drivers/panfrost/pan_cmdstream.c
View file

@ -3522,7 +3522,7 @@ panfrost_launch_grid(struct pipe_context *pipe,
/* Indirect dispatch can't handle workgroup local storage since that
* would require dynamic memory allocation. Bail in this case. */
if (info->indirect && (!cs->info.wls_size || !PAN_GPU_INDIRECTS)) {
if (info->indirect && ((cs->info.wls_size != 0) || !PAN_GPU_INDIRECTS)) {
struct pipe_transfer *transfer;
uint32_t *params = pipe_buffer_map_range(pipe, info->indirect,
info->indirect_offset,