radv/amdgpu: Pass correct struct type instead of repeating the cast.
Signed-off-by: Timur Kristóf <timur.kristof@gmail.com> Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16361>
This commit is contained in:
parent
da2ab1d8a2
commit
03b3344a7c
|
@ -869,12 +869,11 @@ radv_assign_last_submit(struct radv_amdgpu_ctx *ctx, struct radv_amdgpu_cs_reque
|
||||||
}
|
}
|
||||||
|
|
||||||
static VkResult
|
static VkResult
|
||||||
radv_amdgpu_winsys_cs_submit_chained(struct radeon_winsys_ctx *_ctx, int queue_idx,
|
radv_amdgpu_winsys_cs_submit_chained(struct radv_amdgpu_ctx *ctx, int queue_idx,
|
||||||
struct radv_winsys_sem_info *sem_info,
|
struct radv_winsys_sem_info *sem_info,
|
||||||
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 radv_amdgpu_ctx *ctx = radv_amdgpu_ctx(_ctx);
|
|
||||||
struct radv_amdgpu_cs *cs0 = radv_amdgpu_cs(cs_array[0]);
|
struct radv_amdgpu_cs *cs0 = radv_amdgpu_cs(cs_array[0]);
|
||||||
struct radv_amdgpu_winsys *aws = cs0->ws;
|
struct radv_amdgpu_winsys *aws = cs0->ws;
|
||||||
struct drm_amdgpu_bo_list_entry *handles = NULL;
|
struct drm_amdgpu_bo_list_entry *handles = NULL;
|
||||||
|
@ -953,12 +952,11 @@ fail:
|
||||||
}
|
}
|
||||||
|
|
||||||
static VkResult
|
static VkResult
|
||||||
radv_amdgpu_winsys_cs_submit_fallback(struct radeon_winsys_ctx *_ctx, int queue_idx,
|
radv_amdgpu_winsys_cs_submit_fallback(struct radv_amdgpu_ctx *ctx, int queue_idx,
|
||||||
struct radv_winsys_sem_info *sem_info,
|
struct radv_winsys_sem_info *sem_info,
|
||||||
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 radv_amdgpu_ctx *ctx = radv_amdgpu_ctx(_ctx);
|
|
||||||
struct drm_amdgpu_bo_list_entry *handles = NULL;
|
struct drm_amdgpu_bo_list_entry *handles = NULL;
|
||||||
struct radv_amdgpu_cs_request request;
|
struct radv_amdgpu_cs_request request;
|
||||||
struct amdgpu_cs_ib_info *ibs;
|
struct amdgpu_cs_ib_info *ibs;
|
||||||
|
@ -1036,13 +1034,12 @@ fail:
|
||||||
}
|
}
|
||||||
|
|
||||||
static VkResult
|
static VkResult
|
||||||
radv_amdgpu_winsys_cs_submit_sysmem(struct radeon_winsys_ctx *_ctx, int queue_idx,
|
radv_amdgpu_winsys_cs_submit_sysmem(struct radv_amdgpu_ctx *ctx, int queue_idx,
|
||||||
struct radv_winsys_sem_info *sem_info,
|
struct radv_winsys_sem_info *sem_info,
|
||||||
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)
|
struct radeon_cmdbuf *continue_preamble_cs)
|
||||||
{
|
{
|
||||||
struct radv_amdgpu_ctx *ctx = radv_amdgpu_ctx(_ctx);
|
|
||||||
struct radv_amdgpu_cs *cs0 = radv_amdgpu_cs(cs_array[0]);
|
struct radv_amdgpu_cs *cs0 = radv_amdgpu_cs(cs_array[0]);
|
||||||
struct radeon_winsys *ws = (struct radeon_winsys *)cs0->ws;
|
struct radeon_winsys *ws = (struct radeon_winsys *)cs0->ws;
|
||||||
struct radv_amdgpu_winsys *aws = cs0->ws;
|
struct radv_amdgpu_winsys *aws = cs0->ws;
|
||||||
|
@ -1314,11 +1311,10 @@ radv_amdgpu_cs_submit_zero(struct radv_amdgpu_ctx *ctx, enum amd_ip_type ip_type
|
||||||
}
|
}
|
||||||
|
|
||||||
static VkResult
|
static VkResult
|
||||||
radv_amdgpu_winsys_cs_submit_internal(struct radeon_winsys_ctx *_ctx,
|
radv_amdgpu_winsys_cs_submit_internal(struct radv_amdgpu_ctx *ctx,
|
||||||
const struct radv_winsys_submit_info *submit,
|
const struct radv_winsys_submit_info *submit,
|
||||||
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);
|
|
||||||
VkResult result;
|
VkResult result;
|
||||||
|
|
||||||
assert(sem_info);
|
assert(sem_info);
|
||||||
|
@ -1326,16 +1322,16 @@ radv_amdgpu_winsys_cs_submit_internal(struct radeon_winsys_ctx *_ctx,
|
||||||
result = radv_amdgpu_cs_submit_zero(ctx, submit->ip_type, submit->queue_index, sem_info);
|
result = radv_amdgpu_cs_submit_zero(ctx, submit->ip_type, submit->queue_index, sem_info);
|
||||||
} else if (!ring_can_use_ib_bos(ctx->ws, submit->ip_type)) {
|
} else if (!ring_can_use_ib_bos(ctx->ws, submit->ip_type)) {
|
||||||
result = radv_amdgpu_winsys_cs_submit_sysmem(
|
result = radv_amdgpu_winsys_cs_submit_sysmem(
|
||||||
_ctx, submit->queue_index, sem_info, submit->cs_array, submit->cs_count,
|
ctx, submit->queue_index, sem_info, submit->cs_array, submit->cs_count,
|
||||||
submit->initial_preamble_cs, submit->continue_preamble_cs);
|
submit->initial_preamble_cs, submit->continue_preamble_cs);
|
||||||
} else if (can_patch) {
|
} else if (can_patch) {
|
||||||
result =
|
result =
|
||||||
radv_amdgpu_winsys_cs_submit_chained(_ctx, submit->queue_index, sem_info, submit->cs_array,
|
radv_amdgpu_winsys_cs_submit_chained(ctx, submit->queue_index, sem_info, submit->cs_array,
|
||||||
submit->cs_count, submit->initial_preamble_cs);
|
submit->cs_count, submit->initial_preamble_cs);
|
||||||
} else {
|
} else {
|
||||||
result = radv_amdgpu_winsys_cs_submit_fallback(_ctx, submit->queue_index, sem_info,
|
result =
|
||||||
submit->cs_array, submit->cs_count,
|
radv_amdgpu_winsys_cs_submit_fallback(ctx, submit->queue_index, sem_info, submit->cs_array,
|
||||||
submit->initial_preamble_cs);
|
submit->cs_count, submit->initial_preamble_cs);
|
||||||
}
|
}
|
||||||
|
|
||||||
return result;
|
return result;
|
||||||
|
@ -1347,7 +1343,8 @@ radv_amdgpu_winsys_cs_submit(struct radeon_winsys_ctx *_ctx, uint32_t submit_cou
|
||||||
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_ctx *ctx = radv_amdgpu_ctx(_ctx);
|
||||||
|
struct radv_amdgpu_winsys *ws = ctx->ws;
|
||||||
VkResult result;
|
VkResult result;
|
||||||
unsigned wait_idx = 0, signal_idx = 0;
|
unsigned wait_idx = 0, signal_idx = 0;
|
||||||
|
|
||||||
|
@ -1412,7 +1409,7 @@ radv_amdgpu_winsys_cs_submit(struct radeon_winsys_ctx *_ctx, uint32_t submit_cou
|
||||||
assert(submit_count);
|
assert(submit_count);
|
||||||
|
|
||||||
if (submit_count == 1) {
|
if (submit_count == 1) {
|
||||||
result = radv_amdgpu_winsys_cs_submit_internal(_ctx, &submits[0], &sem_info, can_patch);
|
result = radv_amdgpu_winsys_cs_submit_internal(ctx, &submits[0], &sem_info, can_patch);
|
||||||
} else {
|
} else {
|
||||||
unreachable("submitting to multiple queues at the same time is not supported yet.");
|
unreachable("submitting to multiple queues at the same time is not supported yet.");
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue