From 47a98bbe349e5827848be665a6b9c27d8953987d Mon Sep 17 00:00:00 2001 From: Boris Brezillon Date: Fri, 29 Mar 2024 09:12:29 +0100 Subject: [PATCH] panvk: Fill pan_tls_info::wls::instances Signed-off-by: Boris Brezillon Reviewed-by: Mary Guillemard Part-of: --- src/panfrost/ci/panfrost-g52-fails.txt | 7 ------- src/panfrost/vulkan/panvk_vX_cmd_buffer.c | 3 ++- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/src/panfrost/ci/panfrost-g52-fails.txt b/src/panfrost/ci/panfrost-g52-fails.txt index 6f1dfbfd863..7e7aef5d747 100644 --- a/src/panfrost/ci/panfrost-g52-fails.txt +++ b/src/panfrost/ci/panfrost-g52-fails.txt @@ -392,13 +392,6 @@ dEQP-VK.rasterization.interpolation_multisample_4_bit.lines_wide,Fail dEQP-VK.rasterization.interpolation_multisample_4_bit.non_strict_lines_wide,Fail dEQP-VK.rasterization.interpolation_multisample_4_bit.triangles,Fail -# internal alignment assertion -dEQP-VK.spirv_assembly.instruction.compute.pointer_parameter.workgroup_memory_variable_pointers,Crash -dEQP-VK.spirv_assembly.instruction.compute.variable_pointers.compute.workgroup_two_buffers,Crash -dEQP-VK.spirv_assembly.instruction.compute.workgroup_memory.float32,Crash -dEQP-VK.spirv_assembly.instruction.compute.workgroup_memory.int32,Crash -dEQP-VK.spirv_assembly.instruction.compute.workgroup_memory.uint32,Crash - dEQP-VK.api.copy_and_blit.core.image_to_image.all_formats.color.1d_to_1d.r16g16_snorm.r16g16_snorm.general_optimal,Fail dEQP-VK.api.copy_and_blit.core.image_to_image.all_formats.color.1d_to_1d.r16g16b16a16_uint.r16g16b16a16_uint.optimal_general,Fail dEQP-VK.api.copy_and_blit.core.image_to_image.all_formats.color.1d_to_1d.r8_uint.r8_uint.general_optimal,Fail diff --git a/src/panfrost/vulkan/panvk_vX_cmd_buffer.c b/src/panfrost/vulkan/panvk_vX_cmd_buffer.c index 61f653d34a4..455fab0662d 100644 --- a/src/panfrost/vulkan/panvk_vX_cmd_buffer.c +++ b/src/panfrost/vulkan/panvk_vX_cmd_buffer.c @@ -1730,8 +1730,9 @@ panvk_per_arch(CmdDispatch)(VkCommandBuffer commandBuffer, uint32_t x, unsigned core_id_range; panfrost_query_core_count(&phys_dev->kmod.props, &core_id_range); + batch->tlsinfo.wls.instances = pan_wls_instances(&dispatch.wg_count); batch->wls_total_size = pan_wls_adjust_size(batch->tlsinfo.wls.size) * - pan_wls_instances(&dispatch.wg_count) * + batch->tlsinfo.wls.instances * core_id_range; }