mirror of
https://src.fedoraproject.org/rpms/mesa.git
synced 2024-11-24 09:32:42 +00:00
96 lines
3.6 KiB
Diff
96 lines
3.6 KiB
Diff
From f308e4cd8c50c9bad725a6d4ccbc574b76912929 Mon Sep 17 00:00:00 2001
|
|
From: Thierry Reding <treding@nvidia.com>
|
|
Date: Wed, 6 Oct 2021 22:42:36 +0200
|
|
Subject: [PATCH 1/6] 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: ef5d42741327 ("st/mesa: add a mechanism to bypass atomics when binding sampler views")
|
|
Tested-by: Karol Herbst <kherbst@redhat.com>
|
|
---
|
|
src/gallium/drivers/tegra/tegra_context.c | 30 ++++++++++++++++++-----
|
|
src/gallium/drivers/tegra/tegra_context.h | 1 +
|
|
2 files changed, 25 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/src/gallium/drivers/tegra/tegra_context.c b/src/gallium/drivers/tegra/tegra_context.c
|
|
index b7dc73bb1be..fe88478a22a 100644
|
|
--- a/src/gallium/drivers/tegra/tegra_context.c
|
|
+++ b/src/gallium/drivers/tegra/tegra_context.c
|
|
@@ -566,10 +566,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,
|
|
@@ -835,15 +847,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;
|
|
}
|
|
@@ -855,6 +871,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);
|
|
}
|
|
diff --git a/src/gallium/drivers/tegra/tegra_context.h b/src/gallium/drivers/tegra/tegra_context.h
|
|
index 4869b0913a6..c2d8eb33ca5 100644
|
|
--- a/src/gallium/drivers/tegra/tegra_context.h
|
|
+++ b/src/gallium/drivers/tegra/tegra_context.h
|
|
@@ -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 *
|
|
--
|
|
2.31.1
|
|
|