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 370c8f69da6a6dc123012002bdc226d19efe246b..496a422709937d2584eb9c4786fbafee2019cd2f 100644 (file)
--- a/src/gallium/drivers/freedreno/freedreno_context.c
+++ b/src/gallium/drivers/freedreno/freedreno_context.c
@@ -28,11 +28,13 @@
 
 #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 struct fd_ringbuffer *next_rb(struct fd_context *ctx)
@@ -143,6 +145,9 @@ fd_context_destroy(struct pipe_context *pctx)
 
        DBG("");
 
+       fd_prog_fini(pctx);
+       fd_hw_query_fini(pctx);
+
        util_slab_destroy(&ctx->transfer_pool);
 
        util_dynarray_fini(&ctx->draw_patches);
@@ -168,6 +173,8 @@ fd_context_destroy(struct pipe_context *pctx)
                fd_bo_del(pipe->bo);
        }
 
+       fd_device_del(ctx->dev);
+
        FREE(ctx);
 }
 
@@ -198,13 +205,13 @@ 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_rmw_state(ctx);
+       fd_reset_wfi(ctx);
 
        util_dynarray_init(&ctx->draw_patches);
 
@@ -216,6 +223,7 @@ fd_context_init(struct fd_context *ctx, struct pipe_screen *pscreen,
        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)