KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

radv: Rename submit2->submit. 

Cleanup after the big switcheroo.

Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13974>
This commit is contained in:
Bas Nieuwenhuizen 2021-11-28 23:06:48 +01:00 committed by Marge Bot
parent 84ec547f69
commit 8c4c63a6ed
3 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/amd/vulkan/radv_device.c
View File

@ -81,7 +81,7 @@ typedef void *drmDevicePtr;
#define CLOCK_MONOTONIC_RAW CLOCK_MONOTONIC_FAST #define CLOCK_MONOTONIC_RAW CLOCK_MONOTONIC_FAST
#endif #endif
static VkResult radv_queue_submit2(struct vk_queue *vqueue, struct vk_queue_submit *submission); static VkResult radv_queue_submit(struct vk_queue *vqueue, struct vk_queue_submit *submission);
uint64_t uint64_t
radv_get_current_time(void) radv_get_current_time(void)
@ -2647,7 +2647,7 @@ radv_queue_init(struct radv_device *device, struct radv_queue *queue,
if (result != VK_SUCCESS) if (result != VK_SUCCESS)
return result; return result;
queue->vk.driver_submit = radv_queue_submit2; queue->vk.driver_submit = radv_queue_submit;
return VK_SUCCESS; return VK_SUCCESS;
} }
@ -4318,7 +4318,7 @@ struct radv_deferred_queue_submission {
}; };
static VkResult static VkResult
radv_queue_submit2(struct vk_queue *vqueue, struct vk_queue_submit *submission) radv_queue_submit(struct vk_queue *vqueue, struct vk_queue_submit *submission)
{ {
struct radv_queue *queue = (struct radv_queue *)vqueue; struct radv_queue *queue = (struct radv_queue *)vqueue;
struct radeon_winsys_ctx *ctx = queue->hw_ctx; struct radeon_winsys_ctx *ctx = queue->hw_ctx;
@ -4359,10 +4359,10 @@ radv_queue_submit2(struct vk_queue *vqueue, struct vk_queue_submit *submission)
return VK_SUCCESS; return VK_SUCCESS;
if (!submission->command_buffer_count) { if (!submission->command_buffer_count) {
result = queue->device->ws->cs_submit2(ctx, queue->vk.queue_family_index, result = queue->device->ws->cs_submit(ctx, queue->vk.queue_family_index,
queue->vk.index_in_family, NULL, 0, NULL, NULL, queue->vk.index_in_family, NULL, 0, NULL, NULL,
submission->wait_count, submission->waits, submission->wait_count, submission->waits,
submission->signal_count, submission->signals, false); submission->signal_count, submission->signals, false);
if (result != VK_SUCCESS) if (result != VK_SUCCESS)
goto fail; goto fail;
} else { } else {
@ -4390,7 +4390,7 @@ radv_queue_submit2(struct vk_queue *vqueue, struct vk_queue_submit *submission)
if (queue->device->trace_bo) if (queue->device->trace_bo)
*queue->device->trace_id_ptr = 0; *queue->device->trace_id_ptr = 0;
result = queue->device->ws->cs_submit2( result = queue->device->ws->cs_submit(
ctx, queue->vk.queue_family_index, queue->vk.index_in_family, cs_array + j, advance, ctx, queue->vk.queue_family_index, queue->vk.index_in_family, cs_array + j, advance,
initial_preamble, continue_preamble_cs, j == 0 ? submission->wait_count : 0, initial_preamble, continue_preamble_cs, j == 0 ? submission->wait_count : 0,
submission->waits, last_submit ? submission->signal_count : 0, submission->signals, submission->waits, last_submit ? submission->signal_count : 0, submission->signals,
@ -4432,8 +4432,8 @@ radv_queue_internal_submit(struct radv_queue *queue, struct radeon_cmdbuf *cs)
struct radeon_winsys_ctx *ctx = queue->hw_ctx; struct radeon_winsys_ctx *ctx = queue->hw_ctx;
VkResult result = VkResult result =
queue->device->ws->cs_submit2(ctx, queue->vk.queue_family_index, queue->vk.index_in_family, queue->device->ws->cs_submit(ctx, queue->vk.queue_family_index, queue->vk.index_in_family,
&cs, 1, NULL, NULL, 0, NULL, 0, NULL, false); &cs, 1, NULL, NULL, 0, NULL, 0, NULL, false);
if (result != VK_SUCCESS) if (result != VK_SUCCESS)
return false; return false;

12
src/amd/vulkan/radv_radeon_winsys.h
View File

@ -262,12 +262,12 @@ struct radeon_winsys {
void (*cs_grow)(struct radeon_cmdbuf *cs, size_t min_size); void (*cs_grow)(struct radeon_cmdbuf *cs, size_t min_size);
VkResult (*cs_submit2)(struct radeon_winsys_ctx *ctx, enum ring_type ring_type, int queue_index, VkResult (*cs_submit)(struct radeon_winsys_ctx *ctx, enum ring_type ring_type, int queue_index,
struct radeon_cmdbuf **cs_array, unsigned cs_count, struct radeon_cmdbuf **cs_array, unsigned cs_count,
struct radeon_cmdbuf *initial_preamble_cs, struct radeon_cmdbuf *initial_preamble_cs,
struct radeon_cmdbuf *continue_preamble_cs, uint32_t wait_count, struct radeon_cmdbuf *continue_preamble_cs, uint32_t wait_count,
const struct vk_sync_wait *waits, uint32_t signal_count, const struct vk_sync_wait *waits, uint32_t signal_count,
const struct vk_sync_signal *signals, bool can_patch); const struct vk_sync_signal *signals, bool can_patch);
void (*cs_add_buffer)(struct radeon_cmdbuf *cs, struct radeon_winsys_bo *bo); void (*cs_add_buffer)(struct radeon_cmdbuf *cs, struct radeon_winsys_bo *bo);

30
src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.c
View File

@ -1264,11 +1264,11 @@ radv_amdgpu_cs_submit_zero(struct radv_amdgpu_ctx *ctx, enum ring_type ring_type
} }
static VkResult static VkResult
radv_amdgpu_winsys_cs_submit(struct radeon_winsys_ctx *_ctx, enum ring_type ring_type, radv_amdgpu_winsys_cs_submit_internal(struct radeon_winsys_ctx *_ctx, enum ring_type ring_type,
int queue_idx, struct radeon_cmdbuf **cs_array, unsigned cs_count, int queue_idx, struct radeon_cmdbuf **cs_array,
struct radeon_cmdbuf *initial_preamble_cs, unsigned cs_count, struct radeon_cmdbuf *initial_preamble_cs,
struct radeon_cmdbuf *continue_preamble_cs, struct radeon_cmdbuf *continue_preamble_cs,
struct radv_winsys_sem_info *sem_info, bool can_patch) struct radv_winsys_sem_info *sem_info, bool can_patch)
{ {
struct radv_amdgpu_ctx *ctx = radv_amdgpu_ctx(_ctx); struct radv_amdgpu_ctx *ctx = radv_amdgpu_ctx(_ctx);
VkResult result; VkResult result;
@ -1291,12 +1291,12 @@ radv_amdgpu_winsys_cs_submit(struct radeon_winsys_ctx *_ctx, enum ring_type ring
} }
static VkResult static VkResult
radv_amdgpu_winsys_cs_submit2(struct radeon_winsys_ctx *_ctx, enum ring_type ring_type, radv_amdgpu_winsys_cs_submit(struct radeon_winsys_ctx *_ctx, enum ring_type ring_type,
int queue_idx, struct radeon_cmdbuf **cs_array, unsigned cs_count, int queue_idx, struct radeon_cmdbuf **cs_array, unsigned cs_count,
struct radeon_cmdbuf *initial_preamble_cs, struct radeon_cmdbuf *initial_preamble_cs,
struct radeon_cmdbuf *continue_preamble_cs, uint32_t wait_count, struct radeon_cmdbuf *continue_preamble_cs, uint32_t wait_count,
const struct vk_sync_wait *waits, uint32_t signal_count, const struct vk_sync_wait *waits, uint32_t signal_count,
const struct vk_sync_signal *signals, bool can_patch) const struct vk_sync_signal *signals, bool can_patch)
{ {
struct radv_amdgpu_winsys *ws = radv_amdgpu_ctx(_ctx)->ws; struct radv_amdgpu_winsys *ws = radv_amdgpu_ctx(_ctx)->ws;
struct radv_winsys_sem_info sem_info; struct radv_winsys_sem_info sem_info;
@ -1351,9 +1351,9 @@ radv_amdgpu_winsys_cs_submit2(struct radeon_winsys_ctx *_ctx, enum ring_type rin
sem_info.signal.syncobj_count = signal_idx - sem_info.signal.timeline_syncobj_count; sem_info.signal.syncobj_count = signal_idx - sem_info.signal.timeline_syncobj_count;
sem_info.cs_emit_signal = true; sem_info.cs_emit_signal = true;
result = result = radv_amdgpu_winsys_cs_submit_internal(_ctx, ring_type, queue_idx, cs_array, cs_count,
radv_amdgpu_winsys_cs_submit(_ctx, ring_type, queue_idx, cs_array, cs_count, initial_preamble_cs, continue_preamble_cs,
initial_preamble_cs, continue_preamble_cs, &sem_info, can_patch); &sem_info, can_patch);
out: out:
STACK_ARRAY_FINISH(wait_points); STACK_ARRAY_FINISH(wait_points);
@ -1886,7 +1886,7 @@ radv_amdgpu_cs_init_functions(struct radv_amdgpu_winsys *ws)
ws->base.cs_reset = radv_amdgpu_cs_reset; ws->base.cs_reset = radv_amdgpu_cs_reset;
ws->base.cs_add_buffer = radv_amdgpu_cs_add_buffer; ws->base.cs_add_buffer = radv_amdgpu_cs_add_buffer;
ws->base.cs_execute_secondary = radv_amdgpu_cs_execute_secondary; ws->base.cs_execute_secondary = radv_amdgpu_cs_execute_secondary;
ws->base.cs_submit2 = radv_amdgpu_winsys_cs_submit2; ws->base.cs_submit = radv_amdgpu_winsys_cs_submit;
ws->base.cs_dump = radv_amdgpu_winsys_cs_dump; ws->base.cs_dump = radv_amdgpu_winsys_cs_dump;
ws->base.create_syncobj = radv_amdgpu_create_syncobj; ws->base.create_syncobj = radv_amdgpu_create_syncobj;
ws->base.destroy_syncobj = radv_amdgpu_destroy_syncobj; ws->base.destroy_syncobj = radv_amdgpu_destroy_syncobj;