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 127fb5f5aa04589c1c2e1b7c46510e3b05a70b98..c54bb1091f77ec10f8deae6176bb2b5a1981edf3 100644 (file)
--- a/src/gallium/drivers/freedreno/freedreno_context.c
+++ b/src/gallium/drivers/freedreno/freedreno_context.c
@@ -94,9 +94,7 @@ 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;
-       int i;
 
        DBG("needs_flush: %d", ctx->needs_flush);
 
@@ -118,20 +116,11 @@ fd_context_render(struct pipe_context *pctx)
        ctx->gmem_reason = 0;
        ctx->num_draws = 0;
 
-       for (i = 0; i < pfb->nr_cbufs; i++)
-               if (pfb->cbufs[i])
-                       fd_resource(pfb->cbufs[i]->texture)->dirty = false;
-       if (pfb->zsbuf) {
-               rsc = fd_resource(pfb->zsbuf->texture);
-               rsc->dirty = false;
-               if (rsc->stencil)
-                       rsc->stencil->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) {
-               assert(rsc->reading);
-               rsc->reading = false;
+               debug_assert(rsc->status != 0);
+               rsc->status = 0;
+               rsc->pending_ctx = NULL;
                list_delinit(&rsc->list);
        }
 
@@ -142,11 +131,42 @@ static void
 fd_context_flush(struct pipe_context *pctx, struct pipe_fence_handle **fence,
                unsigned flags)
 {
+       struct fd_ringbuffer *ring = fd_context(pctx)->ring;
+
        fd_context_render(pctx);
 
        if (fence) {
                fd_screen_fence_ref(pctx->screen, fence, NULL);
-               *fence = fd_fence_create(pctx);
+               *fence = fd_fence_create(pctx, fd_ringbuffer_timestamp(ring));
+       }
+}
+
+/**
+ * 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);
        }
 }
 
@@ -216,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);