From d0593bb86cbb12f769e2427a7dd763ba49aec61c Mon Sep 17 00:00:00 2001 From: Faith Ekstrand Date: Wed, 3 Jul 2024 14:45:05 -0500 Subject: [PATCH] nvk: Drop extra_bos from nvk_queue_submit_simple() We aren't using it anymore and the only reason it existed in the first place was for providing BO lists to the old UAPI. Part-of: --- src/nouveau/vulkan/nvk_queue.c | 10 +++------- src/nouveau/vulkan/nvk_queue.h | 8 ++------ src/nouveau/vulkan/nvk_queue_drm_nouveau.c | 4 +--- 3 files changed, 6 insertions(+), 16 deletions(-) diff --git a/src/nouveau/vulkan/nvk_queue.c b/src/nouveau/vulkan/nvk_queue.c index 21e6dfe1881..1fccaf1531d 100644 --- a/src/nouveau/vulkan/nvk_queue.c +++ b/src/nouveau/vulkan/nvk_queue.c @@ -325,8 +325,7 @@ nvk_queue_init_context_state(struct nvk_queue *queue, return result; } - return nvk_queue_submit_simple(queue, nv_push_dw_count(&push), - push_data, 0, NULL); + return nvk_queue_submit_simple(queue, nv_push_dw_count(&push), push_data); } VkResult @@ -411,9 +410,7 @@ nvk_queue_finish(struct nvk_device *dev, struct nvk_queue *queue) VkResult nvk_queue_submit_simple(struct nvk_queue *queue, - uint32_t dw_count, const uint32_t *dw, - uint32_t extra_bo_count, - struct nouveau_ws_bo **extra_bos) + uint32_t dw_count, const uint32_t *dw) { struct nvk_device *dev = nvk_queue_device(queue); struct nvk_physical_device *pdev = nvk_device_physical(dev); @@ -434,8 +431,7 @@ nvk_queue_submit_simple(struct nvk_queue *queue, memcpy(push_map, dw, dw_count * 4); - result = nvk_queue_submit_simple_drm_nouveau(queue, dw_count, push_bo, - extra_bo_count, extra_bos); + result = nvk_queue_submit_simple_drm_nouveau(queue, dw_count, push_bo); const bool debug_sync = pdev->debug_flags & NVK_DEBUG_PUSH_SYNC; if ((debug_sync && result != VK_SUCCESS) || diff --git a/src/nouveau/vulkan/nvk_queue.h b/src/nouveau/vulkan/nvk_queue.h index 25a7293b183..9f160de88c2 100644 --- a/src/nouveau/vulkan/nvk_queue.h +++ b/src/nouveau/vulkan/nvk_queue.h @@ -77,9 +77,7 @@ VkResult nvk_push_dispatch_state_init(struct nvk_queue *queue, /* this always syncs, so only use when that doesn't matter */ VkResult nvk_queue_submit_simple(struct nvk_queue *queue, - uint32_t dw_count, const uint32_t *dw, - uint32_t extra_bo_count, - struct nouveau_ws_bo **extra_bos); + uint32_t dw_count, const uint32_t *dw); VkResult nvk_queue_init_drm_nouveau(struct nvk_device *dev, struct nvk_queue *queue, @@ -90,9 +88,7 @@ void nvk_queue_finish_drm_nouveau(struct nvk_device *dev, VkResult nvk_queue_submit_simple_drm_nouveau(struct nvk_queue *queue, uint32_t push_dw_count, - struct nouveau_ws_bo *push_bo, - uint32_t extra_bo_count, - struct nouveau_ws_bo **extra_bos); + struct nouveau_ws_bo *push_bo); VkResult nvk_queue_submit_drm_nouveau(struct nvk_queue *queue, struct vk_queue_submit *submit, diff --git a/src/nouveau/vulkan/nvk_queue_drm_nouveau.c b/src/nouveau/vulkan/nvk_queue_drm_nouveau.c index 692c3b5f0d4..2a69a642e13 100644 --- a/src/nouveau/vulkan/nvk_queue_drm_nouveau.c +++ b/src/nouveau/vulkan/nvk_queue_drm_nouveau.c @@ -577,9 +577,7 @@ nvk_queue_finish_drm_nouveau(struct nvk_device *dev, VkResult nvk_queue_submit_simple_drm_nouveau(struct nvk_queue *queue, uint32_t push_dw_count, - struct nouveau_ws_bo *push_bo, - uint32_t extra_bo_count, - struct nouveau_ws_bo **extra_bos) + struct nouveau_ws_bo *push_bo) { struct push_builder pb; push_builder_init(queue, &pb, false);