From 3ba68813f2e5beff04afc946aa61f320af0c7b34 Mon Sep 17 00:00:00 2001 From: Yiwei Zhang Date: Wed, 14 Feb 2024 17:17:39 -0800 Subject: [PATCH] venus: fix the cmd stride used for qfb recording Not a real issue since the dispatchable handle size is the same. Fixes: d2a626787e5 ("venus: track/recycle appended query feedback cmds") Signed-off-by: Yiwei Zhang Part-of: (cherry picked from commit 55224006b784b38d9c85ac2d9022ba56240130f2) --- .pick_status.json | 2 +- src/virtio/vulkan/vn_queue.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 602a476c362..286bac55a5c 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -2854,7 +2854,7 @@ "description": "venus: fix the cmd stride used for qfb recording", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "d2a626787e559dad9105243be9e5043c9230853c", "notes": null diff --git a/src/virtio/vulkan/vn_queue.c b/src/virtio/vulkan/vn_queue.c index 22d469bba2a..3929b4275a3 100644 --- a/src/virtio/vulkan/vn_queue.c +++ b/src/virtio/vulkan/vn_queue.c @@ -600,7 +600,7 @@ vn_queue_submission_add_query_feedback(struct vn_queue_submission *submit, VkCommandBuffer *feedback_cmd_handle = vn_get_feedback_cmd_handle(submit, feedback_cmds, cmd_count); const uint32_t stride = submit->batch_type == VK_STRUCTURE_TYPE_SUBMIT_INFO - ? sizeof(VkCommandBuffer *) + ? sizeof(VkCommandBuffer) : sizeof(VkCommandBufferSubmitInfo); struct vn_feedback_cmd_pool *feedback_cmd_pool = NULL;