From 4d35002949c4ca0ffb00b9e98b828829553d51d4 Mon Sep 17 00:00:00 2001 From: Chia-I Wu Date: Thu, 21 Nov 2024 15:41:16 -0800 Subject: [PATCH] panvk: expand top-of-pipe and bottom-of-pipe Use vk_expand_src_stage_flags2 and vk_expand_dst_stage_flags2, instead of vk_expand_pipeline_stage_flags2, to expand bottom-of-pipe and top-of-pipe respectively. Fixes: 5544d39f442 ("panvk: Add a CSF backend for panvk_queue/cmd_buffer") Signed-off-by: Chia-I Wu Reviewed-by: Boris Brezillon Part-of: --- src/panfrost/ci/panfrost-g610-fails.txt | 33 ------------------- src/panfrost/vulkan/csf/panvk_vX_cmd_buffer.c | 4 +-- 2 files changed, 2 insertions(+), 35 deletions(-) diff --git a/src/panfrost/ci/panfrost-g610-fails.txt b/src/panfrost/ci/panfrost-g610-fails.txt index 4d00d9e9726..3fa8fc43325 100644 --- a/src/panfrost/ci/panfrost-g610-fails.txt +++ b/src/panfrost/ci/panfrost-g610-fails.txt @@ -744,40 +744,7 @@ dEQP-VK.pipeline.pipeline_library.multisample_shader_builtin.sample_mask.write.1 dEQP-VK.pipeline.pipeline_library.multisample_shader_builtin.sample_mask.write.137_191_1.samples_4,Fail dEQP-VK.renderpass.suballocation.attachment_allocation.input_output.63,Fail -dEQP-VK.renderpass.suballocation.subpass_dependencies.external_subpass.render_size_128_128.render_passes_2,Fail -dEQP-VK.renderpass.suballocation.subpass_dependencies.external_subpass.render_size_128_128.render_passes_3,Fail -dEQP-VK.renderpass.suballocation.subpass_dependencies.external_subpass.render_size_128_128.render_passes_5,Fail -dEQP-VK.renderpass.suballocation.subpass_dependencies.external_subpass.render_size_512_512.render_passes_2,Fail -dEQP-VK.renderpass.suballocation.subpass_dependencies.external_subpass.render_size_512_512.render_passes_3,Fail -dEQP-VK.renderpass.suballocation.subpass_dependencies.external_subpass.render_size_512_512.render_passes_5,Fail -dEQP-VK.renderpass.suballocation.subpass_dependencies.external_subpass.render_size_64_64.render_passes_3,Fail -dEQP-VK.renderpass.suballocation.subpass_dependencies.external_subpass.render_size_64_64.render_passes_5,Fail -dEQP-VK.renderpass.suballocation.subpass_dependencies.implicit_dependencies.render_passes_2,Fail -dEQP-VK.renderpass.suballocation.subpass_dependencies.implicit_dependencies.render_passes_3,Fail -dEQP-VK.renderpass.suballocation.subpass_dependencies.implicit_dependencies.render_passes_5,Fail - dEQP-VK.renderpass2.suballocation.attachment_allocation.input_output.63,Fail -dEQP-VK.renderpass2.suballocation.subpass_dependencies.external_subpass.render_size_128_128.render_passes_2,Fail -dEQP-VK.renderpass2.suballocation.subpass_dependencies.external_subpass.render_size_128_128.render_passes_2_sync_2,Fail -dEQP-VK.renderpass2.suballocation.subpass_dependencies.external_subpass.render_size_128_128.render_passes_3,Fail -dEQP-VK.renderpass2.suballocation.subpass_dependencies.external_subpass.render_size_128_128.render_passes_3_sync_2,Fail -dEQP-VK.renderpass2.suballocation.subpass_dependencies.external_subpass.render_size_128_128.render_passes_5,Fail -dEQP-VK.renderpass2.suballocation.subpass_dependencies.external_subpass.render_size_128_128.render_passes_5_sync_2,Fail -dEQP-VK.renderpass2.suballocation.subpass_dependencies.external_subpass.render_size_512_512.render_passes_2,Fail -dEQP-VK.renderpass2.suballocation.subpass_dependencies.external_subpass.render_size_512_512.render_passes_2_sync_2,Fail -dEQP-VK.renderpass2.suballocation.subpass_dependencies.external_subpass.render_size_512_512.render_passes_3,Fail -dEQP-VK.renderpass2.suballocation.subpass_dependencies.external_subpass.render_size_512_512.render_passes_3_sync_2,Fail -dEQP-VK.renderpass2.suballocation.subpass_dependencies.external_subpass.render_size_512_512.render_passes_5,Fail -dEQP-VK.renderpass2.suballocation.subpass_dependencies.external_subpass.render_size_512_512.render_passes_5_sync_2,Fail -dEQP-VK.renderpass2.suballocation.subpass_dependencies.external_subpass.render_size_64_64.render_passes_2,Fail -dEQP-VK.renderpass2.suballocation.subpass_dependencies.external_subpass.render_size_64_64.render_passes_2_sync_2,Fail -dEQP-VK.renderpass2.suballocation.subpass_dependencies.external_subpass.render_size_64_64.render_passes_3,Fail -dEQP-VK.renderpass2.suballocation.subpass_dependencies.external_subpass.render_size_64_64.render_passes_3_sync_2,Fail -dEQP-VK.renderpass2.suballocation.subpass_dependencies.external_subpass.render_size_64_64.render_passes_5,Fail -dEQP-VK.renderpass2.suballocation.subpass_dependencies.external_subpass.render_size_64_64.render_passes_5_sync_2,Fail -dEQP-VK.renderpass2.suballocation.subpass_dependencies.implicit_dependencies.render_passes_2,Fail -dEQP-VK.renderpass2.suballocation.subpass_dependencies.implicit_dependencies.render_passes_3,Fail -dEQP-VK.renderpass2.suballocation.subpass_dependencies.implicit_dependencies.render_passes_5,Fail dEQP-VK.spirv_assembly.instruction.compute.opquantize.flush_to_zero,Fail dEQP-VK.spirv_assembly.instruction.compute.opquantize_vec4.flush_to_zero,Fail diff --git a/src/panfrost/vulkan/csf/panvk_vX_cmd_buffer.c b/src/panfrost/vulkan/csf/panvk_vX_cmd_buffer.c index 9fe68821c80..807caabc64c 100644 --- a/src/panfrost/vulkan/csf/panvk_vX_cmd_buffer.c +++ b/src/panfrost/vulkan/csf/panvk_vX_cmd_buffer.c @@ -469,8 +469,8 @@ normalize_dependency(VkPipelineStageFlags2 *src_stages, break; } - *src_stages = vk_expand_pipeline_stage_flags2(*src_stages); - *dst_stages = vk_expand_pipeline_stage_flags2(*dst_stages); + *src_stages = vk_expand_src_stage_flags2(*src_stages); + *dst_stages = vk_expand_dst_stage_flags2(*dst_stages); *src_access = vk_filter_src_access_flags2(*src_stages, *src_access); *dst_access = vk_filter_dst_access_flags2(*dst_stages, *dst_access);