Mesa (main): panfrost: Fix inverted indirect dispatch condition

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: 3c5f1595b89d02df92bead419e8bbb0511d14201
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=3c5f1595b89d02df92bead419e8bbb0511d14201

Author: Alyssa Rosenzweig <alyssa at collabora.com>
Date:   Mon Jun  6 16:48:57 2022 -0400

panfrost: Fix inverted indirect dispatch condition

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

Fixes: fd7b44882ce ("panfrost: Use direct dispatch with shared memory")
Signed-off-by: Alyssa Rosenzweig <alyssa at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16916>

---

 src/gallium/drivers/panfrost/pan_cmdstream.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gallium/drivers/panfrost/pan_cmdstream.c b/src/gallium/drivers/panfrost/pan_cmdstream.c
index d9cc9535e65..abb36e5325f 100644
--- a/src/gallium/drivers/panfrost/pan_cmdstream.c
+++ b/src/gallium/drivers/panfrost/pan_cmdstream.c
@@ -4084,7 +4084,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,