freedreno/a6xx: Don't set unknown bit when tiling differs
authorKristian H. Kristensen <hoegsberg@google.com>
Thu, 2 Jul 2020 10:49:57 +0000 (03:49 -0700)
committerMarge Bot <eric+marge@anholt.net>
Tue, 14 Jul 2020 06:12:22 +0000 (06:12 +0000)
There is a bit here that's sometimes set, but it's generally not
related to whether tiling differs between src and dst.  Let's stop
setting it until we know more.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5717>

src/gallium/drivers/freedreno/a6xx/fd6_blitter.c

index d1b2eb6548ef28312b3987d91db39496bb9b3110..6d4c00d95b0f772ec950b8be86daf8966ac03288 100644 (file)
@@ -496,7 +496,6 @@ emit_blit_or_clear_texture(struct fd_context *ctx, struct fd_ringbuffer *ring,
        const struct pipe_box *dbox = &info->dst.box;
        struct fd_resource *dst;
        enum a6xx_format sfmt, dfmt;
-       enum a6xx_tile_mode stile, dtile;
        int sx1, sy1, sx2, sy2;
        int dx1, dy1, dx2, dy2;
 
@@ -515,9 +514,6 @@ emit_blit_or_clear_texture(struct fd_context *ctx, struct fd_ringbuffer *ring,
        sfmt = fd6_pipe2color(info->src.format);
        dfmt = fd6_pipe2color(info->dst.format);
 
-       stile = fd_resource_tile_mode(info->src.resource, info->src.level);
-       dtile = fd_resource_tile_mode(info->dst.resource, info->dst.level);
-
        uint32_t nr_samples = fd_resource_nr_samples(&dst->base);
        sx1 = sbox->x * nr_samples;
        sy1 = sbox->y;
@@ -583,9 +579,6 @@ emit_blit_or_clear_texture(struct fd_context *ctx, struct fd_ringbuffer *ring,
                }
        }
 
-       if (dtile != stile)
-               blit_cntl |= 0x20000000;
-
        if (info->scissor_enable) {
                OUT_PKT4(ring, REG_A6XX_GRAS_RESOLVE_CNTL_1, 2);
                OUT_RING(ring, A6XX_GRAS_RESOLVE_CNTL_1_X(info->scissor.minx) |