From f0d2ad984026eba7726f5a9a94ba57832e66c226 Mon Sep 17 00:00:00 2001 From: Lorenzo Rossi Date: Thu, 30 Apr 2026 13:14:57 +0200 Subject: [PATCH] panvk/jm: Fix tls_size overwrite in indirect draws Only caused problems when the VS/FS has more TLS than our internal shaders that doesn't usually happen but will cause bugs when we start to compress local memory. Fixes: 005703e5b5f ("panvk: Move TLS preparation logic to cmd_dispatch_prepare_tls") Signed-off-by: Lorenzo Rossi Reviewed-by: Christoph Pillmayer Reviewed-by: Faith Ekstrand Part-of: --- src/panfrost/vulkan/jm/panvk_vX_cmd_dispatch.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/panfrost/vulkan/jm/panvk_vX_cmd_dispatch.c b/src/panfrost/vulkan/jm/panvk_vX_cmd_dispatch.c index 50e09514f58..57b48e69f15 100644 --- a/src/panfrost/vulkan/jm/panvk_vX_cmd_dispatch.c +++ b/src/panfrost/vulkan/jm/panvk_vX_cmd_dispatch.c @@ -44,7 +44,7 @@ panvk_per_arch(cmd_dispatch_prepare_tls)( panvk_per_arch(cmd_alloc_tls_desc)(cmdbuf, false); - batch->tlsinfo.tls.size = cs->info.tls_size; + batch->tlsinfo.tls.size = MAX2(cs->info.tls_size, batch->tlsinfo.tls.size); batch->tlsinfo.wls.size = cs->info.wls_size; if (batch->tlsinfo.wls.size) {