gallium/radeon: count contexts

We don't wanna use unflushed fences when we have multiple contexts.

Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>

diff --git a/src/gallium/drivers/radeon/r600_pipe_common.c b/src/gallium/drivers/radeon/r600_pipe_common.c
index 7fd3fe08f63a0293c9cdb8743688007c6ba98252..5e9d0b65fc796f00311c102a39056bd87f40a34f 100644 (file)
--- a/src/gallium/drivers/radeon/r600_pipe_common.c
+++ b/src/gallium/drivers/radeon/r600_pipe_common.c
@@ -471,6 +471,7 @@ bool r600_common_context_init(struct r600_common_context *rctx,
                rctx->dma.flush = r600_flush_dma_ring;
        }
 
+       p_atomic_inc(&rscreen->num_contexts);
        return true;
 }
 
@@ -478,6 +479,8 @@ void r600_common_context_cleanup(struct r600_common_context *rctx)
 {
        unsigned i,j;
 
+       p_atomic_dec(&rctx->screen->num_contexts);
+
        /* Release DCC stats. */
        for (i = 0; i < ARRAY_SIZE(rctx->dcc_stats); i++) {
                assert(!rctx->dcc_stats[i].query_active);

diff --git a/src/gallium/drivers/radeon/r600_pipe_common.h b/src/gallium/drivers/radeon/r600_pipe_common.h
index 91e3cb29928a2a83a97eda157e730fc2f6f946e9..ccaaeeb24413063ea34256ef7392488872c8c8d7 100644 (file)
--- a/src/gallium/drivers/radeon/r600_pipe_common.h
+++ b/src/gallium/drivers/radeon/r600_pipe_common.h
@@ -363,6 +363,7 @@ struct r600_common_screen {
        uint64_t                        debug_flags;
        bool                            has_cp_dma;
        bool                            has_streamout;
+       int                             num_contexts;
 
        /* Texture filter settings. */
        int                             force_aniso; /* -1 = disabled */