freedreno: constify fd_tile
[mesa.git] / src / gallium / drivers / freedreno / freedreno_gmem.c
index 29f835879b42c4d76db1643219231c0b6b6826cb..0a960859a6cd1225c5e726229b03c69ca2bbe60e 100644 (file)
@@ -28,7 +28,7 @@
 #include "util/u_string.h"
 #include "util/u_memory.h"
 #include "util/u_inlines.h"
-#include "util/u_format.h"
+#include "util/format/u_format.h"
 
 #include "freedreno_gmem.h"
 #include "freedreno_context.h"
@@ -66,6 +66,8 @@
  * resolve.
  */
 
+#define BIN_DEBUG 0
+
 static uint32_t bin_width(struct fd_screen *screen)
 {
        if (is_a4xx(screen) || is_a5xx(screen) || is_a6xx(screen))
@@ -77,24 +79,25 @@ static uint32_t bin_width(struct fd_screen *screen)
 
 static uint32_t
 total_size(uint8_t cbuf_cpp[], uint8_t zsbuf_cpp[2],
-                  uint32_t bin_w, uint32_t bin_h, struct fd_gmem_stateobj *gmem)
+                  uint32_t bin_w, uint32_t bin_h, uint32_t gmem_align,
+                  struct fd_gmem_stateobj *gmem)
 {
        uint32_t total = 0, i;
 
        for (i = 0; i < MAX_RENDER_TARGETS; i++) {
                if (cbuf_cpp[i]) {
-                       gmem->cbuf_base[i] = align(total, 0x4000);
+                       gmem->cbuf_base[i] = align(total, gmem_align);
                        total = gmem->cbuf_base[i] + cbuf_cpp[i] * bin_w * bin_h;
                }
        }
 
        if (zsbuf_cpp[0]) {
-               gmem->zsbuf_base[0] = align(total, 0x4000);
+               gmem->zsbuf_base[0] = align(total, gmem_align);
                total = gmem->zsbuf_base[0] + zsbuf_cpp[0] * bin_w * bin_h;
        }
 
        if (zsbuf_cpp[1]) {
-               gmem->zsbuf_base[1] = align(total, 0x4000);
+               gmem->zsbuf_base[1] = align(total, gmem_align);
                total = gmem->zsbuf_base[1] + zsbuf_cpp[1] * bin_w * bin_h;
        }
 
@@ -116,18 +119,24 @@ calculate_tiles(struct fd_batch *batch)
        uint32_t minx, miny, width, height;
        uint32_t nbins_x = 1, nbins_y = 1;
        uint32_t bin_w, bin_h;
+       uint32_t gmem_align = 0x4000;
        uint32_t max_width = bin_width(screen);
        uint8_t cbuf_cpp[MAX_RENDER_TARGETS] = {0}, zsbuf_cpp[2] = {0};
        uint32_t i, j, t, xoff, yoff;
        uint32_t tpp_x, tpp_y;
-       bool has_zs = !!(batch->resolve & (FD_BUFFER_DEPTH | FD_BUFFER_STENCIL));
+       bool has_zs = !!(batch->gmem_reason & (FD_GMEM_DEPTH_ENABLED |
+               FD_GMEM_STENCIL_ENABLED | FD_GMEM_CLEARS_DEPTH_STENCIL));
        int tile_n[npipes];
 
        if (has_zs) {
                struct fd_resource *rsc = fd_resource(pfb->zsbuf->texture);
-               zsbuf_cpp[0] = rsc->cpp;
+               zsbuf_cpp[0] = rsc->layout.cpp;
                if (rsc->stencil)
-                       zsbuf_cpp[1] = rsc->stencil->cpp;
+                       zsbuf_cpp[1] = rsc->stencil->layout.cpp;
+       } else {
+               /* we might have a zsbuf, but it isn't used */
+               batch->restore &= ~(FD_BUFFER_DEPTH | FD_BUFFER_STENCIL);
+               batch->resolve &= ~(FD_BUFFER_DEPTH | FD_BUFFER_STENCIL);
        }
        for (i = 0; i < pfb->nr_cbufs; i++) {
                if (pfb->cbufs[i])
@@ -177,10 +186,18 @@ calculate_tiles(struct fd_batch *batch)
                                zsbuf_cpp[0], width, height);
        }
 
+       if (is_a20x(screen) && batch->cleared) {
+               /* under normal circumstances the requirement would be 4K
+                * but the fast clear path requires an alignment of 32K
+                */
+               gmem_align = 0x8000;
+       }
+
        /* then find a bin width/height that satisfies the memory
         * constraints:
         */
-       while (total_size(cbuf_cpp, zsbuf_cpp, bin_w, bin_h, gmem) > gmem_size) {
+       while (total_size(cbuf_cpp, zsbuf_cpp, bin_w, bin_h, gmem_align, gmem) >
+                  gmem_size) {
                if (bin_w > bin_h) {
                        nbins_x++;
                        bin_w = align(width / nbins_x, gmem_alignw);
@@ -214,12 +231,21 @@ calculate_tiles(struct fd_batch *batch)
 
 #define div_round_up(v, a)  (((v) + (a) - 1) / (a))
        /* figure out number of tiles per pipe: */
-       tpp_x = tpp_y = 1;
-       while (div_round_up(nbins_y, tpp_y) > screen->num_vsc_pipes)
-               tpp_y += 2;
-       while ((div_round_up(nbins_y, tpp_y) *
-                       div_round_up(nbins_x, tpp_x)) > screen->num_vsc_pipes)
-               tpp_x += 1;
+       if (is_a20x(ctx->screen)) {
+               /* for a20x we want to minimize the number of "pipes"
+                * binning data has 3 bits for x/y (8x8) but the edges are used to
+                * cull off-screen vertices with hw binning, so we have 6x6 pipes
+                */
+               tpp_x = 6;
+               tpp_y = 6;
+       } else {
+               tpp_x = tpp_y = 1;
+               while (div_round_up(nbins_y, tpp_y) > npipes)
+                       tpp_y += 2;
+               while ((div_round_up(nbins_y, tpp_y) *
+                               div_round_up(nbins_x, tpp_x)) > npipes)
+                       tpp_x += 1;
+       }
 
        gmem->maxpw = tpp_x;
        gmem->maxph = tpp_y;
@@ -227,7 +253,7 @@ calculate_tiles(struct fd_batch *batch)
        /* configure pipes: */
        xoff = yoff = 0;
        for (i = 0; i < npipes; i++) {
-               struct fd_vsc_pipe *pipe = &ctx->vsc_pipe[i];
+               struct fd_vsc_pipe *pipe = &gmem->vsc_pipe[i];
 
                if (xoff >= nbins_x) {
                        xoff = 0;
@@ -246,19 +272,22 @@ calculate_tiles(struct fd_batch *batch)
                xoff += tpp_x;
        }
 
+       /* number of pipes to use for a20x */
+       gmem->num_vsc_pipes = MAX2(1, i);
+
        for (; i < npipes; i++) {
-               struct fd_vsc_pipe *pipe = &ctx->vsc_pipe[i];
+               struct fd_vsc_pipe *pipe = &gmem->vsc_pipe[i];
                pipe->x = pipe->y = pipe->w = pipe->h = 0;
        }
 
-#if 0 /* debug */
-       printf("%dx%d ... tpp=%dx%d\n", nbins_x, nbins_y, tpp_x, tpp_y);
-       for (i = 0; i < 8; i++) {
-               struct fd_vsc_pipe *pipe = &ctx->pipe[i];
-               printf("pipe[%d]: %ux%u @ %u,%u\n", i,
-                               pipe->w, pipe->h, pipe->x, pipe->y);
+       if (BIN_DEBUG) {
+               printf("%dx%d ... tpp=%dx%d\n", nbins_x, nbins_y, tpp_x, tpp_y);
+               for (i = 0; i < ARRAY_SIZE(gmem->vsc_pipe); i++) {
+                       struct fd_vsc_pipe *pipe = &gmem->vsc_pipe[i];
+                       printf("pipe[%d]: %ux%u @ %u,%u\n", i,
+                                       pipe->w, pipe->h, pipe->x, pipe->y);
+               }
        }
-#endif
 
        /* configure tiles: */
        t = 0;
@@ -273,24 +302,30 @@ calculate_tiles(struct fd_batch *batch)
                bh = MIN2(bin_h, miny + height - yoff);
 
                for (j = 0; j < nbins_x; j++) {
-                       struct fd_tile *tile = &ctx->tile[t];
+                       struct fd_tile *tile = &gmem->tile[t];
                        uint32_t p;
 
-                       assert(t < ARRAY_SIZE(ctx->tile));
+                       assert(t < ARRAY_SIZE(gmem->tile));
 
                        /* pipe number: */
                        p = ((i / tpp_y) * div_round_up(nbins_x, tpp_x)) + (j / tpp_x);
+                       assert(p < gmem->num_vsc_pipes);
 
                        /* clip bin width: */
                        bw = MIN2(bin_w, minx + width - xoff);
-
-                       tile->n = tile_n[p]++;
+                       tile->n = !is_a20x(ctx->screen) ? tile_n[p]++ :
+                               ((i % tpp_y + 1) << 3 | (j % tpp_x + 1));
                        tile->p = p;
                        tile->bin_w = bw;
                        tile->bin_h = bh;
                        tile->xoff = xoff;
                        tile->yoff = yoff;
 
+                       if (BIN_DEBUG) {
+                               printf("tile[%d]: p=%u, bin=%ux%u+%u+%u\n", t,
+                                               p, bw, bh, xoff, yoff);
+                       }
+
                        t++;
 
                        xoff += bw;
@@ -299,16 +334,16 @@ calculate_tiles(struct fd_batch *batch)
                yoff += bh;
        }
 
-#if 0 /* debug */
-       t = 0;
-       for (i = 0; i < nbins_y; i++) {
-               for (j = 0; j < nbins_x; j++) {
-                       struct fd_tile *tile = &ctx->tile[t++];
-                       printf("|p:%u n:%u|", tile->p, tile->n);
+       if (BIN_DEBUG) {
+               t = 0;
+               for (i = 0; i < nbins_y; i++) {
+                       for (j = 0; j < nbins_x; j++) {
+                               struct fd_tile *tile = &gmem->tile[t++];
+                               printf("|p:%u n:%u|", tile->p, tile->n);
+                       }
+                       printf("\n");
                }
-               printf("\n");
        }
-#endif
 }
 
 static void
@@ -324,7 +359,7 @@ render_tiles(struct fd_batch *batch)
                ctx->stats.batch_restore++;
 
        for (i = 0; i < (gmem->nbins_x * gmem->nbins_y); i++) {
-               struct fd_tile *tile = &ctx->tile[i];
+               struct fd_tile *tile = &gmem->tile[i];
 
                DBG("bin_h=%d, yoff=%d, bin_w=%d, xoff=%d",
                        tile->bin_h, tile->yoff, tile->bin_w, tile->xoff);
@@ -341,7 +376,11 @@ render_tiles(struct fd_batch *batch)
                        ctx->query_prepare_tile(batch, i, batch->gmem);
 
                /* emit IB to drawcmds: */
-               ctx->emit_ib(batch->gmem, batch->draw);
+               if (ctx->emit_tile) {
+                       ctx->emit_tile(batch, tile);
+               } else {
+                       ctx->screen->emit_ib(batch->gmem, batch->draw);
+               }
                fd_reset_wfi(batch);
 
                /* emit gmem2mem to transfer tile back to system memory: */
@@ -363,7 +402,7 @@ render_sysmem(struct fd_batch *batch)
                ctx->query_prepare_tile(batch, 0, batch->gmem);
 
        /* emit IB to drawcmds: */
-       ctx->emit_ib(batch->gmem, batch->draw);
+       ctx->screen->emit_ib(batch->gmem, batch->draw);
        fd_reset_wfi(batch);
 
        if (ctx->emit_sysmem_fini)
@@ -373,15 +412,13 @@ render_sysmem(struct fd_batch *batch)
 static void
 flush_ring(struct fd_batch *batch)
 {
-       /* for compute/blit batch, there is no batch->gmem, only batch->draw: */
-       struct fd_ringbuffer *ring = batch->nondraw ? batch->draw : batch->gmem;
        uint32_t timestamp;
        int out_fence_fd = -1;
 
-       fd_ringbuffer_flush2(ring, batch->in_fence_fd,
-                       batch->needs_out_fence_fd ? &out_fence_fd : NULL);
+       fd_submit_flush(batch->submit, batch->in_fence_fd,
+                       batch->needs_out_fence_fd ? &out_fence_fd : NULL,
+                       &timestamp);
 
-       timestamp = fd_ringbuffer_timestamp(ring);
        fd_fence_populate(batch->fence, timestamp, out_fence_fd);
 }
 
@@ -409,6 +446,26 @@ fd_gmem_render_tiles(struct fd_batch *batch)
                }
        }
 
+       if (fd_mesa_debug & FD_DBG_NOGMEM)
+               sysmem = true;
+
+       /* Layered rendering always needs bypass. */
+       for (unsigned i = 0; i < pfb->nr_cbufs; i++) {
+               struct pipe_surface *psurf = pfb->cbufs[i];
+               if (!psurf)
+                       continue;
+               if (psurf->u.tex.first_layer < psurf->u.tex.last_layer)
+                       sysmem = true;
+       }
+
+       /* Tessellation doesn't seem to support tiled rendering so fall back to
+        * bypass.
+        */
+       if (batch->tessellation) {
+               debug_assert(ctx->emit_sysmem_prep);
+               sysmem = true;
+       }
+
        fd_reset_wfi(batch);
 
        ctx->stats.batch_total++;
@@ -417,10 +474,11 @@ fd_gmem_render_tiles(struct fd_batch *batch)
                DBG("%p: rendering non-draw", batch);
                ctx->stats.batch_nondraw++;
        } else if (sysmem) {
-               DBG("%p: rendering sysmem %ux%u (%s/%s)",
+               DBG("%p: rendering sysmem %ux%u (%s/%s), num_draws=%u",
                        batch, pfb->width, pfb->height,
                        util_format_short_name(pipe_surface_format(pfb->cbufs[0])),
-                       util_format_short_name(pipe_surface_format(pfb->zsbuf)));
+                       util_format_short_name(pipe_surface_format(pfb->zsbuf)),
+                       batch->num_draws);
                if (ctx->query_prepare)
                        ctx->query_prepare(batch, 1);
                render_sysmem(batch);
@@ -447,7 +505,7 @@ fd_gmem_render_tiles(struct fd_batch *batch)
  * case would be a single clear.
  */
 bool
-fd_gmem_needs_restore(struct fd_batch *batch, struct fd_tile *tile,
+fd_gmem_needs_restore(struct fd_batch *batch, const struct fd_tile *tile,
                uint32_t buffers)
 {
        if (!(batch->restore & buffers))