fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-23 21:20:21 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

winsys/amdgpu: call userq init and destroy functions

Browse source 
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29010>
This commit is contained in:
Yogesh Mohan Marimuthu 2024-02-09 13:49:38 +05:30 • committed by Marge Bot
parent 093cf74b26
commit 086741b3ae
3 changed files with 39 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
src/gallium/winsys/amdgpu/drm/amdgpu_cs.cpp
View file

@ -882,6 +882,25 @@ static bool ip_uses_alt_fence(enum amd_ip_type ip_type)
ip_type == AMD_IP_VCN_JPEG;
}
static void amdgpu_cs_destroy(struct radeon_cmdbuf *rcs)
{
struct amdgpu_cs *cs = amdgpu_cs(rcs);
if (!cs)
return;
amdgpu_cs_sync_flush(rcs);
util_queue_fence_destroy(&cs->flush_completed);
p_atomic_dec(&cs->aws->num_cs);
radeon_bo_reference(&cs->aws->dummy_sws.base, &cs->preamble_ib_bo, NULL);
radeon_bo_reference(&cs->aws->dummy_sws.base, &cs->main_ib.big_buffer, NULL);
FREE(rcs->prev);
amdgpu_destroy_cs_context(cs->aws, &cs->csc1);
amdgpu_destroy_cs_context(cs->aws, &cs->csc2);
amdgpu_fence_reference(&cs->next_fence, NULL);
FREE(cs);
}
static bool
amdgpu_cs_create(struct radeon_cmdbuf *rcs,
struct radeon_winsys_ctx *rwctx,
@ -958,18 +977,22 @@ amdgpu_cs_create(struct radeon_cmdbuf *rcs,
cs->csc1.aws = ctx->aws;
cs->csc2.aws = ctx->aws;
rcs->priv = cs;
p_atomic_inc(&ctx->aws->num_cs);
if (!amdgpu_get_new_ib(ctx->aws, rcs, &cs->main_ib, cs)) {
amdgpu_destroy_cs_context(ctx->aws, &cs->csc2);
amdgpu_destroy_cs_context(ctx->aws, &cs->csc1);
FREE(cs);
rcs->priv = NULL;
return false;
if (!amdgpu_get_new_ib(ctx->aws, rcs, &cs->main_ib, cs))
goto fail;
/* Currently only gfx, compute and sdma queues supports user queue. */
if (cs->aws->info.use_userq && ip_type <= AMD_IP_SDMA) {
if (!amdgpu_userq_init(cs->aws, &cs->aws->queues[cs->queue_index].userq, ip_type))
goto fail;
}
p_atomic_inc(&ctx->aws->num_cs);
rcs->priv = cs;
return true;
fail:
amdgpu_cs_destroy(rcs);
return false;
}
static bool
@ -1847,25 +1870,6 @@ static int amdgpu_cs_flush(struct radeon_cmdbuf *rcs,
return error_code;
}
static void amdgpu_cs_destroy(struct radeon_cmdbuf *rcs)
{
struct amdgpu_cs *cs = amdgpu_cs(rcs);
if (!cs)
return;
amdgpu_cs_sync_flush(rcs);
util_queue_fence_destroy(&cs->flush_completed);
p_atomic_dec(&cs->aws->num_cs);
radeon_bo_reference(&cs->aws->dummy_sws.base, &cs->preamble_ib_bo, NULL);
radeon_bo_reference(&cs->aws->dummy_sws.base, &cs->main_ib.big_buffer, NULL);
FREE(rcs->prev);
amdgpu_destroy_cs_context(cs->aws, &cs->csc1);
amdgpu_destroy_cs_context(cs->aws, &cs->csc2);
amdgpu_fence_reference(&cs->next_fence, NULL);
FREE(cs);
}
static bool amdgpu_bo_is_referenced(struct radeon_cmdbuf *rcs,
struct pb_buffer_lean *_buf,
unsigned usage)

6
src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c
View file

@ -62,6 +62,9 @@ static bool do_winsys_init(struct amdgpu_winsys *aws,
driQueryOptionb(config->options, "radeonsi_zerovram");
aws->info.use_userq = debug_get_bool_option("AMD_USERQ", false);
for (unsigned i = 0; i < ARRAY_SIZE(aws->queues); i++)
simple_mtx_init(&aws->queues[i].userq.lock, mtx_plain);
return true;
fail:
@ -79,6 +82,9 @@ static void do_winsys_deinit(struct amdgpu_winsys *aws)
for (unsigned j = 0; j < ARRAY_SIZE(aws->queues[i].fences); j++)
amdgpu_fence_reference(&aws->queues[i].fences[j], NULL);
amdgpu_userq_deinit(aws, &aws->queues[i].userq);
simple_mtx_destroy(&aws->queues[i].userq.lock);
amdgpu_ctx_reference(&aws->queues[i].last_ctx, NULL);
}

2
src/gallium/winsys/amdgpu/drm/amdgpu_winsys.h
View file

@ -167,6 +167,8 @@ struct amdgpu_queue {
/* The last context using this queue. */
struct amdgpu_ctx *last_ctx;
struct amdgpu_userq userq;
};
/* This is part of every BO. */