freedreno: push resource tracking down into batch
[mesa.git] / src / gallium / drivers / freedreno / freedreno_context.c
index c959ccfcc898aa79756f3dc588dae9dbdaaa3018..3614370bf333a2fa59bac814ac3fe3f66bc16257 100644 (file)
 
 #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 void
-fd_context_next_rb(struct pipe_context *pctx)
-{
-       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)];
-
-       /* wait for new rb to be idle: */
-       ts = fd_ringbuffer_timestamp(ring);
-       if (ts) {
-               DBG("wait: %u", ts);
-               fd_pipe_wait(ctx->screen->pipe, ts);
-       }
-
-       fd_ringbuffer_reset(ring);
-
-       ctx->draw_start = fd_ringmarker_new(ring);
-       ctx->draw_end = fd_ringmarker_new(ring);
-
-       ctx->ring = ring;
-}
-
 /* emit accumulated render cmds, needed for example if render target has
  * changed, or for flush()
  */
@@ -69,48 +45,68 @@ void
 fd_context_render(struct pipe_context *pctx)
 {
        struct fd_context *ctx = fd_context(pctx);
-       struct pipe_framebuffer_state *pfb = &ctx->framebuffer;
 
        DBG("needs_flush: %d", ctx->needs_flush);
 
        if (!ctx->needs_flush)
                return;
 
-       fd_gmem_render_tiles(pctx);
-
-       DBG("%p/%p/%p", ctx->ring->start, ctx->ring->cur, ctx->ring->end);
+       fd_batch_flush(ctx->batch);
 
-       /* if size in dwords is more than half the buffer size, then wait and
-        * wrap around:
-        */
-       if ((ctx->ring->cur - ctx->ring->start) > ctx->ring->size/8)
-               fd_context_next_rb(pctx);
+       fd_batch_reference(&ctx->batch, NULL);
+       ctx->batch = fd_batch_create(ctx);
 
        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;
 }
 
 static void
 fd_context_flush(struct pipe_context *pctx, struct pipe_fence_handle **fence,
                unsigned flags)
 {
-       DBG("fence=%p", fence);
+       struct fd_batch *batch = NULL;
+
+       fd_batch_reference(&batch, fd_context(pctx)->batch);
+
+       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(batch->gmem));
        }
-#endif
 
-       fd_context_render(pctx);
+       fd_batch_reference(&batch, NULL);
+}
+
+/**
+ * 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->batch->draw;
+       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
@@ -121,15 +117,20 @@ fd_context_destroy(struct pipe_context *pctx)
 
        DBG("");
 
+       fd_prog_fini(pctx);
+       fd_hw_query_fini(pctx);
+
+       util_dynarray_fini(&ctx->draw_patches);
+
        if (ctx->blitter)
                util_blitter_destroy(ctx->blitter);
 
        if (ctx->primconvert)
                util_primconvert_destroy(ctx->primconvert);
 
-       fd_ringmarker_del(ctx->draw_start);
-       fd_ringmarker_del(ctx->draw_end);
-       fd_ringbuffer_del(ctx->ring);
+       util_slab_destroy(&ctx->transfer_pool);
+
+       fd_batch_reference(&ctx->batch, NULL);  /* unref current batch */
 
        for (i = 0; i < ARRAY_SIZE(ctx->pipe); i++) {
                struct fd_vsc_pipe *pipe = &ctx->pipe[i];
@@ -138,9 +139,23 @@ fd_context_destroy(struct pipe_context *pctx)
                fd_bo_del(pipe->bo);
        }
 
+       fd_device_del(ctx->dev);
+
        FREE(ctx);
 }
 
+static void
+fd_set_debug_callback(struct pipe_context *pctx,
+               const struct pipe_debug_callback *cb)
+{
+       struct fd_context *ctx = fd_context(pctx);
+
+       if (cb)
+               ctx->debug = *cb;
+       else
+               memset(&ctx->debug, 0, sizeof(ctx->debug));
+}
+
 struct pipe_context *
 fd_context_init(struct fd_context *ctx, struct pipe_screen *pscreen,
                const uint8_t *primtypes, void *priv)
@@ -162,26 +177,30 @@ fd_context_init(struct fd_context *ctx, struct pipe_screen *pscreen,
         */
        ctx->sample_mask = 0xffff;
 
+       ctx->stage = FD_STAGE_NULL;
+
        pctx = &ctx->base;
        pctx->screen = pscreen;
        pctx->priv = priv;
        pctx->flush = fd_context_flush;
+       pctx->emit_string_marker = fd_emit_string_marker;
+       pctx->set_debug_callback = fd_set_debug_callback;
 
-       for (i = 0; i < ARRAY_SIZE(ctx->rings); i++) {
-               ctx->rings[i] = fd_ringbuffer_new(screen->pipe, 0x400000);
-               if (!ctx->rings[i])
-                       goto fail;
-       }
+       ctx->batch = fd_batch_create(ctx);
+
+       fd_reset_wfi(ctx);
 
-       fd_context_next_rb(pctx);
+       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);
        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)