fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 13:58:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

freedreno/a6xx: Use idalloc for samp/view seqno's

Browse source 
Samplers and views can be re-created dynamically or long-lasting,
resulting in the possibility of a tex cache collision.  So instead
of a simple counter, use idalloc.

Fixes: a3c73987ab ("freedreno/a6xx: Move rsc seqno out of tex cache key")
Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/9111
Signed-off-by: Rob Clark <robdclark@chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/23470>
This commit is contained in:
Rob Clark 2023-06-06 07:43:35 -07:00 • committed by Marge Bot
parent 3f00f4ac30
commit 7b38799724
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/gallium/drivers/freedreno/a6xx/fd6_context.h
View file

@ -124,7 +124,7 @@ struct fd6_context {
struct hash_table *bcolor_cache;
struct fd_bo *bcolor_mem;
seqno_t tex_seqno;
struct util_idalloc tex_ids;
struct hash_table *tex_cache;
bool tex_cache_needs_invalidate;

11
src/gallium/drivers/freedreno/a6xx/fd6_texture.cc
View file

@ -264,7 +264,7 @@ fd6_sampler_state_create(struct pipe_context *pctx,
return NULL;
so->base = *cso;
so->seqno = seqno_next_u16(&fd6_context(ctx)->tex_seqno);
so->seqno = util_idalloc_alloc(&fd6_context(ctx)->tex_ids);
if (cso->min_mip_filter == PIPE_TEX_MIPFILTER_LINEAR)
miplinear = true;
@ -328,6 +328,8 @@ fd6_sampler_state_delete(struct pipe_context *pctx, void *hwcso)
fd_screen_unlock(ctx->screen);
util_idalloc_free(&fd6_ctx->tex_ids, samp->seqno);
free(hwcso);
}
@ -335,13 +337,14 @@ static struct pipe_sampler_view *
fd6_sampler_view_create(struct pipe_context *pctx, struct pipe_resource *prsc,
const struct pipe_sampler_view *cso)
{
struct fd6_context *fd6_ctx = fd6_context(fd_context(pctx));
struct fd6_pipe_sampler_view *so = CALLOC_STRUCT(fd6_pipe_sampler_view);
if (!so)
return NULL;
so->base = *cso;
so->seqno = seqno_next_u16(&fd6_context(fd_context(pctx))->tex_seqno);
so->seqno = util_idalloc_alloc(&fd6_ctx->tex_ids);
pipe_reference(NULL, &prsc->reference);
so->base.texture = prsc;
so->base.reference.count = 1;
@ -510,6 +513,8 @@ fd6_sampler_view_destroy(struct pipe_context *pctx,
pipe_resource_reference(&view->base.texture, NULL);
util_idalloc_free(&fd6_context(ctx)->tex_ids, view->seqno);
free(view);
}
@ -859,6 +864,7 @@ fd6_texture_init(struct pipe_context *pctx) disable_thread_safety_analysis
0, "bcolor");
fd6_ctx->tex_cache = _mesa_hash_table_create(NULL, tex_key_hash, tex_key_equals);
util_idalloc_init(&fd6_ctx->tex_ids, 256);
}
void
@ -875,6 +881,7 @@ fd6_texture_fini(struct pipe_context *pctx)
fd_screen_unlock(ctx->screen);
util_idalloc_fini(&fd6_ctx->tex_ids);
ralloc_free(fd6_ctx->tex_cache);
fd_bo_del(fd6_ctx->bcolor_mem);
ralloc_free(fd6_ctx->bcolor_cache);