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

freedreno: Avoid taking screen lock

Browse source 
Avoid taking screen unlock for batch unref.  Instead just split the
destroy fxn into locked and unlocked variants.  That way we only end
up taking the screen lock on final unref but avoid it in the common
case.

Signed-off-by: Rob Clark <robdclark@chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21274>
This commit is contained in:
Rob Clark 2023-02-11 08:08:24 -08:00 • committed by Marge Bot
parent 35fc1595b3
commit a4b949fe61
2 changed files with 17 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/gallium/drivers/freedreno/freedreno_batch.c
View file

@ -291,7 +291,7 @@ fd_batch_reset(struct fd_batch *batch)
}
void
__fd_batch_destroy(struct fd_batch *batch)
__fd_batch_destroy_locked(struct fd_batch *batch)
{
struct fd_context *ctx = batch->ctx;
@ -319,6 +319,15 @@ __fd_batch_destroy(struct fd_batch *batch)
fd_screen_lock(ctx->screen);
}
void
__fd_batch_destroy(struct fd_batch *batch)
{
struct fd_screen *screen = batch->ctx->screen;
fd_screen_lock(screen);
__fd_batch_destroy_locked(batch);
fd_screen_unlock(screen);
}
void
__fd_batch_describe(char *buf, const struct fd_batch *batch)
{

15
src/gallium/drivers/freedreno/freedreno_batch.h
View file

@ -285,6 +285,7 @@ struct fd_batch_key *fd_batch_key_clone(void *mem_ctx,
/* not called directly: */
void __fd_batch_describe(char *buf, const struct fd_batch *batch) assert_dt;
void __fd_batch_destroy_locked(struct fd_batch *batch);
void __fd_batch_destroy(struct fd_batch *batch);
/*
@ -314,7 +315,7 @@ fd_batch_reference_locked(struct fd_batch **ptr, struct fd_batch *batch)
if (pipe_reference_described(
&(*ptr)->reference, &batch->reference,
(debug_reference_descriptor)__fd_batch_describe))
__fd_batch_destroy(old_batch);
__fd_batch_destroy_locked(old_batch);
*ptr = batch;
}
@ -323,15 +324,13 @@ static inline void
fd_batch_reference(struct fd_batch **ptr, struct fd_batch *batch)
{
struct fd_batch *old_batch = *ptr;
struct fd_context *ctx = old_batch ? old_batch->ctx : NULL;
if (ctx)
fd_screen_lock(ctx->screen);
if (pipe_reference_described(
&(*ptr)->reference, &batch->reference,
(debug_reference_descriptor)__fd_batch_describe))
__fd_batch_destroy(old_batch);
fd_batch_reference_locked(ptr, batch);
if (ctx)
fd_screen_unlock(ctx->screen);
*ptr = batch;
}
static inline void