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

tegra: Use private reference count for sampler views 

With the recent addition of the shortcuts aiming to avoid atomic
operations, the reference count on sampler views can become unbalanced
in the Tegra driver since they are wrapped and then proxied to the
Nouveau driver.

Fix this by keeping a private reference count.

Fixes: ef5d427413 ("st/mesa: add a mechanism to bypass atomics when binding sampler views")
Reviewed-by: Karol Herbst <kherbst@redhat.com>
Tested-by: Karol Herbst <kherbst@redhat.com>
This commit is contained in:
Thierry Reding 2021-10-06 22:42:36 +02:00
parent 4e252cbc7d
commit e8ce0a3357
2 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/gallium/drivers/tegra/tegra_context.c
View File

@ -567,10 +567,22 @@ tegra_set_sampler_views(struct pipe_context *pcontext, unsigned shader,
{
struct pipe_sampler_view *views[PIPE_MAX_SHADER_SAMPLER_VIEWS];
struct tegra_context *context = to_tegra_context(pcontext);
struct tegra_sampler_view *view;
unsigned i;
for (i = 0; i < num_views; i++)
for (i = 0; i < num_views; i++) {
/* adjust private reference count */
view = to_tegra_sampler_view(pviews[i]);
if (view) {
view->refcount--;
if (!view->refcount) {
view->refcount = 100000000;
p_atomic_add(&view->gpu->reference.count, view->refcount);
}
}
views[i] = tegra_sampler_view_unwrap(pviews[i]);
}
context->gpu->set_sampler_views(context->gpu, shader, start_slot,
num_views, unbind_num_trailing_slots,
@ -836,15 +848,19 @@ tegra_create_sampler_view(struct pipe_context *pcontext,
if (!view)
return NULL;
view->gpu = context->gpu->create_sampler_view(context->gpu, resource->gpu,
template);
memcpy(&view->base, view->gpu, sizeof(*view->gpu));
view->base = *template;
view->base.context = pcontext;
/* overwrite to prevent reference from being released */
view->base.texture = NULL;
pipe_reference_init(&view->base.reference, 1);
pipe_resource_reference(&view->base.texture, presource);
view->base.context = pcontext;
view->gpu = context->gpu->create_sampler_view(context->gpu, resource->gpu,
template);
/* use private reference count */
view->gpu->reference.count += 100000000;
view->refcount = 100000000;
return &view->base;
}
@ -856,6 +872,8 @@ tegra_sampler_view_destroy(struct pipe_context *pcontext,
struct tegra_sampler_view *view = to_tegra_sampler_view(pview);
pipe_resource_reference(&view->base.texture, NULL);
/* adjust private reference count */
p_atomic_add(&view->gpu->reference.count, -view->refcount);
pipe_sampler_view_reference(&view->gpu, NULL);
free(view);
}

1
src/gallium/drivers/tegra/tegra_context.h
View File

@ -47,6 +47,7 @@ tegra_screen_context_create(struct pipe_screen *pscreen, void *priv,
struct tegra_sampler_view {
struct pipe_sampler_view base;
struct pipe_sampler_view *gpu;
unsigned int refcount;
};
static inline struct tegra_sampler_view *