etnaviv: update headers from rnndb

[mesa.git] / src / gallium / drivers / etnaviv / etnaviv_blt.c

diff --git a/src/gallium/drivers/etnaviv/etnaviv_blt.c b/src/gallium/drivers/etnaviv/etnaviv_blt.c
index 42d1a4462d1da2fa85fd5037950ce82f2c35630e..5cc6b8dd8b2f7d728a187e73b598a14c2893b2d1 100644 (file)
--- a/src/gallium/drivers/etnaviv/etnaviv_blt.c
+++ b/src/gallium/drivers/etnaviv/etnaviv_blt.c
@@ -68,7 +68,7 @@ blt_compute_img_config_bits(const struct blt_imginfo *img, bool for_dest)
       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) |
+   return BLT_IMAGE_CONFIG_TS_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) |
@@ -182,7 +182,7 @@ emit_blt_inplace(struct etna_cmd_stream *stream, const struct blt_inplace_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_INPLACE_CACHE_MODE(op->cache_mode) |
+         VIVS_BLT_CONFIG_INPLACE_TS_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]);
@@ -216,7 +216,7 @@ etna_blit_clear_color_blt(struct pipe_context *pctx, struct pipe_surface *dst,
    clr.dest.compress_fmt = 3;
    */
    clr.dest.tiling = res->layout;
-   clr.dest.cache_mode = TS_CACHE_MODE_128; /* TODO: cache modes */
+   clr.dest.cache_mode = TS_MODE_32; /* TODO: cache modes */
 
    if (surf->surf.ts_size) {
       clr.dest.use_ts = 1;
@@ -292,7 +292,7 @@ etna_blit_clear_zs_blt(struct pipe_context *pctx, struct pipe_surface *dst,
    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 */
+   clr.dest.cache_mode = TS_MODE_32; /* TODO: cache modes */
 
    if (surf->surf.ts_size) {
       clr.dest.use_ts = 1;
@@ -434,7 +434,7 @@ etna_try_blt_blit(struct pipe_context *pctx,
       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.cache_mode = TS_MODE_32; /* TODO: cache modes */
       op.num_tiles = src_lev->size / 128; /* TODO: cache modes */
       op.bpp = util_format_get_blocksize(src->base.format);
 
@@ -451,7 +451,7 @@ etna_try_blt_blit(struct pipe_context *pctx,
       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 */
+      op.src.cache_mode = TS_MODE_32; /* TODO: cache modes */
       const struct util_format_description *src_format_desc =
          util_format_description(src_format);
       for (unsigned x=0; x<4; ++x)
@@ -476,7 +476,7 @@ etna_try_blt_blit(struct pipe_context *pctx,
       op.dest.compress_fmt = 3;
       */
       op.dest.tiling = dst->layout;
-      op.dest.cache_mode = TS_CACHE_MODE_128; /* TODO cache modes */
+      op.dest.cache_mode = TS_MODE_32; /* TODO cache modes */
       const struct util_format_description *dst_format_desc =
          util_format_description(dst_format);
       for (unsigned x=0; x<4; ++x)