freedreno: refresh tile debug

Fix some #ifdef'd bitrot, and get rid of #ifdef so it doesn't bitrot
again.

And add a prints for per-tile state.

Signed-off-by: Rob Clark <robdclark@chromium.org>
Reviewed-by: Eric Anholt <eric@anholt.net>

diff --git a/src/gallium/drivers/freedreno/freedreno_gmem.c b/src/gallium/drivers/freedreno/freedreno_gmem.c
index f400f256a27e48499cf09a1664d0649213c18f5c..2f939b34ca9dd60cbd86724aa6f891d0fc82e96d 100644 (file)
--- a/src/gallium/drivers/freedreno/freedreno_gmem.c
+++ b/src/gallium/drivers/freedreno/freedreno_gmem.c
@@ -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))
@@ -278,14 +280,14 @@ calculate_tiles(struct fd_batch *batch)
                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(ctx->vsc_pipe); i++) {
+                       struct fd_vsc_pipe *pipe = &ctx->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;
@@ -319,6 +321,11 @@ calculate_tiles(struct fd_batch *batch)
                        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;
@@ -327,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 = &ctx->tile[t++];
+                               printf("|p:%u n:%u|", tile->p, tile->n);
+                       }
+                       printf("\n");
                }
-               printf("\n");
        }
-#endif
 }
 
 static void