From cccbe1527ca7dfa3e761ce5a078a0df9eef5401e Mon Sep 17 00:00:00 2001 From: Bas Nieuwenhuizen Date: Mon, 19 Feb 2024 00:53:01 +0100 Subject: [PATCH] radv/winsys: Use radv_buffer_map wrapper. So we can have 1 function ptr and then have a version with default args. Part-of: --- src/amd/vulkan/radv_cmd_buffer.c | 2 +- src/amd/vulkan/radv_cp_reg_shadowing.c | 2 +- src/amd/vulkan/radv_debug.c | 4 ++-- src/amd/vulkan/radv_descriptor_set.c | 2 +- src/amd/vulkan/radv_device.c | 2 +- src/amd/vulkan/radv_device_memory.c | 2 +- src/amd/vulkan/radv_event.c | 2 +- src/amd/vulkan/radv_query.c | 2 +- src/amd/vulkan/radv_queue.c | 4 ++-- src/amd/vulkan/radv_radeon_winsys.h | 6 ++++++ src/amd/vulkan/radv_shader.c | 4 ++-- src/amd/vulkan/radv_spm.c | 2 +- src/amd/vulkan/radv_sqtt.c | 4 ++-- src/amd/vulkan/radv_video.c | 2 +- src/amd/vulkan/si_cmd_buffer.c | 2 +- src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.c | 8 ++++---- 16 files changed, 28 insertions(+), 22 deletions(-) diff --git a/src/amd/vulkan/radv_cmd_buffer.c b/src/amd/vulkan/radv_cmd_buffer.c index ae8ca45909a..afe0edfe7e0 100644 --- a/src/amd/vulkan/radv_cmd_buffer.c +++ b/src/amd/vulkan/radv_cmd_buffer.c @@ -522,7 +522,7 @@ radv_cmd_buffer_resize_upload_buf(struct radv_cmd_buffer *cmd_buffer, uint64_t m cmd_buffer->upload.upload_bo = bo; cmd_buffer->upload.size = new_size; cmd_buffer->upload.offset = 0; - cmd_buffer->upload.map = device->ws->buffer_map(device->ws, cmd_buffer->upload.upload_bo); + cmd_buffer->upload.map = radv_buffer_map(device->ws, cmd_buffer->upload.upload_bo); if (!cmd_buffer->upload.map) { vk_command_buffer_set_error(&cmd_buffer->vk, VK_ERROR_OUT_OF_DEVICE_MEMORY); diff --git a/src/amd/vulkan/radv_cp_reg_shadowing.c b/src/amd/vulkan/radv_cp_reg_shadowing.c index b19a276d755..e6f57d768a7 100644 --- a/src/amd/vulkan/radv_cp_reg_shadowing.c +++ b/src/amd/vulkan/radv_cp_reg_shadowing.c @@ -76,7 +76,7 @@ radv_create_shadow_regs_preamble(const struct radv_device *device, struct radv_q /* copy the cs to queue_state->shadow_regs_ib. This will be the first preamble ib * added in radv_update_preamble_cs. */ - void *map = ws->buffer_map(ws, queue_state->shadow_regs_ib); + void *map = radv_buffer_map(ws, queue_state->shadow_regs_ib); if (!map) { result = VK_ERROR_MEMORY_MAP_FAILED; goto fail_map; diff --git a/src/amd/vulkan/radv_debug.c b/src/amd/vulkan/radv_debug.c index dbd93efa4f5..2e89db5f728 100644 --- a/src/amd/vulkan/radv_debug.c +++ b/src/amd/vulkan/radv_debug.c @@ -80,7 +80,7 @@ radv_init_trace(struct radv_device *device) if (result != VK_SUCCESS) return false; - device->trace_id_ptr = ws->buffer_map(ws, device->trace_bo); + device->trace_id_ptr = radv_buffer_map(ws, device->trace_bo); if (!device->trace_id_ptr) return false; @@ -920,7 +920,7 @@ radv_trap_handler_init(struct radv_device *device) if (result != VK_SUCCESS) return false; - device->tma_ptr = ws->buffer_map(ws, device->tma_bo); + device->tma_ptr = radv_buffer_map(ws, device->tma_bo); if (!device->tma_ptr) return false; diff --git a/src/amd/vulkan/radv_descriptor_set.c b/src/amd/vulkan/radv_descriptor_set.c index 331c19eba6f..bac65868e52 100644 --- a/src/amd/vulkan/radv_descriptor_set.c +++ b/src/amd/vulkan/radv_descriptor_set.c @@ -922,7 +922,7 @@ radv_create_descriptor_pool(struct radv_device *device, const VkDescriptorPoolCr radv_destroy_descriptor_pool(device, pAllocator, pool); return vk_error(device, result); } - pool->mapped_ptr = (uint8_t *)device->ws->buffer_map(device->ws, pool->bo); + pool->mapped_ptr = (uint8_t *)radv_buffer_map(device->ws, pool->bo); if (!pool->mapped_ptr) { radv_destroy_descriptor_pool(device, pAllocator, pool); return vk_error(device, VK_ERROR_OUT_OF_DEVICE_MEMORY); diff --git a/src/amd/vulkan/radv_device.c b/src/amd/vulkan/radv_device.c index bfb54cb28de..a00721a2f86 100644 --- a/src/amd/vulkan/radv_device.c +++ b/src/amd/vulkan/radv_device.c @@ -141,7 +141,7 @@ radv_device_init_border_color(struct radv_device *device) if (result != VK_SUCCESS) return vk_error(device, result); - device->border_color_data.colors_gpu_ptr = device->ws->buffer_map(device->ws, device->border_color_data.bo); + device->border_color_data.colors_gpu_ptr = radv_buffer_map(device->ws, device->border_color_data.bo); if (!device->border_color_data.colors_gpu_ptr) return vk_error(device, VK_ERROR_OUT_OF_DEVICE_MEMORY); mtx_init(&device->border_color_data.mutex, mtx_plain); diff --git a/src/amd/vulkan/radv_device_memory.c b/src/amd/vulkan/radv_device_memory.c index 23d07ef3942..e4c0037d341 100644 --- a/src/amd/vulkan/radv_device_memory.c +++ b/src/amd/vulkan/radv_device_memory.c @@ -300,7 +300,7 @@ radv_MapMemory2KHR(VkDevice _device, const VkMemoryMapInfoKHR *pMemoryMapInfo, v if (mem->user_ptr) *ppData = mem->user_ptr; else - *ppData = device->ws->buffer_map(device->ws, mem->bo); + *ppData = radv_buffer_map(device->ws, mem->bo); if (*ppData) { vk_rmv_log_cpu_map(&device->vk, mem->bo->va, false); diff --git a/src/amd/vulkan/radv_event.c b/src/amd/vulkan/radv_event.c index 653e2c2e9ac..ad27d221064 100644 --- a/src/amd/vulkan/radv_event.c +++ b/src/amd/vulkan/radv_event.c @@ -69,7 +69,7 @@ radv_create_event(struct radv_device *device, const VkEventCreateInfo *pCreateIn } if (!(pCreateInfo->flags & VK_EVENT_CREATE_DEVICE_ONLY_BIT)) { - event->map = (uint64_t *)device->ws->buffer_map(device->ws, event->bo); + event->map = (uint64_t *)radv_buffer_map(device->ws, event->bo); if (!event->map) { radv_destroy_event(device, pAllocator, event); return vk_error(device, VK_ERROR_OUT_OF_DEVICE_MEMORY); diff --git a/src/amd/vulkan/radv_query.c b/src/amd/vulkan/radv_query.c index 1215ff8b3cd..a2690550629 100644 --- a/src/amd/vulkan/radv_query.c +++ b/src/amd/vulkan/radv_query.c @@ -1309,7 +1309,7 @@ radv_create_query_pool(struct radv_device *device, const VkQueryPoolCreateInfo * return vk_error(device, result); } - pool->ptr = device->ws->buffer_map(device->ws, pool->bo); + pool->ptr = radv_buffer_map(device->ws, pool->bo); if (!pool->ptr) { radv_destroy_query_pool(device, pAllocator, pool); return vk_error(device, VK_ERROR_OUT_OF_DEVICE_MEMORY); diff --git a/src/amd/vulkan/radv_queue.c b/src/amd/vulkan/radv_queue.c index cbcc9d37756..63fcc9558b2 100644 --- a/src/amd/vulkan/radv_queue.c +++ b/src/amd/vulkan/radv_queue.c @@ -577,7 +577,7 @@ radv_emit_tess_factor_ring(struct radv_device *device, struct radeon_cmdbuf *cs, static VkResult radv_initialise_task_control_buffer(struct radv_device *device, struct radeon_winsys_bo *task_rings_bo) { - uint32_t *ptr = (uint32_t *)device->ws->buffer_map(device->ws, task_rings_bo); + uint32_t *ptr = (uint32_t *)radv_buffer_map(device->ws, task_rings_bo); if (!ptr) return VK_ERROR_OUT_OF_DEVICE_MEMORY; @@ -982,7 +982,7 @@ radv_update_preamble_cs(struct radv_queue_state *queue, struct radv_device *devi } if (descriptor_bo != queue->descriptor_bo) { - uint32_t *map = (uint32_t *)ws->buffer_map(ws, descriptor_bo); + uint32_t *map = (uint32_t *)radv_buffer_map(ws, descriptor_bo); if (!map) { result = VK_ERROR_OUT_OF_DEVICE_MEMORY; goto fail; diff --git a/src/amd/vulkan/radv_radeon_winsys.h b/src/amd/vulkan/radv_radeon_winsys.h index d68366a839f..f599dca540c 100644 --- a/src/amd/vulkan/radv_radeon_winsys.h +++ b/src/amd/vulkan/radv_radeon_winsys.h @@ -360,4 +360,10 @@ radv_cs_add_buffer(struct radeon_winsys *ws, struct radeon_cmdbuf *cs, struct ra ws->cs_add_buffer(cs, bo); } +static inline void * +radv_buffer_map(struct radeon_winsys *ws, struct radeon_winsys_bo *bo) +{ + return ws->buffer_map(ws, bo); +} + #endif /* RADV_RADEON_WINSYS_H */ diff --git a/src/amd/vulkan/radv_shader.c b/src/amd/vulkan/radv_shader.c index d85ee2dc8c2..7e4acebafa3 100644 --- a/src/amd/vulkan/radv_shader.c +++ b/src/amd/vulkan/radv_shader.c @@ -981,7 +981,7 @@ radv_create_shader_arena(struct radv_device *device, struct radv_shader_free_lis add_hole(free_list, alloc); if (!(flags & RADEON_FLAG_NO_CPU_ACCESS)) { - arena->ptr = (char *)device->ws->buffer_map(device->ws, arena->bo); + arena->ptr = (char *)radv_buffer_map(device->ws, arena->bo); if (!arena->ptr) goto fail; } @@ -1916,7 +1916,7 @@ radv_shader_dma_resize_upload_buf(struct radv_shader_dma_submission *submission, if (result != VK_SUCCESS) return result; - submission->ptr = ws->buffer_map(ws, submission->bo); + submission->ptr = radv_buffer_map(ws, submission->bo); submission->bo_size = size; return VK_SUCCESS; diff --git a/src/amd/vulkan/radv_spm.c b/src/amd/vulkan/radv_spm.c index 9ecfa9f50b4..a7b76db2c8e 100644 --- a/src/amd/vulkan/radv_spm.c +++ b/src/amd/vulkan/radv_spm.c @@ -52,7 +52,7 @@ radv_spm_init_bo(struct radv_device *device) if (result != VK_SUCCESS) return false; - device->spm.ptr = ws->buffer_map(ws, device->spm.bo); + device->spm.ptr = radv_buffer_map(ws, device->spm.bo); if (!device->spm.ptr) return false; diff --git a/src/amd/vulkan/radv_sqtt.c b/src/amd/vulkan/radv_sqtt.c index 6f1f4ef2848..c06cb1ba8bd 100644 --- a/src/amd/vulkan/radv_sqtt.c +++ b/src/amd/vulkan/radv_sqtt.c @@ -512,7 +512,7 @@ radv_sqtt_acquire_gpu_timestamp(struct radv_device *device, struct radeon_winsys return result; } - map = device->ws->buffer_map(device->ws, bo); + map = radv_buffer_map(device->ws, bo); if (!map) { ws->buffer_destroy(ws, bo); simple_mtx_unlock(&device->sqtt_timestamp_mtx); @@ -652,7 +652,7 @@ radv_sqtt_init_bo(struct radv_device *device) if (result != VK_SUCCESS) return false; - device->sqtt.ptr = ws->buffer_map(ws, device->sqtt.bo); + device->sqtt.ptr = radv_buffer_map(ws, device->sqtt.bo); if (!device->sqtt.ptr) return false; diff --git a/src/amd/vulkan/radv_video.c b/src/amd/vulkan/radv_video.c index 812eb7a1c6d..86fb773995f 100644 --- a/src/amd/vulkan/radv_video.c +++ b/src/amd/vulkan/radv_video.c @@ -2727,7 +2727,7 @@ radv_vcn_cmd_reset(struct radv_cmd_buffer *cmd_buffer) ? align(sizeof(rvcn_av1_frame_context_t), 2048) : align(sizeof(rvcn_av1_vcn4_frame_context_t), 2048); - uint8_t *ctxptr = cmd_buffer->device->ws->buffer_map(cmd_buffer->device->ws, vid->ctx.mem->bo); + uint8_t *ctxptr = radv_buffer_map(cmd_buffer->device->ws, vid->ctx.mem->bo); ctxptr += vid->ctx.offset; if (pdev->av1_version == RDECODE_AV1_VER_0) { for (unsigned i = 0; i < 4; ++i) { diff --git a/src/amd/vulkan/si_cmd_buffer.c b/src/amd/vulkan/si_cmd_buffer.c index 3d0abe2f6f5..0de2b2a689a 100644 --- a/src/amd/vulkan/si_cmd_buffer.c +++ b/src/amd/vulkan/si_cmd_buffer.c @@ -645,7 +645,7 @@ radv_create_gfx_config(struct radv_device *device) if (result != VK_SUCCESS) goto fail; - void *map = device->ws->buffer_map(device->ws, device->gfx_init); + void *map = radv_buffer_map(device->ws, device->gfx_init); if (!map) { device->ws->buffer_destroy(device->ws, device->gfx_init); device->gfx_init = NULL; diff --git a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.c b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.c index 56689ac6dc0..6bc8b13bdab 100644 --- a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.c +++ b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.c @@ -272,7 +272,7 @@ radv_amdgpu_cs_get_new_ib(struct radeon_cmdbuf *_cs, uint32_t ib_size) if (result != VK_SUCCESS) return result; - cs->ib_mapped = cs->ws->base.buffer_map(&cs->ws->base, cs->ib_buffer); + cs->ib_mapped = radv_buffer_map(&cs->ws->base, cs->ib_buffer); if (!cs->ib_mapped) { cs->ws->base.buffer_destroy(&cs->ws->base, cs->ib_buffer); return VK_ERROR_OUT_OF_DEVICE_MEMORY; @@ -404,7 +404,7 @@ radv_amdgpu_cs_grow(struct radeon_cmdbuf *_cs, size_t min_size) radv_amdgpu_restore_last_ib(cs); } - cs->ib_mapped = cs->ws->base.buffer_map(&cs->ws->base, cs->ib_buffer); + cs->ib_mapped = radv_buffer_map(&cs->ws->base, cs->ib_buffer); if (!cs->ib_mapped) { cs->ws->base.buffer_destroy(&cs->ws->base, cs->ib_buffer); cs->base.cdw = 0; @@ -748,7 +748,7 @@ radv_amdgpu_cs_execute_secondary(struct radeon_cmdbuf *_parent, struct radeon_cm parent->base.reserved_dw = MAX2(parent->base.reserved_dw, parent->base.cdw + cdw); - mapped = ws->base.buffer_map(&ws->base, ib->bo); + mapped = radv_buffer_map(&ws->base, ib->bo); if (!mapped) { parent->status = VK_ERROR_OUT_OF_DEVICE_MEMORY; return; @@ -1423,7 +1423,7 @@ radv_amdgpu_winsys_cs_dump(struct radeon_cmdbuf *_cs, FILE *file, const int *tra char name[64]; void *mapped; - mapped = ws->base.buffer_map(&ws->base, ib->bo); + mapped = radv_buffer_map(&ws->base, ib->bo); if (!mapped) continue;