freedreno/a3xx: fix depth/stencil gmem restore

[mesa.git] / src / gallium / drivers / freedreno / freedreno_context.c

diff --git a/src/gallium/drivers/freedreno/freedreno_context.c b/src/gallium/drivers/freedreno/freedreno_context.c
index ddb8a0b78fbe10eff46c9853a52b35ed564e7e5e..496a422709937d2584eb9c4786fbafee2019cd2f 100644 (file)
--- a/src/gallium/drivers/freedreno/freedreno_context.c
+++ b/src/gallium/drivers/freedreno/freedreno_context.c
@@ -28,22 +28,20 @@
 
 #include "freedreno_context.h"
 #include "freedreno_draw.h"
+#include "freedreno_program.h"
 #include "freedreno_resource.h"
 #include "freedreno_texture.h"
 #include "freedreno_state.h"
 #include "freedreno_gmem.h"
+#include "freedreno_query.h"
+#include "freedreno_query_hw.h"
 #include "freedreno_util.h"
 
-static void
-fd_context_next_rb(struct pipe_context *pctx)
+static struct fd_ringbuffer *next_rb(struct fd_context *ctx)
 {
-       struct fd_context *ctx = fd_context(pctx);
        struct fd_ringbuffer *ring;
        uint32_t ts;
 
-       fd_ringmarker_del(ctx->draw_start);
-       fd_ringmarker_del(ctx->draw_end);
-
        /* grab next ringbuffer: */
        ring = ctx->rings[(ctx->rings_idx++) % ARRAY_SIZE(ctx->rings)];
 
@@ -56,10 +54,36 @@ fd_context_next_rb(struct pipe_context *pctx)
 
        fd_ringbuffer_reset(ring);
 
+       return ring;
+}
+
+static void
+fd_context_next_rb(struct pipe_context *pctx)
+{
+       struct fd_context *ctx = fd_context(pctx);
+       struct fd_ringbuffer *ring;
+
+       fd_ringmarker_del(ctx->draw_start);
+       fd_ringmarker_del(ctx->draw_end);
+
+       ring = next_rb(ctx);
+
        ctx->draw_start = fd_ringmarker_new(ring);
        ctx->draw_end = fd_ringmarker_new(ring);
 
+       fd_ringbuffer_set_parent(ring, NULL);
        ctx->ring = ring;
+
+       fd_ringmarker_del(ctx->binning_start);
+       fd_ringmarker_del(ctx->binning_end);
+
+       ring = next_rb(ctx);
+
+       ctx->binning_start = fd_ringmarker_new(ring);
+       ctx->binning_end = fd_ringmarker_new(ring);
+
+       fd_ringbuffer_set_parent(ring, ctx->ring);
+       ctx->binning_ring = ring;
 }
 
 /* emit accumulated render cmds, needed for example if render target has
@@ -117,9 +141,17 @@ void
 fd_context_destroy(struct pipe_context *pctx)
 {
        struct fd_context *ctx = fd_context(pctx);
+       unsigned i;
 
        DBG("");
 
+       fd_prog_fini(pctx);
+       fd_hw_query_fini(pctx);
+
+       util_slab_destroy(&ctx->transfer_pool);
+
+       util_dynarray_fini(&ctx->draw_patches);
+
        if (ctx->blitter)
                util_blitter_destroy(ctx->blitter);
 
@@ -128,7 +160,20 @@ fd_context_destroy(struct pipe_context *pctx)
 
        fd_ringmarker_del(ctx->draw_start);
        fd_ringmarker_del(ctx->draw_end);
-       fd_ringbuffer_del(ctx->ring);
+       fd_ringmarker_del(ctx->binning_start);
+       fd_ringmarker_del(ctx->binning_end);
+
+       for (i = 0; i < ARRAY_SIZE(ctx->rings); i++)
+               fd_ringbuffer_del(ctx->rings[i]);
+
+       for (i = 0; i < ARRAY_SIZE(ctx->pipe); i++) {
+               struct fd_vsc_pipe *pipe = &ctx->pipe[i];
+               if (!pipe->bo)
+                       break;
+               fd_bo_del(pipe->bo);
+       }
+
+       fd_device_del(ctx->dev);
 
        FREE(ctx);
 }
@@ -160,20 +205,25 @@ fd_context_init(struct fd_context *ctx, struct pipe_screen *pscreen,
        pctx->flush = fd_context_flush;
 
        for (i = 0; i < ARRAY_SIZE(ctx->rings); i++) {
-               ctx->rings[i] = fd_ringbuffer_new(screen->pipe, 0x400000);
+               ctx->rings[i] = fd_ringbuffer_new(screen->pipe, 0x100000);
                if (!ctx->rings[i])
                        goto fail;
        }
 
        fd_context_next_rb(pctx);
+       fd_reset_wfi(ctx);
+
+       util_dynarray_init(&ctx->draw_patches);
 
        util_slab_create(&ctx->transfer_pool, sizeof(struct pipe_transfer),
                        16, UTIL_SLAB_SINGLETHREADED);
 
        fd_draw_init(pctx);
        fd_resource_context_init(pctx);
+       fd_query_context_init(pctx);
        fd_texture_init(pctx);
        fd_state_init(pctx);
+       fd_hw_query_init(pctx);
 
        ctx->blitter = util_blitter_create(pctx);
        if (!ctx->blitter)