From de9faec619c79d29a4fd3b7c553e6980af6153d9 Mon Sep 17 00:00:00 2001 From: Boris Brezillon Date: Tue, 12 Nov 2024 16:19:11 +0100 Subject: [PATCH] panvk/csf: Fix a wait-LS operation in finish_cs() cs_wait_slots() expects a mask, cs_wait_slot() a slot ID. Fixes: 5544d39f4420 ("panvk: Add a CSF backend for panvk_queue/cmd_buffer") Signed-off-by: Boris Brezillon Reviewed-by: Lars-Ivar Hesselberg Simonsen (cherry picked from commit c3ff3f2405104104cf1506c66fc3d3ea7698d8b4) Part-of: --- .pick_status.json | 2 +- src/panfrost/vulkan/csf/panvk_vX_cmd_buffer.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index e92ad083033..1dfb98ee075 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -714,7 +714,7 @@ "description": "panvk/csf: Fix a wait-LS operation in finish_cs()", "nominated": true, "nomination_type": 2, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "5544d39f4420da88c53aaf8dd48d86ac92bd0eaa", "notes": null diff --git a/src/panfrost/vulkan/csf/panvk_vX_cmd_buffer.c b/src/panfrost/vulkan/csf/panvk_vX_cmd_buffer.c index dc00ad57127..5f8da921624 100644 --- a/src/panfrost/vulkan/csf/panvk_vX_cmd_buffer.c +++ b/src/panfrost/vulkan/csf/panvk_vX_cmd_buffer.c @@ -156,7 +156,7 @@ finish_cs(struct panvk_cmd_buffer *cmdbuf, uint32_t subqueue) /* Overwrite the sync error with the first error we encountered. */ cs_store32(b, error, debug_sync_addr, offsetof(struct panvk_cs_sync32, error)); - cs_wait_slots(b, SB_ID(LS), false); + cs_wait_slot(b, SB_ID(LS), false); } } }