freedreno/a6xx: Program RB_UNKNOWN_8C01 in setup helper
[mesa.git] / src / gallium / drivers / freedreno / a6xx / fd6_blitter.c
index 1699b292d89bf231890e9a9c7e29a9c351028f97..c4917c335052889ca2923d569e17d962df958049 100644 (file)
  */
 
 #include "util/u_dump.h"
+#include "util/half_float.h"
 
 #include "freedreno_blitter.h"
 #include "freedreno_fence.h"
+#include "freedreno_log.h"
 #include "freedreno_resource.h"
 
 #include "fd6_blitter.h"
 #include "fd6_format.h"
 #include "fd6_emit.h"
+#include "fd6_resource.h"
+#include "fd6_pack.h"
+
+static inline enum a6xx_2d_ifmt
+fd6_ifmt(enum a6xx_format fmt)
+{
+       switch (fmt) {
+       case FMT6_A8_UNORM:
+       case FMT6_8_UNORM:
+       case FMT6_8_SNORM:
+       case FMT6_8_8_UNORM:
+       case FMT6_8_8_SNORM:
+       case FMT6_8_8_8_8_UNORM:
+       case FMT6_8_8_8_X8_UNORM:
+       case FMT6_8_8_8_8_SNORM:
+       case FMT6_4_4_4_4_UNORM:
+       case FMT6_5_5_5_1_UNORM:
+       case FMT6_5_6_5_UNORM:
+               return R2D_UNORM8;
+
+       case FMT6_32_UINT:
+       case FMT6_32_SINT:
+       case FMT6_32_32_UINT:
+       case FMT6_32_32_SINT:
+       case FMT6_32_32_32_32_UINT:
+       case FMT6_32_32_32_32_SINT:
+               return R2D_INT32;
+
+       case FMT6_16_UINT:
+       case FMT6_16_SINT:
+       case FMT6_16_16_UINT:
+       case FMT6_16_16_SINT:
+       case FMT6_16_16_16_16_UINT:
+       case FMT6_16_16_16_16_SINT:
+       case FMT6_10_10_10_2_UINT:
+               return R2D_INT16;
+
+       case FMT6_8_UINT:
+       case FMT6_8_SINT:
+       case FMT6_8_8_UINT:
+       case FMT6_8_8_SINT:
+       case FMT6_8_8_8_8_UINT:
+       case FMT6_8_8_8_8_SINT:
+       case FMT6_Z24_UNORM_S8_UINT:
+       case FMT6_Z24_UNORM_S8_UINT_AS_R8G8B8A8:
+               return R2D_INT8;
+
+       case FMT6_16_UNORM:
+       case FMT6_16_SNORM:
+       case FMT6_16_16_UNORM:
+       case FMT6_16_16_SNORM:
+       case FMT6_16_16_16_16_UNORM:
+       case FMT6_16_16_16_16_SNORM:
+       case FMT6_32_FLOAT:
+       case FMT6_32_32_FLOAT:
+       case FMT6_32_32_32_32_FLOAT:
+               return R2D_FLOAT32;
+
+       case FMT6_16_FLOAT:
+       case FMT6_16_16_FLOAT:
+       case FMT6_16_16_16_16_FLOAT:
+       case FMT6_11_11_10_FLOAT:
+       case FMT6_10_10_10_2_UNORM_DEST:
+               return R2D_FLOAT16;
+
+       default:
+               unreachable("bad format");
+               return 0;
+       }
+}
 
 /* Make sure none of the requested dimensions extend beyond the size of the
  * resource.  Not entirely sure why this happens, but sometimes it does, and
@@ -55,17 +127,33 @@ ok_dims(const struct pipe_resource *r, const struct pipe_box *b, int lvl)
 static bool
 ok_format(enum pipe_format pfmt)
 {
-       enum a6xx_color_fmt fmt = fd6_pipe2color(pfmt);
-       if (fmt == ~0)
-               return false;
+       enum a6xx_format fmt = fd6_pipe2color(pfmt);
+
+       if (util_format_is_compressed(pfmt))
+               return true;
+
+       switch (pfmt) {
+       case PIPE_FORMAT_Z24_UNORM_S8_UINT:
+       case PIPE_FORMAT_Z24X8_UNORM:
+       case PIPE_FORMAT_Z16_UNORM:
+       case PIPE_FORMAT_Z32_UNORM:
+       case PIPE_FORMAT_Z32_FLOAT:
+       case PIPE_FORMAT_Z32_FLOAT_S8X24_UINT:
+       case PIPE_FORMAT_S8_UINT:
+               return true;
+       default:
+               break;
+       }
 
-       if (fd6_ifmt(fmt) == 0)
+       if (fmt == FMT6_NONE)
                return false;
 
        return true;
 }
 
+#define DEBUG_BLIT 0
 #define DEBUG_BLIT_FALLBACK 0
+
 #define fail_if(cond)                                                                                                  \
        do {                                                                                                                            \
                if (cond) {                                                                                                             \
@@ -90,20 +178,12 @@ can_do_blit(const struct pipe_blit_info *info)
         */
        fail_if(info->dst.box.depth != info->src.box.depth);
 
-       /* We can blit if both or neither formats are compressed formats... */
-       fail_if(util_format_is_compressed(info->src.format) !=
-                       util_format_is_compressed(info->src.format));
-
        /* Fail if unsupported format: */
        fail_if(!ok_format(info->src.format));
        fail_if(!ok_format(info->dst.format));
 
-       /* ... but only if they're the same compression format. */
-       fail_if(util_format_is_compressed(info->src.format) &&
-                       info->src.format != info->dst.format);
-
-       /* src box can be inverted, which we don't support.. dst box cannot: */
-       fail_if((info->src.box.width < 0) || (info->src.box.height < 0));
+       debug_assert(!util_format_is_compressed(info->src.format));
+       debug_assert(!util_format_is_compressed(info->dst.format));
 
        fail_if(!ok_dims(info->src.resource, &info->src.box, info->src.level));
 
@@ -113,15 +193,10 @@ can_do_blit(const struct pipe_blit_info *info)
        debug_assert(info->dst.box.height >= 0);
        debug_assert(info->dst.box.depth >= 0);
 
-       /* non-multisampled could either have nr_samples == 0 or == 1 */
        fail_if(info->dst.resource->nr_samples > 1);
-       fail_if(info->src.resource->nr_samples > 1);
 
        fail_if(info->window_rectangle_include);
 
-       fail_if(util_format_is_srgb(info->src.format));
-       fail_if(util_format_is_srgb(info->dst.format));
-
        const struct util_format_description *src_desc =
                util_format_description(info->src.format);
        const struct util_format_description *dst_desc =
@@ -142,44 +217,89 @@ can_do_blit(const struct pipe_blit_info *info)
 }
 
 static void
-emit_setup(struct fd_ringbuffer *ring)
+emit_setup(struct fd_batch *batch)
 {
-       OUT_PKT7(ring, CP_EVENT_WRITE, 1);
-       OUT_RING(ring, PC_CCU_INVALIDATE_COLOR);
-
-       OUT_PKT7(ring, CP_EVENT_WRITE, 1);
-       OUT_RING(ring, LRZ_FLUSH);
+       struct fd_ringbuffer *ring = batch->draw;
 
-       OUT_PKT7(ring, CP_SKIP_IB2_ENABLE_GLOBAL, 1);
-       OUT_RING(ring, 0x0);
+       fd6_event_write(batch, ring, PC_CCU_FLUSH_COLOR_TS, true);
+       fd6_event_write(batch, ring, PC_CCU_FLUSH_DEPTH_TS, true);
+       fd6_event_write(batch, ring, PC_CCU_INVALIDATE_COLOR, false);
+       fd6_event_write(batch, ring, PC_CCU_INVALIDATE_DEPTH, false);
 
+       /* normal BLIT_OP_SCALE operation needs bypass RB_CCU_CNTL */
        OUT_WFI5(ring);
-
        OUT_PKT4(ring, REG_A6XX_RB_CCU_CNTL, 1);
-       OUT_RING(ring, 0x10000000);
+       OUT_RING(ring, fd6_context(batch->ctx)->magic.RB_CCU_CNTL_bypass);
 }
 
-static uint32_t
-blit_control(enum a6xx_color_fmt fmt)
+static void
+emit_blit_setup(struct fd_ringbuffer *ring,
+               enum pipe_format pfmt, bool scissor_enable, union pipe_color_union *color)
 {
-       unsigned blit_cntl = 0xf00000;
-       blit_cntl |= A6XX_RB_2D_BLIT_CNTL_COLOR_FORMAT(fmt);
-       blit_cntl |= A6XX_RB_2D_BLIT_CNTL_IFMT(fd6_ifmt(fmt));
-       return blit_cntl;
+       enum a6xx_format fmt = fd6_pipe2color(pfmt);
+       bool is_srgb = util_format_is_srgb(pfmt);
+       enum a6xx_2d_ifmt ifmt = fd6_ifmt(fmt);
+
+       OUT_PKT7(ring, CP_SET_MARKER, 1);
+       OUT_RING(ring, A6XX_CP_SET_MARKER_0_MODE(RM6_BLIT2DSCALE));
+
+       if (is_srgb) {
+               assert(ifmt == R2D_UNORM8);
+               ifmt = R2D_UNORM8_SRGB;
+       }
+
+       uint32_t blit_cntl = A6XX_RB_2D_BLIT_CNTL_MASK(0xf) |
+               A6XX_RB_2D_BLIT_CNTL_COLOR_FORMAT(fmt) |
+               A6XX_RB_2D_BLIT_CNTL_IFMT(ifmt) |
+               COND(color, A6XX_RB_2D_BLIT_CNTL_SOLID_COLOR) |
+               COND(scissor_enable, A6XX_RB_2D_BLIT_CNTL_SCISSOR);
+
+       OUT_PKT4(ring, REG_A6XX_RB_2D_BLIT_CNTL, 1);
+       OUT_RING(ring, blit_cntl);
+
+       OUT_PKT4(ring, REG_A6XX_GRAS_2D_BLIT_CNTL, 1);
+       OUT_RING(ring, blit_cntl);
+
+       if (fmt == FMT6_10_10_10_2_UNORM_DEST)
+               fmt = FMT6_16_16_16_16_FLOAT;
+
+       /* This register is probably badly named... it seems that it's
+        * controlling the internal/accumulator format or something like
+        * that. It's certainly not tied to only the src format.
+        */
+       OUT_PKT4(ring, REG_A6XX_SP_2D_SRC_FORMAT, 1);
+       OUT_RING(ring, A6XX_SP_2D_SRC_FORMAT_COLOR_FORMAT(fmt) |
+                       COND(util_format_is_pure_sint(pfmt),
+                                       A6XX_SP_2D_SRC_FORMAT_SINT) |
+                       COND(util_format_is_pure_uint(pfmt),
+                                       A6XX_SP_2D_SRC_FORMAT_UINT) |
+                       COND(util_format_is_snorm(pfmt),
+                                       A6XX_SP_2D_SRC_FORMAT_SINT |
+                                               A6XX_SP_2D_SRC_FORMAT_NORM) |
+                       COND(util_format_is_unorm(pfmt),
+// TODO sometimes blob uses UINT+NORM but dEQP seems unhappy about that
+//                                             A6XX_SP_2D_SRC_FORMAT_UINT |
+                                       A6XX_SP_2D_SRC_FORMAT_NORM) |
+                       COND(is_srgb, A6XX_SP_2D_SRC_FORMAT_SRGB) |
+                       A6XX_SP_2D_SRC_FORMAT_MASK(0xf));
+
+       OUT_PKT4(ring, REG_A6XX_RB_UNKNOWN_8C01, 1);
+       OUT_RING(ring, 0);
 }
 
 /* buffers need to be handled specially since x/width can exceed the bounds
  * supported by hw.. if necessary decompose into (potentially) two 2D blits
  */
 static void
-emit_blit_buffer(struct fd_ringbuffer *ring, const struct pipe_blit_info *info)
+emit_blit_buffer(struct fd_context *ctx, struct fd_ringbuffer *ring,
+               const struct pipe_blit_info *info)
 {
        const struct pipe_box *sbox = &info->src.box;
        const struct pipe_box *dbox = &info->dst.box;
        struct fd_resource *src, *dst;
        unsigned sshift, dshift;
 
-       if (DEBUG_BLIT_FALLBACK) {
+       if (DEBUG_BLIT) {
                fprintf(stderr, "buffer blit: ");
                util_dump_blit_info(stderr, info);
                fprintf(stderr, "\ndst resource: ");
@@ -192,8 +312,8 @@ emit_blit_buffer(struct fd_ringbuffer *ring, const struct pipe_blit_info *info)
        src = fd_resource(info->src.resource);
        dst = fd_resource(info->dst.resource);
 
-       debug_assert(src->cpp == 1);
-       debug_assert(dst->cpp == 1);
+       debug_assert(src->layout.cpp == 1);
+       debug_assert(dst->layout.cpp == 1);
        debug_assert(info->src.resource->format == info->dst.resource->format);
        debug_assert((sbox->y == 0) && (sbox->height == 1));
        debug_assert((dbox->y == 0) && (dbox->height == 1));
@@ -224,15 +344,7 @@ emit_blit_buffer(struct fd_ringbuffer *ring, const struct pipe_blit_info *info)
        sshift = sbox->x & 0x3f;
        dshift = dbox->x & 0x3f;
 
-       OUT_PKT7(ring, CP_SET_MARKER, 1);
-       OUT_RING(ring, A2XX_CP_SET_MARKER_0_MODE(RM6_BLIT2DSCALE));
-
-       uint32_t blit_cntl = blit_control(RB6_R8_UNORM) | 0x20000000;
-       OUT_PKT4(ring, REG_A6XX_RB_2D_BLIT_CNTL, 1);
-       OUT_RING(ring, blit_cntl);
-
-       OUT_PKT4(ring, REG_A6XX_GRAS_2D_BLIT_CNTL, 1);
-       OUT_RING(ring, blit_cntl);
+       emit_blit_setup(ring, PIPE_FORMAT_R8_UNORM, false, NULL);
 
        for (unsigned off = 0; off < sbox->width; off += (0x4000 - 0x40)) {
                unsigned soff, doff, w, p;
@@ -249,10 +361,11 @@ emit_blit_buffer(struct fd_ringbuffer *ring, const struct pipe_blit_info *info)
                /*
                 * Emit source:
                 */
-               OUT_PKT4(ring, REG_A6XX_SP_PS_2D_SRC_INFO, 13);
-               OUT_RING(ring, A6XX_SP_PS_2D_SRC_INFO_COLOR_FORMAT(RB6_R8_UNORM) |
+               OUT_PKT4(ring, REG_A6XX_SP_PS_2D_SRC_INFO, 10);
+               OUT_RING(ring, A6XX_SP_PS_2D_SRC_INFO_COLOR_FORMAT(FMT6_8_UNORM) |
                                A6XX_SP_PS_2D_SRC_INFO_TILE_MODE(TILE6_LINEAR) |
-                                A6XX_SP_PS_2D_SRC_INFO_COLOR_SWAP(WZYX) | 0x500000);
+                                A6XX_SP_PS_2D_SRC_INFO_COLOR_SWAP(WZYX) |
+                                0x500000);
                OUT_RING(ring, A6XX_SP_PS_2D_SRC_SIZE_WIDTH(sshift + w) |
                                 A6XX_SP_PS_2D_SRC_SIZE_HEIGHT(1)); /* SP_PS_2D_SRC_SIZE */
                OUT_RELOC(ring, src->bo, soff, 0, 0);    /* SP_PS_2D_SRC_LO/HI */
@@ -264,15 +377,11 @@ emit_blit_buffer(struct fd_ringbuffer *ring, const struct pipe_blit_info *info)
                OUT_RING(ring, 0x00000000);
                OUT_RING(ring, 0x00000000);
 
-               OUT_RING(ring, 0x00000000);
-               OUT_RING(ring, 0x00000000);
-               OUT_RING(ring, 0x00000000);
-
                /*
                 * Emit destination:
                 */
                OUT_PKT4(ring, REG_A6XX_RB_2D_DST_INFO, 9);
-               OUT_RING(ring, A6XX_RB_2D_DST_INFO_COLOR_FORMAT(RB6_R8_UNORM) |
+               OUT_RING(ring, A6XX_RB_2D_DST_INFO_COLOR_FORMAT(FMT6_8_UNORM) |
                                 A6XX_RB_2D_DST_INFO_TILE_MODE(TILE6_LINEAR) |
                                 A6XX_RB_2D_DST_INFO_COLOR_SWAP(WZYX));
                OUT_RELOC(ring, dst->bo, doff, 0, 0);    /* RB_2D_DST_LO/HI */
@@ -300,14 +409,8 @@ emit_blit_buffer(struct fd_ringbuffer *ring, const struct pipe_blit_info *info)
                OUT_RING(ring, 0x3f);
                OUT_WFI5(ring);
 
-               OUT_PKT4(ring, REG_A6XX_RB_UNKNOWN_8C01, 1);
-               OUT_RING(ring, 0);
-
-               OUT_PKT4(ring, REG_A6XX_SP_2D_SRC_FORMAT, 1);
-               OUT_RING(ring, 0xf180);
-
                OUT_PKT4(ring, REG_A6XX_RB_UNKNOWN_8E04, 1);
-               OUT_RING(ring, 0x01000000);
+               OUT_RING(ring, fd6_context(ctx)->magic.RB_UNKNOWN_8E04_blit);
 
                OUT_PKT7(ring, CP_BLIT, 1);
                OUT_RING(ring, CP_BLIT_0_OP(BLIT_OP_SCALE));
@@ -315,25 +418,111 @@ emit_blit_buffer(struct fd_ringbuffer *ring, const struct pipe_blit_info *info)
                OUT_WFI5(ring);
 
                OUT_PKT4(ring, REG_A6XX_RB_UNKNOWN_8E04, 1);
-               OUT_RING(ring, 0);
+               OUT_RING(ring, 0);             /* RB_UNKNOWN_8E04 */
        }
 }
 
 static void
-emit_blit_texture(struct fd_ringbuffer *ring, const struct pipe_blit_info *info)
+emit_blit_dst(struct fd_ringbuffer *ring, const struct pipe_blit_info *info, unsigned layer)
+{
+       struct fd_resource *dst = fd_resource(info->dst.resource);
+       enum a6xx_format fmt = fd6_pipe2color(info->dst.format);
+       enum a6xx_tile_mode tile = fd_resource_tile_mode(info->dst.resource, info->dst.level);
+       enum a3xx_color_swap swap = fd6_resource_swap(dst, info->dst.format);
+       uint32_t pitch = fd_resource_pitch(dst, info->dst.level);
+       bool ubwc_enabled = fd_resource_ubwc_enabled(dst, info->dst.level);
+       unsigned off = fd_resource_offset(dst, info->dst.level, layer);
+
+       if (fmt == FMT6_Z24_UNORM_S8_UINT)
+               fmt = FMT6_Z24_UNORM_S8_UINT_AS_R8G8B8A8;
+
+       OUT_PKT4(ring, REG_A6XX_RB_2D_DST_INFO, 9);
+       OUT_RING(ring, A6XX_RB_2D_DST_INFO_COLOR_FORMAT(fmt) |
+                       A6XX_RB_2D_DST_INFO_TILE_MODE(tile) |
+                       A6XX_RB_2D_DST_INFO_COLOR_SWAP(swap) |
+                       COND(util_format_is_srgb(info->dst.format), A6XX_RB_2D_DST_INFO_SRGB) |
+                       COND(ubwc_enabled, A6XX_RB_2D_DST_INFO_FLAGS));
+       OUT_RELOC(ring, dst->bo, off, 0, 0);    /* RB_2D_DST_LO/HI */
+       OUT_RING(ring, A6XX_RB_2D_DST_SIZE_PITCH(pitch));
+       OUT_RING(ring, 0x00000000);
+       OUT_RING(ring, 0x00000000);
+       OUT_RING(ring, 0x00000000);
+       OUT_RING(ring, 0x00000000);
+       OUT_RING(ring, 0x00000000);
+
+       if (ubwc_enabled) {
+               OUT_PKT4(ring, REG_A6XX_RB_2D_DST_FLAGS_LO, 6);
+               fd6_emit_flag_reference(ring, dst, info->dst.level, layer);
+               OUT_RING(ring, 0x00000000);
+               OUT_RING(ring, 0x00000000);
+               OUT_RING(ring, 0x00000000);
+       }
+}
+
+static void
+emit_blit_src(struct fd_ringbuffer *ring, const struct pipe_blit_info *info, unsigned layer, unsigned nr_samples)
+{
+       struct fd_resource *src = fd_resource(info->src.resource);
+       enum a6xx_format sfmt = fd6_pipe2color(info->src.format);
+       enum a6xx_tile_mode     stile = fd_resource_tile_mode(info->src.resource, info->src.level);
+       enum a3xx_color_swap sswap = fd6_resource_swap(src, info->src.format);
+       uint32_t pitch = fd_resource_pitch(src, info->src.level);
+       bool subwc_enabled = fd_resource_ubwc_enabled(src, info->src.level);
+       unsigned soff = fd_resource_offset(src, info->src.level, layer);
+       uint32_t width = u_minify(src->base.width0, info->src.level) * nr_samples;
+       uint32_t height = u_minify(src->base.height0, info->src.level);
+       uint32_t filter = 0;
+
+       if (info->filter == PIPE_TEX_FILTER_LINEAR)
+               filter = A6XX_SP_PS_2D_SRC_INFO_FILTER;
+
+       enum a3xx_msaa_samples samples = fd_msaa_samples(src->base.nr_samples);
+
+       if (sfmt == FMT6_10_10_10_2_UNORM_DEST)
+               sfmt = FMT6_10_10_10_2_UNORM;
+
+       OUT_PKT4(ring, REG_A6XX_SP_PS_2D_SRC_INFO, 10);
+       OUT_RING(ring, A6XX_SP_PS_2D_SRC_INFO_COLOR_FORMAT(sfmt) |
+                       A6XX_SP_PS_2D_SRC_INFO_TILE_MODE(stile) |
+                       A6XX_SP_PS_2D_SRC_INFO_COLOR_SWAP(sswap) |
+                       A6XX_SP_PS_2D_SRC_INFO_SAMPLES(samples) |
+                       COND(samples > MSAA_ONE && (info->mask & PIPE_MASK_RGBA),
+                                       A6XX_SP_PS_2D_SRC_INFO_SAMPLES_AVERAGE) |
+                       COND(subwc_enabled, A6XX_SP_PS_2D_SRC_INFO_FLAGS) |
+                       COND(util_format_is_srgb(info->src.format), A6XX_SP_PS_2D_SRC_INFO_SRGB) |
+                       0x500000 | filter);
+       OUT_RING(ring, A6XX_SP_PS_2D_SRC_SIZE_WIDTH(width) |
+                       A6XX_SP_PS_2D_SRC_SIZE_HEIGHT(height)); /* SP_PS_2D_SRC_SIZE */
+       OUT_RELOC(ring, src->bo, soff, 0, 0);    /* SP_PS_2D_SRC_LO/HI */
+       OUT_RING(ring, A6XX_SP_PS_2D_SRC_PITCH_PITCH(pitch));
+
+       OUT_RING(ring, 0x00000000);
+       OUT_RING(ring, 0x00000000);
+       OUT_RING(ring, 0x00000000);
+       OUT_RING(ring, 0x00000000);
+       OUT_RING(ring, 0x00000000);
+
+       if (subwc_enabled) {
+               OUT_PKT4(ring, REG_A6XX_SP_PS_2D_SRC_FLAGS_LO, 6);
+               fd6_emit_flag_reference(ring, src, info->src.level, layer);
+               OUT_RING(ring, 0x00000000);
+               OUT_RING(ring, 0x00000000);
+               OUT_RING(ring, 0x00000000);
+       }
+}
+
+static void
+emit_blit_or_clear_texture(struct fd_context *ctx, struct fd_ringbuffer *ring,
+               const struct pipe_blit_info *info, union pipe_color_union *color)
 {
        const struct pipe_box *sbox = &info->src.box;
        const struct pipe_box *dbox = &info->dst.box;
-       struct fd_resource *src, *dst;
-       struct fd_resource_slice *sslice, *dslice;
-       enum a6xx_color_fmt sfmt, dfmt;
-       enum a6xx_tile_mode stile, dtile;
-       enum a3xx_color_swap sswap, dswap;
-       unsigned spitch, dpitch;
-       unsigned sx1, sy1, sx2, sy2;
-       unsigned dx1, dy1, dx2, dy2;
-
-       if (DEBUG_BLIT_FALLBACK) {
+       struct fd_resource *dst;
+       enum a6xx_format dfmt;
+       int sx1, sy1, sx2, sy2;
+       int dx1, dy1, dx2, dy2;
+
+       if (DEBUG_BLIT) {
                fprintf(stderr, "texture blit: ");
                util_dump_blit_info(stderr, info);
                fprintf(stderr, "\ndst resource: ");
@@ -343,60 +532,79 @@ emit_blit_texture(struct fd_ringbuffer *ring, const struct pipe_blit_info *info)
                fprintf(stderr, "\n");
        }
 
-       src = fd_resource(info->src.resource);
        dst = fd_resource(info->dst.resource);
 
-       sslice = fd_resource_slice(src, info->src.level);
-       dslice = fd_resource_slice(dst, info->dst.level);
-
-       sfmt = fd6_pipe2color(info->src.format);
        dfmt = fd6_pipe2color(info->dst.format);
 
-       int blocksize = util_format_get_blocksize(info->src.format);
-       int blockwidth = util_format_get_blockwidth(info->src.format);
-       int blockheight = util_format_get_blockheight(info->src.format);
-       int nelements;
-
-       stile = fd_resource_level_linear(info->src.resource, info->src.level) ?
-                       TILE6_LINEAR : src->tile_mode;
-       dtile = fd_resource_level_linear(info->dst.resource, info->dst.level) ?
-                       TILE6_LINEAR : dst->tile_mode;
+       uint32_t nr_samples = fd_resource_nr_samples(&dst->base);
 
-       sswap = stile ? WZYX : fd6_pipe2swap(info->src.format);
-       dswap = dtile ? WZYX : fd6_pipe2swap(info->dst.format);
+       if (!color) {
+               sx1 = sbox->x * nr_samples;
+               sy1 = sbox->y;
+               sx2 = (sbox->x + sbox->width) * nr_samples - 1;
+               sy2 = sbox->y + sbox->height - 1;
 
-       if (util_format_is_compressed(info->src.format)) {
-               debug_assert(info->src.format == info->dst.format);
-               sfmt = dfmt = RB6_R8_UNORM;
-               nelements = blocksize;
-       } else {
-               debug_assert(!util_format_is_compressed(info->dst.format));
-               nelements = 1;
+               OUT_PKT4(ring, REG_A6XX_GRAS_2D_SRC_TL_X, 4);
+               OUT_RING(ring, A6XX_GRAS_2D_SRC_TL_X_X(sx1));
+               OUT_RING(ring, A6XX_GRAS_2D_SRC_BR_X_X(sx2));
+               OUT_RING(ring, A6XX_GRAS_2D_SRC_TL_Y_Y(sy1));
+               OUT_RING(ring, A6XX_GRAS_2D_SRC_BR_Y_Y(sy2));
        }
 
-       spitch = DIV_ROUND_UP(sslice->pitch, blockwidth) * src->cpp;
-       dpitch = DIV_ROUND_UP(dslice->pitch, blockwidth) * dst->cpp;
-
-       sx1 = sbox->x / blockwidth * nelements;
-       sy1 = sbox->y / blockheight;
-       sx2 = DIV_ROUND_UP(sbox->x + sbox->width, blockwidth) * nelements - 1;
-       sy2 = DIV_ROUND_UP(sbox->y + sbox->height, blockheight) - 1;
-
-       dx1 = dbox->x / blockwidth * nelements;
-       dy1 = dbox->y / blockheight;
-       dx2 = DIV_ROUND_UP(dbox->x + dbox->width, blockwidth) * nelements - 1;
-       dy2 = DIV_ROUND_UP(dbox->y + dbox->height, blockheight) - 1;
-
-       uint32_t width = DIV_ROUND_UP(u_minify(src->base.width0, info->src.level), blockwidth) * nelements;
-       uint32_t height = DIV_ROUND_UP(u_minify(src->base.height0, info->src.level), blockheight);
-
-       OUT_PKT7(ring, CP_SET_MARKER, 1);
-       OUT_RING(ring, A2XX_CP_SET_MARKER_0_MODE(RM6_BLIT2DSCALE));
-
-       uint32_t blit_cntl = blit_control(dfmt);
+       dx1 = dbox->x * nr_samples;
+       dy1 = dbox->y;
+       dx2 = (dbox->x + dbox->width) * nr_samples - 1;
+       dy2 = dbox->y + dbox->height - 1;
+
+       OUT_PKT4(ring, REG_A6XX_GRAS_2D_DST_TL, 2);
+       OUT_RING(ring, A6XX_GRAS_2D_DST_TL_X(dx1) | A6XX_GRAS_2D_DST_TL_Y(dy1));
+       OUT_RING(ring, A6XX_GRAS_2D_DST_BR_X(dx2) | A6XX_GRAS_2D_DST_BR_Y(dy2));
+
+       if (color) {
+               switch (info->dst.format) {
+               case PIPE_FORMAT_Z24X8_UNORM:
+               case PIPE_FORMAT_Z24_UNORM_S8_UINT:
+               case PIPE_FORMAT_X24S8_UINT: {
+                       uint32_t depth_unorm24 = color->f[0] * ((1u << 24) - 1);
+                       uint8_t stencil = color->ui[1];
+                       color->ui[0] = depth_unorm24 & 0xff;
+                       color->ui[1] = (depth_unorm24 >> 8) & 0xff;
+                       color->ui[2] = (depth_unorm24 >> 16) & 0xff;
+                       color->ui[3] = stencil;
+                       break;
+               }
+               default:
+                       break;
+               }
 
-       if (dtile != stile)
-               blit_cntl |= 0x20000000;
+               OUT_PKT4(ring, REG_A6XX_RB_2D_SRC_SOLID_C0, 4);
+
+               switch (fd6_ifmt(dfmt)) {
+               case R2D_UNORM8:
+               case R2D_UNORM8_SRGB:
+                       OUT_RING(ring, float_to_ubyte(color->f[0]));
+                       OUT_RING(ring, float_to_ubyte(color->f[1]));
+                       OUT_RING(ring, float_to_ubyte(color->f[2]));
+                       OUT_RING(ring, float_to_ubyte(color->f[3]));
+                       break;
+               case R2D_FLOAT16:
+                       OUT_RING(ring, _mesa_float_to_half(color->f[0]));
+                       OUT_RING(ring, _mesa_float_to_half(color->f[1]));
+                       OUT_RING(ring, _mesa_float_to_half(color->f[2]));
+                       OUT_RING(ring, _mesa_float_to_half(color->f[3]));
+                       break;
+               case R2D_FLOAT32:
+               case R2D_INT32:
+               case R2D_INT16:
+               case R2D_INT8:
+               default:
+                       OUT_RING(ring, color->ui[0]);
+                       OUT_RING(ring, color->ui[1]);
+                       OUT_RING(ring, color->ui[2]);
+                       OUT_RING(ring, color->ui[3]);
+                       break;
+               }
+       }
 
        if (info->scissor_enable) {
                OUT_PKT4(ring, REG_A6XX_GRAS_RESOLVE_CNTL_1, 2);
@@ -404,96 +612,26 @@ emit_blit_texture(struct fd_ringbuffer *ring, const struct pipe_blit_info *info)
                                 A6XX_GRAS_RESOLVE_CNTL_1_Y(info->scissor.miny));
                OUT_RING(ring, A6XX_GRAS_RESOLVE_CNTL_1_X(info->scissor.maxx - 1) |
                                 A6XX_GRAS_RESOLVE_CNTL_1_Y(info->scissor.maxy - 1));
-               blit_cntl |= A6XX_RB_2D_BLIT_CNTL_SCISSOR;
        }
 
-       OUT_PKT4(ring, REG_A6XX_RB_2D_BLIT_CNTL, 1);
-       OUT_RING(ring, blit_cntl);
-
-       OUT_PKT4(ring, REG_A6XX_GRAS_2D_BLIT_CNTL, 1);
-       OUT_RING(ring, blit_cntl);
+       emit_blit_setup(ring, info->dst.format, info->scissor_enable, color);
 
        for (unsigned i = 0; i < info->dst.box.depth; i++) {
-               unsigned soff = fd_resource_offset(src, info->src.level, sbox->z + i);
-               unsigned doff = fd_resource_offset(dst, info->dst.level, dbox->z + i);
-
-               /*
-                * Emit source:
-                */
-               uint32_t filter = 0;
-               if (info->filter == PIPE_TEX_FILTER_LINEAR)
-                       filter = A6XX_SP_PS_2D_SRC_INFO_FILTER;
-
-               OUT_PKT4(ring, REG_A6XX_SP_PS_2D_SRC_INFO, 13);
-               OUT_RING(ring, A6XX_SP_PS_2D_SRC_INFO_COLOR_FORMAT(sfmt) |
-                               A6XX_SP_PS_2D_SRC_INFO_TILE_MODE(stile) |
-                               A6XX_SP_PS_2D_SRC_INFO_COLOR_SWAP(sswap) | 0x500000 | filter);
-               OUT_RING(ring, A6XX_SP_PS_2D_SRC_SIZE_WIDTH(width) |
-                                A6XX_SP_PS_2D_SRC_SIZE_HEIGHT(height)); /* SP_PS_2D_SRC_SIZE */
-               OUT_RELOC(ring, src->bo, soff, 0, 0);    /* SP_PS_2D_SRC_LO/HI */
-               OUT_RING(ring, A6XX_SP_PS_2D_SRC_PITCH_PITCH(spitch));
-               OUT_RING(ring, 0x00000000);
-               OUT_RING(ring, 0x00000000);
-               OUT_RING(ring, 0x00000000);
-               OUT_RING(ring, 0x00000000);
-               OUT_RING(ring, 0x00000000);
 
-               OUT_RING(ring, 0x00000000);
-               OUT_RING(ring, 0x00000000);
-               OUT_RING(ring, 0x00000000);
+               if (!color)
+                       emit_blit_src(ring, info, sbox->z + i, nr_samples);
 
-               /*
-                * Emit destination:
-                */
-               OUT_PKT4(ring, REG_A6XX_RB_2D_DST_INFO, 9);
-               OUT_RING(ring, A6XX_RB_2D_DST_INFO_COLOR_FORMAT(dfmt) |
-                                A6XX_RB_2D_DST_INFO_TILE_MODE(dtile) |
-                                A6XX_RB_2D_DST_INFO_COLOR_SWAP(dswap));
-               OUT_RELOCW(ring, dst->bo, doff, 0, 0);    /* RB_2D_DST_LO/HI */
-               OUT_RING(ring, A6XX_RB_2D_DST_SIZE_PITCH(dpitch));
-               OUT_RING(ring, 0x00000000);
-               OUT_RING(ring, 0x00000000);
-               OUT_RING(ring, 0x00000000);
-               OUT_RING(ring, 0x00000000);
-               OUT_RING(ring, 0x00000000);
+               emit_blit_dst(ring, info, dbox->z + i);
 
                /*
                 * Blit command:
                 */
-               OUT_PKT4(ring, REG_A6XX_GRAS_2D_SRC_TL_X, 4);
-               OUT_RING(ring, A6XX_GRAS_2D_SRC_TL_X_X(sx1));
-               OUT_RING(ring, A6XX_GRAS_2D_SRC_BR_X_X(sx2));
-               OUT_RING(ring, A6XX_GRAS_2D_SRC_TL_Y_Y(sy1));
-               OUT_RING(ring, A6XX_GRAS_2D_SRC_BR_Y_Y(sy2));
-
-               OUT_PKT4(ring, REG_A6XX_GRAS_2D_DST_TL, 2);
-               OUT_RING(ring, A6XX_GRAS_2D_DST_TL_X(dx1) | A6XX_GRAS_2D_DST_TL_Y(dy1));
-               OUT_RING(ring, A6XX_GRAS_2D_DST_BR_X(dx2) | A6XX_GRAS_2D_DST_BR_Y(dy2));
-
                OUT_PKT7(ring, CP_EVENT_WRITE, 1);
                OUT_RING(ring, 0x3f);
                OUT_WFI5(ring);
 
-               OUT_PKT4(ring, REG_A6XX_RB_UNKNOWN_8C01, 1);
-               OUT_RING(ring, 0);
-
-               OUT_PKT4(ring, REG_A6XX_SP_2D_SRC_FORMAT, 1);
-               OUT_RING(ring, A6XX_SP_2D_SRC_FORMAT_COLOR_FORMAT(sfmt) |
-                               COND(util_format_is_pure_sint(info->src.format),
-                                               A6XX_SP_2D_SRC_FORMAT_SINT) |
-                               COND(util_format_is_pure_uint(info->src.format),
-                                               A6XX_SP_2D_SRC_FORMAT_UINT) |
-                               COND(util_format_is_snorm(info->src.format),
-                                               A6XX_SP_2D_SRC_FORMAT_SINT |
-                                               A6XX_SP_2D_SRC_FORMAT_NORM) |
-                               COND(util_format_is_unorm(info->src.format),
-// TODO sometimes blob uses UINT+NORM but dEQP seems unhappy about that
-//                                             A6XX_SP_2D_SRC_FORMAT_UINT |
-                                               A6XX_SP_2D_SRC_FORMAT_NORM) |
-                               0xf000);
-
                OUT_PKT4(ring, REG_A6XX_RB_UNKNOWN_8E04, 1);
-               OUT_RING(ring, 0x01000000);
+               OUT_RING(ring, fd6_context(ctx)->magic.RB_UNKNOWN_8E04_blit);
 
                OUT_PKT7(ring, CP_BLIT, 1);
                OUT_RING(ring, CP_BLIT_0_OP(BLIT_OP_SCALE));
@@ -501,64 +639,252 @@ emit_blit_texture(struct fd_ringbuffer *ring, const struct pipe_blit_info *info)
                OUT_WFI5(ring);
 
                OUT_PKT4(ring, REG_A6XX_RB_UNKNOWN_8E04, 1);
-               OUT_RING(ring, 0);
+               OUT_RING(ring, 0);             /* RB_UNKNOWN_8E04 */
        }
 }
 
-static void
-emit_blit(struct fd_context *ctx, const struct pipe_blit_info *info)
+void
+fd6_clear_surface(struct fd_context *ctx,
+               struct fd_ringbuffer *ring, struct pipe_surface *psurf,
+               uint32_t width, uint32_t height, union pipe_color_union *color)
+{
+       struct pipe_blit_info info = {};
+
+       info.dst.resource = psurf->texture;
+       info.dst.level = psurf->u.tex.level;
+       info.dst.box.x = 0;
+       info.dst.box.y = 0;
+       info.dst.box.z = psurf->u.tex.first_layer;
+       info.dst.box.width = width;
+       info.dst.box.height = height;
+       info.dst.box.depth = psurf->u.tex.last_layer + 1 - psurf->u.tex.first_layer;
+       info.dst.format = psurf->format;
+       info.src = info.dst;
+       info.mask = util_format_get_mask(psurf->format);
+       info.filter = PIPE_TEX_FILTER_NEAREST;
+       info.scissor_enable = 0;
+
+       emit_blit_or_clear_texture(ctx, ring, &info, color);
+}
+
+static bool
+handle_rgba_blit(struct fd_context *ctx, const struct pipe_blit_info *info)
 {
        struct fd_batch *batch;
 
-       fd_fence_ref(ctx->base.screen, &ctx->last_fence, NULL);
+       debug_assert(!(info->mask & PIPE_MASK_ZS));
+
+       if (!can_do_blit(info))
+               return false;
 
        batch = fd_bc_alloc_batch(&ctx->screen->batch_cache, ctx, true);
 
        fd6_emit_restore(batch, batch->draw);
        fd6_emit_lrz_flush(batch->draw);
 
-       mtx_lock(&ctx->screen->lock);
+       fd_screen_lock(ctx->screen);
 
-       fd_batch_resource_used(batch, fd_resource(info->src.resource), false);
-       fd_batch_resource_used(batch, fd_resource(info->dst.resource), true);
+       fd_batch_resource_read(batch, fd_resource(info->src.resource));
+       fd_batch_resource_write(batch, fd_resource(info->dst.resource));
 
-       mtx_unlock(&ctx->screen->lock);
+       fd_screen_unlock(ctx->screen);
 
-       emit_setup(batch->draw);
+       /* Clearing last_fence must come after the batch dependency tracking
+        * (resource_read()/resource_write()), as that can trigger a flush,
+        * re-populating last_fence
+        */
+       fd_fence_ref(&ctx->last_fence, NULL);
+
+       fd_batch_set_stage(batch, FD_STAGE_BLIT);
+
+       fd_log_stream(batch, stream, util_dump_blit_info(stream, info));
+
+       emit_setup(batch);
 
        if ((info->src.resource->target == PIPE_BUFFER) &&
                        (info->dst.resource->target == PIPE_BUFFER)) {
-               assert(fd_resource(info->src.resource)->tile_mode == TILE6_LINEAR);
-               assert(fd_resource(info->dst.resource)->tile_mode == TILE6_LINEAR);
-               emit_blit_buffer(batch->draw, info);
+               assert(fd_resource(info->src.resource)->layout.tile_mode == TILE6_LINEAR);
+               assert(fd_resource(info->dst.resource)->layout.tile_mode == TILE6_LINEAR);
+               fd_log(batch, "START BLIT (BUFFER)");
+               emit_blit_buffer(ctx, batch->draw, info);
+               fd_log(batch, "END BLIT (BUFFER)");
        } else {
                /* I don't *think* we need to handle blits between buffer <-> !buffer */
                debug_assert(info->src.resource->target != PIPE_BUFFER);
                debug_assert(info->dst.resource->target != PIPE_BUFFER);
-               emit_blit_texture(batch->draw, info);
+               fd_log(batch, "START BLIT (TEXTURE)");
+               emit_blit_or_clear_texture(ctx, batch->draw, info, NULL);
+               fd_log(batch, "END BLIT (TEXTURE)");
        }
 
-       fd6_event_write(batch, batch->draw, 0x1d, true);
-       fd6_event_write(batch, batch->draw, FACENESS_FLUSH, true);
+       fd6_event_write(batch, batch->draw, PC_CCU_FLUSH_COLOR_TS, true);
+       fd6_event_write(batch, batch->draw, PC_CCU_FLUSH_DEPTH_TS, true);
        fd6_event_write(batch, batch->draw, CACHE_FLUSH_TS, true);
+       fd6_cache_inv(batch, batch->draw);
 
        fd_resource(info->dst.resource)->valid = true;
        batch->needs_flush = true;
 
-       fd_batch_flush(batch, false, false);
+       fd_batch_flush(batch);
        fd_batch_reference(&batch, NULL);
+
+       return true;
 }
 
+/**
+ * Re-written z/s blits can still fail for various reasons (for example MSAA).
+ * But we want to do the fallback blit with the re-written pipe_blit_info,
+ * in particular as u_blitter cannot blit stencil.  So handle the fallback
+ * ourself and never "fail".
+ */
 static bool
-fd6_blit(struct fd_context *ctx, const struct pipe_blit_info *info)
+do_rewritten_blit(struct fd_context *ctx, const struct pipe_blit_info *info)
 {
-       if (!can_do_blit(info)) {
+       bool success = handle_rgba_blit(ctx, info);
+       if (!success)
+               success = fd_blitter_blit(ctx, info);
+       debug_assert(success);  /* fallback should never fail! */
+       return success;
+}
+
+/**
+ * Handle depth/stencil blits either via u_blitter and/or re-writing the
+ * blit into an equivilant format that we can handle
+ */
+static bool
+handle_zs_blit(struct fd_context *ctx, const struct pipe_blit_info *info)
+{
+       struct pipe_blit_info blit = *info;
+
+       if (DEBUG_BLIT) {
+               fprintf(stderr, "---- handle_zs_blit: ");
+               util_dump_blit_info(stderr, info);
+               fprintf(stderr, "\ndst resource: ");
+               util_dump_resource(stderr, info->dst.resource);
+               fprintf(stderr, "\nsrc resource: ");
+               util_dump_resource(stderr, info->src.resource);
+               fprintf(stderr, "\n");
+       }
+
+       switch (info->dst.format) {
+       case PIPE_FORMAT_S8_UINT:
+               debug_assert(info->mask == PIPE_MASK_S);
+               blit.mask = PIPE_MASK_R;
+               blit.src.format = PIPE_FORMAT_R8_UINT;
+               blit.dst.format = PIPE_FORMAT_R8_UINT;
+               return do_rewritten_blit(ctx, &blit);
+
+       case PIPE_FORMAT_Z32_FLOAT_S8X24_UINT:
+               if (info->mask & PIPE_MASK_Z) {
+                       blit.mask = PIPE_MASK_R;
+                       blit.src.format = PIPE_FORMAT_R32_FLOAT;
+                       blit.dst.format = PIPE_FORMAT_R32_FLOAT;
+                       do_rewritten_blit(ctx, &blit);
+               }
+
+               if (info->mask & PIPE_MASK_S) {
+                       blit.mask = PIPE_MASK_R;
+                       blit.src.format = PIPE_FORMAT_R8_UINT;
+                       blit.dst.format = PIPE_FORMAT_R8_UINT;
+                       blit.src.resource = &fd_resource(info->src.resource)->stencil->base;
+                       blit.dst.resource = &fd_resource(info->dst.resource)->stencil->base;
+                       do_rewritten_blit(ctx, &blit);
+               }
+
+               return true;
+
+       case PIPE_FORMAT_Z16_UNORM:
+               blit.mask = PIPE_MASK_R;
+               blit.src.format = PIPE_FORMAT_R16_UNORM;
+               blit.dst.format = PIPE_FORMAT_R16_UNORM;
+               return do_rewritten_blit(ctx, &blit);
+
+       case PIPE_FORMAT_Z32_UNORM:
+       case PIPE_FORMAT_Z32_FLOAT:
+               debug_assert(info->mask == PIPE_MASK_Z);
+               blit.mask = PIPE_MASK_R;
+               blit.src.format = PIPE_FORMAT_R32_UINT;
+               blit.dst.format = PIPE_FORMAT_R32_UINT;
+               return do_rewritten_blit(ctx, &blit);
+
+       case PIPE_FORMAT_Z24X8_UNORM:
+       case PIPE_FORMAT_Z24_UNORM_S8_UINT:
+               blit.mask = 0;
+               if (info->mask & PIPE_MASK_Z)
+                       blit.mask |= PIPE_MASK_R | PIPE_MASK_G | PIPE_MASK_B;
+               if (info->mask & PIPE_MASK_S)
+                       blit.mask |= PIPE_MASK_A;
+               blit.src.format = PIPE_FORMAT_Z24_UNORM_S8_UINT_AS_R8G8B8A8;
+               blit.dst.format = PIPE_FORMAT_Z24_UNORM_S8_UINT_AS_R8G8B8A8;
+               return fd_blitter_blit(ctx, &blit);
+
+       default:
                return false;
        }
+}
 
-       emit_blit(ctx, info);
+static bool
+handle_compressed_blit(struct fd_context *ctx, const struct pipe_blit_info *info)
+{
+       struct pipe_blit_info blit = *info;
 
-       return true;
+       if (DEBUG_BLIT) {
+               fprintf(stderr, "---- handle_compressed_blit: ");
+               util_dump_blit_info(stderr, info);
+               fprintf(stderr, "\ndst resource: ");
+               util_dump_resource(stderr, info->dst.resource);
+               fprintf(stderr, "\nsrc resource: ");
+               util_dump_resource(stderr, info->src.resource);
+               fprintf(stderr, "\n");
+       }
+
+       if (info->src.format != info->dst.format)
+               return fd_blitter_blit(ctx, info);
+
+       if (util_format_get_blocksize(info->src.format) == 8) {
+               blit.src.format = blit.dst.format = PIPE_FORMAT_R16G16B16A16_UINT;
+       } else {
+               debug_assert(util_format_get_blocksize(info->src.format) == 16);
+               blit.src.format = blit.dst.format = PIPE_FORMAT_R32G32B32A32_UINT;
+       }
+
+       int bw = util_format_get_blockwidth(info->src.format);
+       int bh = util_format_get_blockheight(info->src.format);
+
+       /* NOTE: x/y *must* be aligned to block boundary (ie. in
+        * glCompressedTexSubImage2D()) but width/height may not
+        * be:
+        */
+
+       debug_assert((blit.src.box.x % bw) == 0);
+       debug_assert((blit.src.box.y % bh) == 0);
+
+       blit.src.box.x /= bw;
+       blit.src.box.y /= bh;
+       blit.src.box.width  = DIV_ROUND_UP(blit.src.box.width, bw);
+       blit.src.box.height = DIV_ROUND_UP(blit.src.box.height, bh);
+
+       debug_assert((blit.dst.box.x % bw) == 0);
+       debug_assert((blit.dst.box.y % bh) == 0);
+
+       blit.dst.box.x /= bw;
+       blit.dst.box.y /= bh;
+       blit.dst.box.width  = DIV_ROUND_UP(blit.dst.box.width, bw);
+       blit.dst.box.height = DIV_ROUND_UP(blit.dst.box.height, bh);
+
+       return do_rewritten_blit(ctx, &blit);
+}
+
+static bool
+fd6_blit(struct fd_context *ctx, const struct pipe_blit_info *info)
+{
+       if (info->mask & PIPE_MASK_ZS)
+               return handle_zs_blit(ctx, info);
+       if (util_format_is_compressed(info->src.format) ||
+                       util_format_is_compressed(info->dst.format))
+               return handle_compressed_blit(ctx, info);
+
+       return handle_rgba_blit(ctx, info);
 }
 
 void
@@ -573,6 +899,12 @@ fd6_blitter_init(struct pipe_context *pctx)
 unsigned
 fd6_tile_mode(const struct pipe_resource *tmpl)
 {
+       /* if the mipmap level 0 is still too small to be tiled, then don't
+        * bother pretending:
+        */
+       if (fd_resource_level_linear(tmpl, 0))
+               return TILE6_LINEAR;
+
        /* basically just has to be a format we can blit, so uploads/downloads
         * via linear staging buffer works:
         */