From b8e4cc73bfa0880ed8d1f25a86f9f80a1207972b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timur=20Krist=C3=B3f?= Date: Sat, 17 Dec 2022 16:22:20 +0100 Subject: [PATCH] radv/amdgpu: Remove cs_add_buffers because it's no longer necessary. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This function was added because previously ACE and GFX work was submitted separately and we needed to make sure they both use the same BOs. Now they are part of the same submission so this function is not necessary anymore. Signed-off-by: Timur Kristóf Reviewed-by: Bas Nieuwenhuizen Part-of: --- src/amd/vulkan/radv_cmd_buffer.c | 1 - src/amd/vulkan/radv_radeon_winsys.h | 2 -- src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.c | 17 ----------------- 3 files changed, 20 deletions(-) diff --git a/src/amd/vulkan/radv_cmd_buffer.c b/src/amd/vulkan/radv_cmd_buffer.c index 179c0401437..ba635705b02 100644 --- a/src/amd/vulkan/radv_cmd_buffer.c +++ b/src/amd/vulkan/radv_cmd_buffer.c @@ -754,7 +754,6 @@ radv_ace_internal_finalize(struct radv_cmd_buffer *cmd_buffer) radeon_emit(cs, 0); } - device->ws->cs_add_buffers(ace_cs, cmd_buffer->cs); return device->ws->cs_finalize(ace_cs); } diff --git a/src/amd/vulkan/radv_radeon_winsys.h b/src/amd/vulkan/radv_radeon_winsys.h index 1f56a52c57b..47d194d62af 100644 --- a/src/amd/vulkan/radv_radeon_winsys.h +++ b/src/amd/vulkan/radv_radeon_winsys.h @@ -290,8 +290,6 @@ struct radeon_winsys { void (*cs_add_buffer)(struct radeon_cmdbuf *cs, struct radeon_winsys_bo *bo); - void (*cs_add_buffers)(struct radeon_cmdbuf *to, struct radeon_cmdbuf *from); - void (*cs_execute_secondary)(struct radeon_cmdbuf *parent, struct radeon_cmdbuf *child, bool allow_ib2); diff --git a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.c b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.c index 59a5014239e..30c4f89c04d 100644 --- a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.c +++ b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.c @@ -622,22 +622,6 @@ radv_amdgpu_cs_add_buffer(struct radeon_cmdbuf *_cs, struct radeon_winsys_bo *_b radv_amdgpu_cs_add_buffer_internal(cs, bo->bo_handle, bo->priority); } -static void -radv_amdgpu_cs_add_buffers(struct radeon_cmdbuf *_to, struct radeon_cmdbuf *_from) -{ - struct radv_amdgpu_cs *from = radv_amdgpu_cs(_from); - struct radv_amdgpu_cs *to = radv_amdgpu_cs(_to); - - for (unsigned i = 0; i < from->num_buffers; ++i) { - radv_amdgpu_cs_add_buffer_internal(to, from->handles[i].bo_handle, - from->handles[i].bo_priority); - } - - for (unsigned i = 0; i < from->num_virtual_buffers; ++i) { - radv_amdgpu_cs_add_buffer(&to->base, from->virtual_buffers[i]); - } -} - static void radv_amdgpu_cs_execute_secondary(struct radeon_cmdbuf *_parent, struct radeon_cmdbuf *_child, bool allow_ib2) @@ -1891,7 +1875,6 @@ radv_amdgpu_cs_init_functions(struct radv_amdgpu_winsys *ws) ws->base.cs_finalize = radv_amdgpu_cs_finalize; ws->base.cs_reset = radv_amdgpu_cs_reset; ws->base.cs_add_buffer = radv_amdgpu_cs_add_buffer; - ws->base.cs_add_buffers = radv_amdgpu_cs_add_buffers; ws->base.cs_execute_secondary = radv_amdgpu_cs_execute_secondary; ws->base.cs_submit = radv_amdgpu_winsys_cs_submit; ws->base.cs_dump = radv_amdgpu_winsys_cs_dump;