etnaviv: GC7000: BLT engine blitting support

Add an implemenation of key clear_blit functions using the BLT engine
that replaced the RS on GC7000.

Also set level->size correctly for imported resources. This is important
for the BLT resolve-in-place path to work for them.

Signed-off-by: Wladimir J. van der Laan <[email protected]>
Reviewed-by: Christian Gmeiner <[email protected]>

9 files changed, 684 insertions, 3 deletions

diff --git a/src/gallium/drivers/etnaviv/Makefile.sources b/src/gallium/drivers/etnaviv/Makefile.sources
index aafcc380aa5..78029add95a 100644
--- a/src/gallium/drivers/etnaviv/Makefile.sources
+++ b/src/gallium/drivers/etnaviv/Makefile.sources
@@ -4,12 +4,15 @@ C_SOURCES :=  \
 	hw/common_3d.xml.h \
 	hw/isa.xml.h \
 	hw/state_3d.xml.h \
+	hw/state_blt.xml.h \
 	hw/state.xml.h \
 	\
 	etnaviv_asm.c \
 	etnaviv_asm.h \
 	etnaviv_blend.c \
 	etnaviv_blend.h \
+	etnaviv_blt.c \
+	etnaviv_blt.h \
 	etnaviv_clear_blit.c \
 	etnaviv_clear_blit.h \
 	etnaviv_compiler.c \
diff --git a/src/gallium/drivers/etnaviv/etnaviv_blt.c b/src/gallium/drivers/etnaviv/etnaviv_blt.c
new file mode 100644
index 00000000000..ec3eac9b2a3
--- /dev/null
+++ b/src/gallium/drivers/etnaviv/etnaviv_blt.c
@@ -0,0 +1,562 @@
+/*
+ * Copyright (c) 2017 Etnaviv Project
+ * Copyright (C) 2017 Zodiac Inflight Innovations
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sub license,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial portions
+ * of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Wladimir J. van der Laan <[email protected]>
+ */
+#include "etnaviv_blt.h"
+
+#include "etnaviv_emit.h"
+#include "etnaviv_clear_blit.h"
+#include "etnaviv_context.h"
+#include "etnaviv_emit.h"
+#include "etnaviv_format.h"
+#include "etnaviv_resource.h"
+#include "etnaviv_surface.h"
+#include "etnaviv_translate.h"
+
+#include "util/u_math.h"
+#include "pipe/p_defines.h"
+#include "pipe/p_state.h"
+#include "util/u_blitter.h"
+#include "util/u_inlines.h"
+#include "util/u_memory.h"
+#include "util/u_surface.h"
+
+#include "hw/common_3d.xml.h"
+#include "hw/state_blt.xml.h"
+#include "hw/common.xml.h"
+
+#include <assert.h>
+
+/* Currently, used BLT formats overlap 100% with RS formats */
+#define translate_blt_format translate_rs_format
+
+static inline uint32_t
+blt_compute_stride_bits(const struct blt_imginfo *img)
+{
+   return VIVS_BLT_DEST_STRIDE_TILING(img->tiling == ETNA_LAYOUT_LINEAR ? 0 : 3) | /* 1/3? */
+          VIVS_BLT_DEST_STRIDE_FORMAT(img->format) |
+          VIVS_BLT_DEST_STRIDE_STRIDE(img->stride);
+}
+
+static inline uint32_t
+blt_compute_img_config_bits(const struct blt_imginfo *img, bool for_dest)
+{
+   uint32_t tiling_bits = 0;
+   if (img->tiling == ETNA_LAYOUT_SUPER_TILED) {
+      tiling_bits |= for_dest ? BLT_IMAGE_CONFIG_TO_SUPER_TILED : BLT_IMAGE_CONFIG_FROM_SUPER_TILED;
+   }
+
+   return BLT_IMAGE_CONFIG_CACHE_MODE(img->cache_mode) |
+          COND(img->use_ts, BLT_IMAGE_CONFIG_TS) |
+          COND(img->compressed, BLT_IMAGE_CONFIG_COMPRESSION) |
+          BLT_IMAGE_CONFIG_COMPRESSION_FORMAT(img->compress_fmt) |
+          COND(for_dest, BLT_IMAGE_CONFIG_UNK22) |
+          BLT_IMAGE_CONFIG_SWIZ_R(0) | /* not used? */
+          BLT_IMAGE_CONFIG_SWIZ_G(1) |
+          BLT_IMAGE_CONFIG_SWIZ_B(2) |
+          BLT_IMAGE_CONFIG_SWIZ_A(3) |
+          tiling_bits;
+}
+
+static inline uint32_t
+blt_compute_swizzle_bits(const struct blt_imginfo *img, bool for_dest)
+{
+   uint32_t swiz = VIVS_BLT_SWIZZLE_SRC_R(img->swizzle[0]) |
+                   VIVS_BLT_SWIZZLE_SRC_G(img->swizzle[1]) |
+                   VIVS_BLT_SWIZZLE_SRC_B(img->swizzle[2]) |
+                   VIVS_BLT_SWIZZLE_SRC_A(img->swizzle[3]);
+   return for_dest ? (swiz << 12) : swiz;
+}
+
+/* Clear (part of) an image */
+static void
+emit_blt_clearimage(struct etna_cmd_stream *stream, const struct blt_clear_op *op)
+{
+   etna_cmd_stream_reserve(stream, 64*2); /* Make sure BLT op doesn't get broken up */
+
+   etna_set_state(stream, VIVS_BLT_ENABLE, 0x00000001);
+   assert(op->dest.bpp);
+   etna_set_state(stream, VIVS_BLT_CONFIG, VIVS_BLT_CONFIG_CLEAR_BPP(op->dest.bpp-1));
+   /* NB: blob sets format to 1 in dest/src config for clear, and the swizzle to RRRR.
+    * does this matter? It seems to just be ignored. But if we run into issues with BLT
+    * behaving stragely, it's something to look at.
+    */
+   etna_set_state(stream, VIVS_BLT_DEST_STRIDE, blt_compute_stride_bits(&op->dest));
+   etna_set_state(stream, VIVS_BLT_DEST_CONFIG, blt_compute_img_config_bits(&op->dest, true));
+   etna_set_state_reloc(stream, VIVS_BLT_DEST_ADDR, &op->dest.addr);
+   etna_set_state(stream, VIVS_BLT_SRC_STRIDE, blt_compute_stride_bits(&op->dest));
+   etna_set_state(stream, VIVS_BLT_SRC_CONFIG, blt_compute_img_config_bits(&op->dest, false));
+   etna_set_state_reloc(stream, VIVS_BLT_SRC_ADDR, &op->dest.addr);
+   etna_set_state(stream, VIVS_BLT_DEST_POS, VIVS_BLT_DEST_POS_X(op->rect_x) | VIVS_BLT_DEST_POS_Y(op->rect_y));
+   etna_set_state(stream, VIVS_BLT_IMAGE_SIZE, VIVS_BLT_IMAGE_SIZE_WIDTH(op->rect_w) | VIVS_BLT_IMAGE_SIZE_HEIGHT(op->rect_h));
+   etna_set_state(stream, VIVS_BLT_CLEAR_COLOR0, op->clear_value[0]);
+   etna_set_state(stream, VIVS_BLT_CLEAR_COLOR1, op->clear_value[1]);
+   etna_set_state(stream, VIVS_BLT_CLEAR_BITS0, op->clear_bits[0]);
+   etna_set_state(stream, VIVS_BLT_CLEAR_BITS1, op->clear_bits[1]);
+   if (op->dest.use_ts) {
+      etna_set_state_reloc(stream, VIVS_BLT_DEST_TS, &op->dest.ts_addr);
+      etna_set_state_reloc(stream, VIVS_BLT_SRC_TS, &op->dest.ts_addr);
+      etna_set_state(stream, VIVS_BLT_DEST_TS_CLEAR_VALUE0, op->dest.ts_clear_value[0]);
+      etna_set_state(stream, VIVS_BLT_DEST_TS_CLEAR_VALUE1, op->dest.ts_clear_value[1]);
+      etna_set_state(stream, VIVS_BLT_SRC_TS_CLEAR_VALUE0, op->dest.ts_clear_value[0]);
+      etna_set_state(stream, VIVS_BLT_SRC_TS_CLEAR_VALUE1, op->dest.ts_clear_value[1]);
+   }
+   etna_set_state(stream, VIVS_BLT_SET_COMMAND, 0x00000003);
+   etna_set_state(stream, VIVS_BLT_COMMAND, VIVS_BLT_COMMAND_COMMAND_CLEAR_IMAGE);
+   etna_set_state(stream, VIVS_BLT_SET_COMMAND, 0x00000003);
+   etna_set_state(stream, VIVS_BLT_ENABLE, 0x00000000);
+}
+
+/* Copy (a subset of) an image to another image. */
+static void
+emit_blt_copyimage(struct etna_cmd_stream *stream, const struct blt_imgcopy_op *op)
+{
+   etna_cmd_stream_reserve(stream, 64*2); /* Never allow BLT sequences to be broken up */
+
+   etna_set_state(stream, VIVS_BLT_ENABLE, 0x00000001);
+   etna_set_state(stream, VIVS_BLT_CONFIG,
+           VIVS_BLT_CONFIG_SRC_ENDIAN(op->src.endian_mode) |
+           VIVS_BLT_CONFIG_DEST_ENDIAN(op->dest.endian_mode));
+   etna_set_state(stream, VIVS_BLT_SRC_STRIDE, blt_compute_stride_bits(&op->src));
+   etna_set_state(stream, VIVS_BLT_SRC_CONFIG, blt_compute_img_config_bits(&op->src, false));
+   etna_set_state(stream, VIVS_BLT_SWIZZLE,
+           blt_compute_swizzle_bits(&op->src, false) |
+           blt_compute_swizzle_bits(&op->dest, true));
+   etna_set_state(stream, VIVS_BLT_UNK140A0, 0x00040004);
+   etna_set_state(stream, VIVS_BLT_UNK1409C, 0x00400040);
+   if (op->src.use_ts) {
+      etna_set_state_reloc(stream, VIVS_BLT_SRC_TS, &op->src.ts_addr);
+      etna_set_state(stream, VIVS_BLT_SRC_TS_CLEAR_VALUE0, op->src.ts_clear_value[0]);
+      etna_set_state(stream, VIVS_BLT_SRC_TS_CLEAR_VALUE1, op->src.ts_clear_value[1]);
+   }
+   etna_set_state_reloc(stream, VIVS_BLT_SRC_ADDR, &op->src.addr);
+   etna_set_state(stream, VIVS_BLT_DEST_STRIDE, blt_compute_stride_bits(&op->dest));
+   etna_set_state(stream, VIVS_BLT_DEST_CONFIG,
+         blt_compute_img_config_bits(&op->dest, true) |
+         COND(op->flip_y, BLT_IMAGE_CONFIG_FLIP_Y));
+   assert(!op->dest.use_ts); /* Dest TS path doesn't work for copies? */
+   if (op->dest.use_ts) {
+      etna_set_state_reloc(stream, VIVS_BLT_DEST_TS, &op->dest.ts_addr);
+      etna_set_state(stream, VIVS_BLT_DEST_TS_CLEAR_VALUE0, op->dest.ts_clear_value[0]);
+      etna_set_state(stream, VIVS_BLT_DEST_TS_CLEAR_VALUE1, op->dest.ts_clear_value[1]);
+   }
+   etna_set_state_reloc(stream, VIVS_BLT_DEST_ADDR, &op->dest.addr);
+   etna_set_state(stream, VIVS_BLT_SRC_POS, VIVS_BLT_DEST_POS_X(op->src_x) | VIVS_BLT_DEST_POS_Y(op->src_y));
+   etna_set_state(stream, VIVS_BLT_DEST_POS, VIVS_BLT_DEST_POS_X(op->dest_x) | VIVS_BLT_DEST_POS_Y(op->dest_y));
+   etna_set_state(stream, VIVS_BLT_IMAGE_SIZE, VIVS_BLT_IMAGE_SIZE_WIDTH(op->rect_w) | VIVS_BLT_IMAGE_SIZE_HEIGHT(op->rect_h));
+   etna_set_state(stream, VIVS_BLT_UNK14058, 0xffffffff);
+   etna_set_state(stream, VIVS_BLT_UNK1405C, 0xffffffff);
+   etna_set_state(stream, VIVS_BLT_SET_COMMAND, 0x00000003);
+   etna_set_state(stream, VIVS_BLT_COMMAND, VIVS_BLT_COMMAND_COMMAND_COPY_IMAGE);
+   etna_set_state(stream, VIVS_BLT_SET_COMMAND, 0x00000003);
+   etna_set_state(stream, VIVS_BLT_ENABLE, 0x00000000);
+}
+
+/* Emit in-place resolve using BLT. */
+static void
+emit_blt_inplace(struct etna_cmd_stream *stream, const struct blt_inplace_op *op)
+{
+   assert(op->bpp > 0 && util_is_power_of_two(op->bpp));
+   etna_cmd_stream_reserve(stream, 64*2); /* Never allow BLT sequences to be broken up */
+   etna_set_state(stream, VIVS_BLT_ENABLE, 0x00000001);
+   etna_set_state(stream, VIVS_BLT_CONFIG,
+         VIVS_BLT_CONFIG_INPLACE_CACHE_MODE(op->cache_mode) |
+         VIVS_BLT_CONFIG_INPLACE_BOTH |
+         (util_logbase2(op->bpp) << VIVS_BLT_CONFIG_INPLACE_BPP__SHIFT));
+   etna_set_state(stream, VIVS_BLT_DEST_TS_CLEAR_VALUE0, op->ts_clear_value[0]);
+   etna_set_state(stream, VIVS_BLT_DEST_TS_CLEAR_VALUE1, op->ts_clear_value[1]);
+   etna_set_state_reloc(stream, VIVS_BLT_DEST_ADDR, &op->addr);
+   etna_set_state_reloc(stream, VIVS_BLT_DEST_TS, &op->ts_addr);
+   etna_set_state(stream, 0x14068, op->num_tiles);
+   etna_set_state(stream, VIVS_BLT_SET_COMMAND, 0x00000003);
+   etna_set_state(stream, VIVS_BLT_COMMAND, 0x00000004);
+   etna_set_state(stream, VIVS_BLT_SET_COMMAND, 0x00000003);
+   etna_set_state(stream, VIVS_BLT_ENABLE, 0x00000000);
+}
+
+static void
+etna_blit_clear_color_blt(struct pipe_context *pctx, struct pipe_surface *dst,
+                      const union pipe_color_union *color)
+{
+   struct etna_context *ctx = etna_context(pctx);
+   struct etna_surface *surf = etna_surface(dst);
+   uint32_t new_clear_value = etna_clear_blit_pack_rgba(surf->base.format, color->f);
+
+   struct etna_resource *res = etna_resource(surf->base.texture);
+   struct blt_clear_op clr = {};
+   clr.dest.addr.bo = res->bo;
+   clr.dest.addr.offset = surf->surf.offset;
+   clr.dest.addr.flags = ETNA_RELOC_WRITE;
+   clr.dest.bpp = util_format_get_blocksize(surf->base.format);
+   clr.dest.stride = surf->surf.stride;
+   /* TODO: color compression
+   clr.dest.compressed = 1;
+   clr.dest.compress_fmt = 3;
+   */
+   clr.dest.tiling = res->layout;
+   clr.dest.cache_mode = TS_CACHE_MODE_128; /* TODO: cache modes */
+
+   if (surf->surf.ts_size) {
+      clr.dest.use_ts = 1;
+      clr.dest.ts_addr.bo = res->ts_bo;
+      clr.dest.ts_addr.offset = 0;
+      clr.dest.ts_addr.flags = ETNA_RELOC_WRITE;
+      clr.dest.ts_clear_value[0] = new_clear_value;
+      clr.dest.ts_clear_value[1] = new_clear_value;
+   }
+
+   clr.clear_value[0] = new_clear_value;
+   clr.clear_value[1] = new_clear_value;
+   clr.clear_bits[0] = 0xffffffff; /* TODO: Might want to clear only specific channels? */
+   clr.clear_bits[1] = 0xffffffff;
+   clr.rect_x = 0; /* What about scissors? */
+   clr.rect_y = 0;
+   clr.rect_w = surf->surf.width;
+   clr.rect_h = surf->surf.height;
+
+   emit_blt_clearimage(ctx->stream, &clr);
+
+   /* This made the TS valid */
+   if (surf->surf.ts_size) {
+      ctx->framebuffer.TS_COLOR_CLEAR_VALUE = new_clear_value;
+      surf->level->ts_valid = true;
+   }
+
+   surf->level->clear_value = new_clear_value;
+   resource_written(ctx, surf->base.texture);
+   etna_resource(surf->base.texture)->seqno++;
+}
+
+static void
+etna_blit_clear_zs_blt(struct pipe_context *pctx, struct pipe_surface *dst,
+                   unsigned buffers, double depth, unsigned stencil)
+{
+   struct etna_context *ctx = etna_context(pctx);
+   struct etna_surface *surf = etna_surface(dst);
+   uint32_t new_clear_value = translate_clear_depth_stencil(surf->base.format, depth, stencil);
+   uint32_t new_clear_bits = 0, clear_bits_depth, clear_bits_stencil;
+
+   /* Get the channels to clear */
+   switch (surf->base.format) {
+   case PIPE_FORMAT_Z16_UNORM:
+      clear_bits_depth = 0xffffffff;
+      clear_bits_stencil = 0x00000000;
+      break;
+   case PIPE_FORMAT_X8Z24_UNORM:
+   case PIPE_FORMAT_S8_UINT_Z24_UNORM:
+      clear_bits_depth = 0xffffff00;
+      clear_bits_stencil = 0x000000ff;
+      break;
+   default:
+      clear_bits_depth = clear_bits_stencil = 0xffffffff;
+      break;
+   }
+
+   if (buffers & PIPE_CLEAR_DEPTH)
+      new_clear_bits |= clear_bits_depth;
+   if (buffers & PIPE_CLEAR_STENCIL)
+      new_clear_bits |= clear_bits_stencil;
+
+   /* TODO unduplicate this */
+   struct etna_resource *res = etna_resource(surf->base.texture);
+   struct blt_clear_op clr = {};
+   clr.dest.addr.bo = res->bo;
+   clr.dest.addr.offset = surf->surf.offset;
+   clr.dest.addr.flags = ETNA_RELOC_WRITE;
+   clr.dest.bpp = util_format_get_blocksize(surf->base.format);
+   clr.dest.stride = surf->surf.stride;
+#if 0 /* TODO depth compression */
+   clr.dest.compressed = 1;
+   clr.dest.compress_fmt = COLOR_COMPRESSION_FORMAT_D24S8;
+#endif
+   clr.dest.tiling = res->layout;
+   clr.dest.cache_mode = TS_CACHE_MODE_128; /* TODO: cache modes */
+
+   if (surf->surf.ts_size) {
+      clr.dest.use_ts = 1;
+      clr.dest.ts_addr.bo = res->ts_bo;
+      clr.dest.ts_addr.offset = 0;
+      clr.dest.ts_addr.flags = ETNA_RELOC_WRITE;
+      clr.dest.ts_clear_value[0] = new_clear_value;
+      clr.dest.ts_clear_value[1] = new_clear_value;
+   }
+
+   clr.clear_value[0] = new_clear_value;
+   clr.clear_value[1] = new_clear_value;
+   clr.clear_bits[0] = new_clear_bits;
+   clr.clear_bits[1] = new_clear_bits;
+   clr.rect_x = 0; /* What about scissors? */
+   clr.rect_y = 0;
+   clr.rect_w = surf->surf.width;
+   clr.rect_h = surf->surf.height;
+
+   emit_blt_clearimage(ctx->stream, &clr);
+
+   /* This made the TS valid */
+   if (surf->surf.ts_size) {
+      ctx->framebuffer.TS_DEPTH_CLEAR_VALUE = new_clear_value;
+      surf->level->ts_valid = true;
+   }
+
+   surf->level->clear_value = new_clear_value;
+   resource_written(ctx, surf->base.texture);
+   etna_resource(surf->base.texture)->seqno++;
+}
+
+static void
+etna_clear_blt(struct pipe_context *pctx, unsigned buffers,
+           const union pipe_color_union *color, double depth, unsigned stencil)
+{
+   struct etna_context *ctx = etna_context(pctx);
+
+   etna_set_state(ctx->stream, VIVS_GL_FLUSH_CACHE, 0x00000c23);
+   etna_set_state(ctx->stream, VIVS_TS_FLUSH_CACHE, VIVS_TS_FLUSH_CACHE_FLUSH);
+
+   if (buffers & PIPE_CLEAR_COLOR) {
+      for (int idx = 0; idx < ctx->framebuffer_s.nr_cbufs; ++idx) {
+         etna_blit_clear_color_blt(pctx, ctx->framebuffer_s.cbufs[idx],
+                               &color[idx]);
+      }
+   }
+
+   if ((buffers & PIPE_CLEAR_DEPTHSTENCIL) && ctx->framebuffer_s.zsbuf != NULL)
+      etna_blit_clear_zs_blt(pctx, ctx->framebuffer_s.zsbuf, buffers, depth, stencil);
+
+   etna_stall(ctx->stream, SYNC_RECIPIENT_RA, SYNC_RECIPIENT_BLT);
+
+   if ((buffers & PIPE_CLEAR_COLOR) && (buffers & PIPE_CLEAR_DEPTH))
+      etna_set_state(ctx->stream, VIVS_GL_FLUSH_CACHE, 0x00000c23);
+   else
+      etna_set_state(ctx->stream, VIVS_GL_FLUSH_CACHE, 0x00000002);
+}
+
+
+static bool
+etna_try_blt_blit(struct pipe_context *pctx,
+                 const struct pipe_blit_info *blit_info)
+{
+   struct etna_context *ctx = etna_context(pctx);
+   struct etna_resource *src = etna_resource(blit_info->src.resource);
+   struct etna_resource *dst = etna_resource(blit_info->dst.resource);
+   int msaa_xscale = 1, msaa_yscale = 1;
+
+   /* Ensure that the level is valid */
+   assert(blit_info->src.level <= src->base.last_level);
+   assert(blit_info->dst.level <= dst->base.last_level);
+
+   if (!translate_samples_to_xyscale(src->base.nr_samples, &msaa_xscale, &msaa_yscale, NULL))
+      return FALSE;
+
+   /* The width/height are in pixels; they do not change as a result of
+    * multi-sampling. So, when blitting from a 4x multisampled surface
+    * to a non-multisampled surface, the width and height will be
+    * identical. As we do not support scaling, reject different sizes.
+    * TODO: could handle 2x downsample here with emit_blt_genmipmaps */
+   if (blit_info->dst.box.width != blit_info->src.box.width ||
+       blit_info->dst.box.height != abs(blit_info->src.box.height)) { /* allow y flip for glTexImage2D */
+      DBG("scaling requested: source %dx%d destination %dx%d",
+          blit_info->src.box.width, blit_info->src.box.height,
+          blit_info->dst.box.width, blit_info->dst.box.height);
+      return FALSE;
+   }
+
+   /* No masks - not sure if BLT can copy individual channels */
+   unsigned mask = util_format_get_mask(blit_info->dst.format);
+   if ((blit_info->mask & mask) != mask) {
+      DBG("sub-mask requested: 0x%02x vs format mask 0x%02x", blit_info->mask, mask);
+      return FALSE;
+   }
+
+   /* TODO: 1 byte per pixel formats aren't handled by etna_compatible_rs_format nor
+    * translate_rs_format.
+    * Also this should be smarter about format conversions; etna_compatible_rs_format
+    * assumes all 2-byte pixel format are laid out as 4444, all 4-byte pixel formats
+    * are 8888.
+    */
+   unsigned src_format = etna_compatible_rs_format(blit_info->src.format);
+   unsigned dst_format = etna_compatible_rs_format(blit_info->dst.format);
+   if (translate_blt_format(src_format) == ETNA_NO_MATCH ||
+       translate_blt_format(dst_format) == ETNA_NO_MATCH ||
+       blit_info->scissor_enable ||
+       blit_info->dst.box.depth != blit_info->src.box.depth ||
+       blit_info->dst.box.depth != 1) {
+      return FALSE;
+   }
+
+   /* Ensure that the Z coordinate is sane */
+   assert(dst->base.target == PIPE_TEXTURE_CUBE || blit_info->dst.box.z == 0);
+   assert(src->base.target == PIPE_TEXTURE_CUBE || blit_info->src.box.z == 0);
+   assert(blit_info->src.box.z < src->base.array_size);
+   assert(blit_info->dst.box.z < dst->base.array_size);
+
+   struct etna_resource_level *src_lev = &src->levels[blit_info->src.level];
+   struct etna_resource_level *dst_lev = &dst->levels[blit_info->dst.level];
+
+   /* Kick off BLT here */
+   if (src == dst) {
+      /* Resolve-in-place */
+      assert(!memcmp(&blit_info->src, &blit_info->dst, sizeof(blit_info->src)));
+      if (!src_lev->ts_size || !src_lev->ts_valid) /* No TS, no worries */
+         return TRUE;
+      struct blt_inplace_op op = {};
+
+      op.addr.bo = src->bo;
+      op.addr.offset = src_lev->offset + blit_info->src.box.z * src_lev->layer_stride;
+      op.addr.flags = ETNA_RELOC_READ | ETNA_RELOC_WRITE;
+      op.ts_addr.bo = src->ts_bo;
+      op.ts_addr.offset = src_lev->ts_offset + blit_info->src.box.z * src_lev->ts_layer_stride;
+      op.ts_addr.flags = ETNA_RELOC_READ;
+      op.ts_clear_value[0] = src_lev->clear_value;
+      op.ts_clear_value[1] = src_lev->clear_value;
+      op.cache_mode = TS_CACHE_MODE_128; /* TODO: cache modes */
+      op.num_tiles = src_lev->size / 128; /* TODO: cache modes */
+      op.bpp = util_format_get_blocksize(src->base.format);
+
+      etna_set_state(ctx->stream, VIVS_GL_FLUSH_CACHE, 0x00000c23);
+      etna_set_state(ctx->stream, VIVS_TS_FLUSH_CACHE, 0x00000001);
+      emit_blt_inplace(ctx->stream, &op);
+   } else {
+      /* Copy op */
+      struct blt_imgcopy_op op = {};
+
+      op.src.addr.bo = src->bo;
+      op.src.addr.offset = src_lev->offset + blit_info->src.box.z * src_lev->layer_stride;
+      op.src.addr.flags = ETNA_RELOC_READ;
+      op.src.format = translate_blt_format(src_format);
+      op.src.stride = src_lev->stride;
+      op.src.tiling = src->layout;
+      op.src.cache_mode = TS_CACHE_MODE_128; /* TODO: cache modes */
+      const struct util_format_description *src_format_desc =
+         util_format_description(blit_info->src.format);
+      for (unsigned x=0; x<4; ++x)
+         op.src.swizzle[x] = src_format_desc->swizzle[x];
+
+      if (src_lev->ts_size && src_lev->ts_valid) {
+         op.src.use_ts = 1;
+         op.src.ts_addr.bo = src->ts_bo;
+         op.src.ts_addr.offset = src_lev->ts_offset + blit_info->src.box.z * src_lev->ts_layer_stride;
+         op.src.ts_addr.flags = ETNA_RELOC_READ;
+         op.src.ts_clear_value[0] = src_lev->clear_value;
+         op.src.ts_clear_value[1] = src_lev->clear_value;
+      }
+
+      op.dest.addr.bo = dst->bo;
+      op.dest.addr.offset = dst_lev->offset + blit_info->dst.box.z * dst_lev->layer_stride;
+      op.dest.addr.flags = ETNA_RELOC_WRITE;
+      op.dest.format = translate_blt_format(dst_format);
+      op.dest.stride = dst_lev->stride;
+      /* TODO color compression
+      op.dest.compressed = 1;
+      op.dest.compress_fmt = 3;
+      */
+      op.dest.tiling = dst->layout;
+      op.dest.cache_mode = TS_CACHE_MODE_128; /* TODO cache modes */
+      const struct util_format_description *dst_format_desc =
+         util_format_description(blit_info->dst.format);
+      for (unsigned x=0; x<4; ++x)
+         op.dest.swizzle[x] = dst_format_desc->swizzle[x];
+
+      op.dest_x = blit_info->dst.box.x;
+      op.dest_y = blit_info->dst.box.y;
+      op.src_x = blit_info->src.box.x;
+      op.src_y = blit_info->src.box.y;
+      op.rect_w = blit_info->dst.box.width;
+      op.rect_h = blit_info->dst.box.height;
+
+      if (blit_info->src.box.height < 0) { /* flipped? fix up base y */
+         op.flip_y = 1;
+         op.src_y += blit_info->src.box.height;
+      }
+
+      assert(op.src_x < src_lev->padded_width);
+      assert(op.src_y < src_lev->padded_height);
+      assert((op.src_x + op.rect_w) <= src_lev->padded_width);
+      assert((op.src_y + op.rect_h) <= src_lev->padded_height);
+      assert(op.dest_x < dst_lev->padded_width);
+      assert(op.dest_y < dst_lev->padded_height);
+      assert((op.dest_x + op.rect_w) <= dst_lev->padded_width);
+      assert((op.dest_y + op.rect_h) <= dst_lev->padded_height);
+
+      etna_set_state(ctx->stream, VIVS_GL_FLUSH_CACHE, 0x00000c23);
+      etna_set_state(ctx->stream, VIVS_TS_FLUSH_CACHE, 0x00000001);
+      emit_blt_copyimage(ctx->stream, &op);
+   }
+
+   /* Make FE wait for BLT, in case we want to do something with the image next.
+    * This probably shouldn't be here, and depend on what is done with the resource.
+    */
+   etna_stall(ctx->stream, SYNC_RECIPIENT_FE, SYNC_RECIPIENT_BLT);
+   etna_set_state(ctx->stream, VIVS_GL_FLUSH_CACHE, 0x00000c23);
+
+   resource_written(ctx, &dst->base);
+   dst->seqno++;
+   dst_lev->ts_valid = false;
+
+   return TRUE;
+}
+
+static void
+etna_blit_blt(struct pipe_context *pctx, const struct pipe_blit_info *blit_info)
+{
+   struct etna_context *ctx = etna_context(pctx);
+   struct pipe_blit_info info = *blit_info;
+
+   if (info.src.resource->nr_samples > 1 &&
+       info.dst.resource->nr_samples <= 1 &&
+       !util_format_is_depth_or_stencil(info.src.resource->format) &&
+       !util_format_is_pure_integer(info.src.resource->format)) {
+      DBG("color resolve unimplemented");
+      return;
+   }
+
+   if (etna_try_blt_blit(pctx, blit_info))
+      return;
+
+   if (util_try_blit_via_copy_region(pctx, blit_info))
+      return;
+
+   if (info.mask & PIPE_MASK_S) {
+      DBG("cannot blit stencil, skipping");
+      info.mask &= ~PIPE_MASK_S;
+   }
+
+   if (!util_blitter_is_blit_supported(ctx->blitter, &info)) {
+      DBG("blit unsupported %s -> %s",
+          util_format_short_name(info.src.resource->format),
+          util_format_short_name(info.dst.resource->format));
+      return;
+   }
+
+   etna_blit_save_state(ctx);
+   util_blitter_blit(ctx->blitter, &info);
+}
+
+void
+etna_clear_blit_blt_init(struct pipe_context *pctx)
+{
+   DBG("etnaviv: Using BLT blit engine\n");
+   pctx->clear = etna_clear_blt;
+   pctx->blit = etna_blit_blt;
+}
diff --git a/src/gallium/drivers/etnaviv/etnaviv_blt.h b/src/gallium/drivers/etnaviv/etnaviv_blt.h
new file mode 100644
index 00000000000..6f1a3c419d2
--- /dev/null
+++ b/src/gallium/drivers/etnaviv/etnaviv_blt.h
@@ -0,0 +1,100 @@
+/*
+ * Copyright (c) 2017 Etnaviv Project
+ * Copyright (C) 2017 Zodiac Inflight Innovations
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sub license,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial portions
+ * of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Wladimir J. van der Laan <[email protected]>
+ */
+#ifndef H_ETNAVIV_BLT
+#define H_ETNAVIV_BLT
+
+#include "etnaviv_tiling.h"
+
+#include <stdbool.h>
+#include <etnaviv_drmif.h>
+
+struct pipe_context;
+
+/* src/dest info for image operations */
+struct blt_imginfo
+{
+   unsigned compressed:1;
+   unsigned use_ts:1;
+   struct etna_reloc addr;
+   struct etna_reloc ts_addr;
+   uint32_t format; /* BLT_FORMAT_* */
+   uint32_t stride;
+   uint32_t compress_fmt; /* COLOR_COMPRESSION_FORMAT_* */
+   enum etna_surface_layout tiling; /* ETNA_LAYOUT_* */
+   uint32_t ts_clear_value[2];
+   uint8_t swizzle[4]; /* TEXTURE_SWIZZLE_* */
+   uint8_t cache_mode; /* TS_CACHE_MODE_* */
+   uint8_t endian_mode; /* ENDIAN_MODE_* */
+   uint8_t bpp; /* # bytes per pixel 1/2/4/8 - only used for CLEAR_IMAGE */
+};
+
+/** (Partial) image clear operation.
+ */
+struct blt_clear_op
+{
+   struct blt_imginfo dest;
+   uint32_t clear_value[2];
+   uint32_t clear_bits[2]; /* bit mask of bits to clear */
+   uint16_t rect_x;
+   uint16_t rect_y;
+   uint16_t rect_w;
+   uint16_t rect_h;
+};
+
+/** Copy image operation.
+ */
+struct blt_imgcopy_op
+{
+   unsigned flip_y:1;
+   struct blt_imginfo src;
+   struct blt_imginfo dest;
+   uint16_t src_x;
+   uint16_t src_y;
+   uint16_t dest_x;
+   uint16_t dest_y;
+   uint16_t rect_w;
+   uint16_t rect_h;
+};
+
+/** Resolve-in-place operation.
+ * Fills unfilled tiles.
+ */
+struct blt_inplace_op
+{
+   struct etna_reloc addr;
+   struct etna_reloc ts_addr;
+   uint32_t ts_clear_value[2];
+   uint32_t num_tiles;
+   uint8_t cache_mode; /* TS_CACHE_MODE_* */
+   uint8_t bpp;
+};
+
+/* Context initialization for BLT clear_blit functions. */
+void
+etna_clear_blit_blt_init(struct pipe_context *pctx);
+
+#endif
diff --git a/src/gallium/drivers/etnaviv/etnaviv_clear_blit.c b/src/gallium/drivers/etnaviv/etnaviv_clear_blit.c
index ae5300a24d4..45c30cbf507 100644
--- a/src/gallium/drivers/etnaviv/etnaviv_clear_blit.c
+++ b/src/gallium/drivers/etnaviv/etnaviv_clear_blit.c
@@ -28,6 +28,7 @@
 
 #include "hw/common.xml.h"
 
+#include "etnaviv_blt.h"
 #include "etnaviv_context.h"
 #include "etnaviv_emit.h"
 #include "etnaviv_format.h"
@@ -216,10 +217,15 @@ etna_copy_resource_box(struct pipe_context *pctx, struct pipe_resource *dst,
 void
 etna_clear_blit_init(struct pipe_context *pctx)
 {
+   struct etna_context *ctx = etna_context(pctx);
+
    pctx->clear_render_target = etna_clear_render_target;
    pctx->clear_depth_stencil = etna_clear_depth_stencil;
    pctx->resource_copy_region = etna_resource_copy_region;
    pctx->flush_resource = etna_flush_resource;
 
-   etna_clear_blit_rs_init(pctx);
+   if (ctx->specs.use_blt)
+      etna_clear_blit_blt_init(pctx);
+   else
+      etna_clear_blit_rs_init(pctx);
 }
diff --git a/src/gallium/drivers/etnaviv/etnaviv_context.c b/src/gallium/drivers/etnaviv/etnaviv_context.c
index 5aa9c66ed16..56ab3958a71 100644
--- a/src/gallium/drivers/etnaviv/etnaviv_context.c
+++ b/src/gallium/drivers/etnaviv/etnaviv_context.c
@@ -349,8 +349,10 @@ etna_cmd_stream_reset_notify(struct etna_cmd_stream *stream, void *priv)
    etna_set_state(stream, VIVS_GL_UNK03854, 0x00000000);
    etna_set_state(stream, VIVS_PS_CONTROL_EXT, 0x00000000);
 
-   /* Enable SINGLE_BUFFER for resolve, if supported */
-   etna_set_state(stream, VIVS_RS_SINGLE_BUFFER, COND(ctx->specs.single_buffer, VIVS_RS_SINGLE_BUFFER_ENABLE));
+   if (!ctx->specs.use_blt) {
+      /* Enable SINGLE_BUFFER for resolve, if supported */
+      etna_set_state(stream, VIVS_RS_SINGLE_BUFFER, COND(ctx->specs.single_buffer, VIVS_RS_SINGLE_BUFFER_ENABLE));
+   }
 
    ctx->dirty = ~0L;
 
diff --git a/src/gallium/drivers/etnaviv/etnaviv_internal.h b/src/gallium/drivers/etnaviv/etnaviv_internal.h
index 6375ae0428f..e65332b6c66 100644
--- a/src/gallium/drivers/etnaviv/etnaviv_internal.h
+++ b/src/gallium/drivers/etnaviv/etnaviv_internal.h
@@ -84,6 +84,8 @@ struct etna_specs {
    unsigned has_icache : 1;
    /* ASTC texture support (and has associated states) */
    unsigned tex_astc : 1;
+   /* has BLT engine instead of RS */
+   unsigned use_blt : 1;
    /* can use any kind of wrapping mode on npot textures */
    unsigned npot_tex_any_wrap;
    /* number of bits per TS tile */
diff --git a/src/gallium/drivers/etnaviv/etnaviv_resource.c b/src/gallium/drivers/etnaviv/etnaviv_resource.c
index 1fb73c49394..ffdade9f09e 100644
--- a/src/gallium/drivers/etnaviv/etnaviv_resource.c
+++ b/src/gallium/drivers/etnaviv/etnaviv_resource.c
@@ -526,6 +526,7 @@ etna_resource_from_handle(struct pipe_screen *pscreen,
 
    level->layer_stride = level->stride * util_format_get_nblocksy(prsc->format,
                                                                   level->padded_height);
+   level->size = level->layer_stride;
 
    /* The DDX must give us a BO which conforms to our padding size.
     * The stride of the BO must be greater or equal to our padded
diff --git a/src/gallium/drivers/etnaviv/etnaviv_screen.c b/src/gallium/drivers/etnaviv/etnaviv_screen.c
index 51cb513c1a7..1280d46982f 100644
--- a/src/gallium/drivers/etnaviv/etnaviv_screen.c
+++ b/src/gallium/drivers/etnaviv/etnaviv_screen.c
@@ -818,6 +818,8 @@ etna_get_specs(struct etna_screen *screen)
 
    screen->specs.tex_astc = VIV_FEATURE(screen, chipMinorFeatures4, TEXTURE_ASTC);
 
+   screen->specs.use_blt = VIV_FEATURE(screen, chipMinorFeatures5, BLT_ENGINE);
+
    return true;
 
 fail:
diff --git a/src/gallium/drivers/etnaviv/meson.build b/src/gallium/drivers/etnaviv/meson.build
index b9c5e47d197..f9128ae0d50 100644
--- a/src/gallium/drivers/etnaviv/meson.build
+++ b/src/gallium/drivers/etnaviv/meson.build
@@ -24,11 +24,14 @@ files_etnaviv = files(
   'hw/common_3d.xml.h',
   'hw/isa.xml.h',
   'hw/state_3d.xml.h',
+  'hw/state_blt.xml.h',
   'hw/state.xml.h',
   'etnaviv_asm.c',
   'etnaviv_asm.h',
   'etnaviv_blend.c',
   'etnaviv_blend.h',
+  'etnaviv_blt.c',
+  'etnaviv_blt.h',
   'etnaviv_clear_blit.c',
   'etnaviv_clear_blit.h',
   'etnaviv_compiler.c',