From 5361b1f331ea9f5e9a106f786433363fbb5d170e Mon Sep 17 00:00:00 2001 From: Alyssa Rosenzweig Date: Mon, 4 Dec 2023 12:39:52 -0400 Subject: [PATCH] asahi: bump max threads per wg gl4.3 min. Signed-off-by: Alyssa Rosenzweig Part-of: --- src/gallium/drivers/asahi/agx_pipe.c | 4 ++-- src/gallium/drivers/asahi/agx_state.c | 5 ----- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/src/gallium/drivers/asahi/agx_pipe.c b/src/gallium/drivers/asahi/agx_pipe.c index d399f114de8..c03b501929d 100644 --- a/src/gallium/drivers/asahi/agx_pipe.c +++ b/src/gallium/drivers/asahi/agx_pipe.c @@ -1949,10 +1949,10 @@ agx_get_compute_param(struct pipe_screen *pscreen, enum pipe_shader_ir ir_type, RET(((uint64_t[]){65535, 65535, 65535})); case PIPE_COMPUTE_CAP_MAX_BLOCK_SIZE: - RET(((uint64_t[]){256, 256, 256})); + RET(((uint64_t[]){1024, 1024, 1024})); case PIPE_COMPUTE_CAP_MAX_THREADS_PER_BLOCK: - RET((uint64_t[]){256}); + RET((uint64_t[]){1024}); case PIPE_COMPUTE_CAP_MAX_GLOBAL_SIZE: case PIPE_COMPUTE_CAP_MAX_MEM_ALLOC_SIZE: { diff --git a/src/gallium/drivers/asahi/agx_state.c b/src/gallium/drivers/asahi/agx_state.c index 2bdc0badcad..853b8caec3a 100644 --- a/src/gallium/drivers/asahi/agx_state.c +++ b/src/gallium/drivers/asahi/agx_state.c @@ -2381,11 +2381,6 @@ agx_get_compute_state_info(struct pipe_context *pctx, void *cso, info->private_memory = 0; info->preferred_simd_size = 32; info->simd_sizes = 32; - - /* HACK: Clamp max_threads to what we advertise. When we fix the CAP - * situation around block sizes, we can drop this. - */ - info->max_threads = MIN2(info->max_threads, 256); } /* Does not take ownership of key. Clones if necessary. */