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

radv/amdgpu: Add postambles to fallback submit.

Browse Source 
Some new features, such as perf counters and gang submit use
postambles. Implement these properly.

Signed-off-by: Timur Kristóf <timur.kristof@gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22354>
This commit is contained in:
Timur Kristóf
2023-04-04 23:20:14 +02:00
committed by Marge Bot
parent 103ebe96c0
commit e4dd6a8eb3
2 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/amd/vulkan/radv_radeon_winsys.h
+2
View File
@@ -203,9 +203,11 @@ struct radv_winsys_submit_info {
unsigned cs_count;
unsigned initial_preamble_count;
unsigned continue_preamble_count;
unsigned postamble_count;
struct radeon_cmdbuf **cs_array;
struct radeon_cmdbuf **initial_preamble_cs;
struct radeon_cmdbuf **continue_preamble_cs;
struct radeon_cmdbuf **postamble_cs;
bool uses_shadow_regs;
};
src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.c
+18 -11
View File
@@ -940,13 +940,12 @@ radv_assign_last_submit(struct radv_amdgpu_ctx *ctx, struct radv_amdgpu_cs_reque
}
static VkResult
radv_amdgpu_winsys_cs_submit_fallback(struct radv_amdgpu_ctx *ctx, int queue_idx,
struct radv_winsys_sem_info *sem_info,
struct radeon_cmdbuf **cs_array, unsigned cs_count,
struct radeon_cmdbuf **initial_preamble_cs,
unsigned initial_preamble_count,
struct radeon_cmdbuf **continue_preamble_cs,
unsigned continue_preamble_count, bool uses_shadow_regs)
radv_amdgpu_winsys_cs_submit_fallback(
struct radv_amdgpu_ctx *ctx, int queue_idx, struct radv_winsys_sem_info *sem_info,
struct radeon_cmdbuf **cs_array, unsigned cs_count, struct radeon_cmdbuf **initial_preamble_cs,
unsigned initial_preamble_count, struct radeon_cmdbuf **continue_preamble_cs,
unsigned continue_preamble_count, struct radeon_cmdbuf **postamble_cs, unsigned postamble_count,
bool uses_shadow_regs)
{
VkResult result;
@@ -954,7 +953,7 @@ radv_amdgpu_winsys_cs_submit_fallback(struct radv_amdgpu_ctx *ctx, int queue_idx
struct radv_amdgpu_cs *last_cs = radv_amdgpu_cs(cs_array[cs_count - 1]);
struct radv_amdgpu_winsys *ws = last_cs->ws;
/* Get the BO list. Assume continue preambles don't need more. */
/* Get the BO list. Assume continue preambles and postambles don't need more. */
struct drm_amdgpu_bo_list_entry *handles = NULL;
unsigned num_handles = 0;
u_rwlock_rdlock(&ws->global_bo_list.lock);
@@ -976,12 +975,13 @@ radv_amdgpu_winsys_cs_submit_fallback(struct radv_amdgpu_ctx *ctx, int queue_idx
};
assert(cs_count);
assert(MAX2(initial_preamble_count, continue_preamble_count) < RADV_MAX_IBS_PER_SUBMIT);
assert(MAX2(initial_preamble_count, continue_preamble_count) + postamble_count <
RADV_MAX_IBS_PER_SUBMIT);
for (unsigned cs_idx = 0; cs_idx < cs_count;) {
struct radeon_cmdbuf **preambles = cs_idx ? continue_preamble_cs : initial_preamble_cs;
const unsigned preamble_count = cs_idx ? continue_preamble_count : initial_preamble_count;
const unsigned ib_per_submit = RADV_MAX_IBS_PER_SUBMIT - preamble_count;
const unsigned ib_per_submit = RADV_MAX_IBS_PER_SUBMIT - preamble_count - postamble_count;
unsigned num_submitted_ibs = 0;
/* Copy preambles to the submission. */
@@ -1012,6 +1012,12 @@ radv_amdgpu_winsys_cs_submit_fallback(struct radv_amdgpu_ctx *ctx, int queue_idx
assert(num_submitted_ibs > preamble_count);
/* Copy postambles to the submission. */
for (unsigned i = 0; i < postamble_count; ++i) {
struct radv_amdgpu_cs *cs = radv_amdgpu_cs(postamble_cs[i]);
ibs[num_submitted_ibs++] = cs->ib;
}
/* Submit the CS. */
request.number_of_ibs = num_submitted_ibs;
result = radv_amdgpu_cs_submit(ctx, &request, sem_info);
@@ -1337,7 +1343,8 @@ radv_amdgpu_winsys_cs_submit_internal(struct radv_amdgpu_ctx *ctx,
result = radv_amdgpu_winsys_cs_submit_fallback(
ctx, submit->queue_index, sem_info, submit->cs_array, submit->cs_count,
submit->initial_preamble_cs, submit->initial_preamble_count, submit->continue_preamble_cs,
submit->continue_preamble_count, submit->uses_shadow_regs);
submit->continue_preamble_count, submit->postamble_cs, submit->postamble_count,
submit->uses_shadow_regs);
}
return result;