gk110/ir: add emission for OP_SULDB and OP_SUSTx

[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 5e2e7113b2f88eb9b3fb59de48e8df691eb3c258..c54bb1091f77ec10f8deae6176bb2b5a1981edf3 100644 (file)
--- a/src/gallium/drivers/freedreno/freedreno_context.c
+++ b/src/gallium/drivers/freedreno/freedreno_context.c
@@ -28,11 +28,14 @@
 
 #include "freedreno_context.h"
 #include "freedreno_draw.h"
+#include "freedreno_fence.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)
@@ -91,14 +94,14 @@ void
 fd_context_render(struct pipe_context *pctx)
 {
        struct fd_context *ctx = fd_context(pctx);
-       struct pipe_framebuffer_state *pfb = &ctx->framebuffer;
+       struct fd_resource *rsc, *rsc_tmp;
 
        DBG("needs_flush: %d", ctx->needs_flush);
 
        if (!ctx->needs_flush)
                return;
 
-       fd_gmem_render_tiles(pctx);
+       fd_gmem_render_tiles(ctx);
 
        DBG("%p/%p/%p", ctx->ring->start, ctx->ring->cur, ctx->ring->end);
 
@@ -109,30 +112,62 @@ fd_context_render(struct pipe_context *pctx)
                fd_context_next_rb(pctx);
 
        ctx->needs_flush = false;
-       ctx->cleared = ctx->restore = ctx->resolve = 0;
+       ctx->cleared = ctx->partial_cleared = ctx->restore = ctx->resolve = 0;
        ctx->gmem_reason = 0;
        ctx->num_draws = 0;
 
-       if (pfb->cbufs[0])
-               fd_resource(pfb->cbufs[0]->texture)->dirty = false;
-       if (pfb->zsbuf)
-               fd_resource(pfb->zsbuf->texture)->dirty = false;
+       /* go through all the used resources and clear their reading flag */
+       LIST_FOR_EACH_ENTRY_SAFE(rsc, rsc_tmp, &ctx->used_resources, list) {
+               debug_assert(rsc->status != 0);
+               rsc->status = 0;
+               rsc->pending_ctx = NULL;
+               list_delinit(&rsc->list);
+       }
+
+       assert(LIST_IS_EMPTY(&ctx->used_resources));
 }
 
 static void
 fd_context_flush(struct pipe_context *pctx, struct pipe_fence_handle **fence,
                unsigned flags)
 {
-       DBG("fence=%p", fence);
+       struct fd_ringbuffer *ring = fd_context(pctx)->ring;
+
+       fd_context_render(pctx);
 
-#if 0
        if (fence) {
-               fd_fence_ref(ctx->screen->fence.current,
-                               (struct fd_fence **)fence);
+               fd_screen_fence_ref(pctx->screen, fence, NULL);
+               *fence = fd_fence_create(pctx, fd_ringbuffer_timestamp(ring));
        }
-#endif
+}
 
-       fd_context_render(pctx);
+/**
+ * emit marker string as payload of a no-op packet, which can be
+ * decoded by cffdump.
+ */
+static void
+fd_emit_string_marker(struct pipe_context *pctx, const char *string, int len)
+{
+       struct fd_context *ctx = fd_context(pctx);
+       struct fd_ringbuffer *ring = ctx->ring;
+       const uint32_t *buf = (const void *)string;
+
+       /* max packet size is 0x3fff dwords: */
+       len = MIN2(len, 0x3fff * 4);
+
+       OUT_PKT3(ring, CP_NOP, align(len, 4) / 4);
+       while (len >= 4) {
+               OUT_RING(ring, *buf);
+               buf++;
+               len -= 4;
+       }
+
+       /* copy remainder bytes without reading past end of input string: */
+       if (len > 0) {
+               uint32_t w = 0;
+               memcpy(&w, buf, len);
+               OUT_RING(ring, w);
+       }
 }
 
 void
@@ -143,7 +178,8 @@ fd_context_destroy(struct pipe_context *pctx)
 
        DBG("");
 
-       util_slab_destroy(&ctx->transfer_pool);
+       fd_prog_fini(pctx);
+       fd_hw_query_fini(pctx);
 
        util_dynarray_fini(&ctx->draw_patches);
 
@@ -153,6 +189,8 @@ fd_context_destroy(struct pipe_context *pctx)
        if (ctx->primconvert)
                util_primconvert_destroy(ctx->primconvert);
 
+       util_slab_destroy(&ctx->transfer_pool);
+
        fd_ringmarker_del(ctx->draw_start);
        fd_ringmarker_del(ctx->draw_end);
        fd_ringmarker_del(ctx->binning_start);
@@ -198,6 +236,7 @@ fd_context_init(struct fd_context *ctx, struct pipe_screen *pscreen,
        pctx->screen = pscreen;
        pctx->priv = priv;
        pctx->flush = fd_context_flush;
+       pctx->emit_string_marker = fd_emit_string_marker;
 
        for (i = 0; i < ARRAY_SIZE(ctx->rings); i++) {
                ctx->rings[i] = fd_ringbuffer_new(screen->pipe, 0x100000);
@@ -210,7 +249,7 @@ fd_context_init(struct fd_context *ctx, struct pipe_screen *pscreen,
 
        util_dynarray_init(&ctx->draw_patches);
 
-       util_slab_create(&ctx->transfer_pool, sizeof(struct pipe_transfer),
+       util_slab_create(&ctx->transfer_pool, sizeof(struct fd_transfer),
                        16, UTIL_SLAB_SINGLETHREADED);
 
        fd_draw_init(pctx);
@@ -218,6 +257,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)