From: Bas Nieuwenhuizen <basni@chromium.org>
Date: Mon, 18 Feb 2019 15:43:24 +0000 (+0100)
Subject: turnip: Add buffer->image DMA copies.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=51115e7201987c93f805fe590678f4978aee8baf;p=mesa.git

turnip: Add buffer->image DMA copies.

Passes dEQP-VK.api.copy_and_blit.core.buffer_to_image.*
---

diff --git a/src/freedreno/vulkan/tu_meta_copy.c b/src/freedreno/vulkan/tu_meta_copy.c
index 321585cb1ca..713355196c2 100644
--- a/src/freedreno/vulkan/tu_meta_copy.c
+++ b/src/freedreno/vulkan/tu_meta_copy.c
@@ -216,6 +216,197 @@ tu_copy_buffer(struct tu_cmd_buffer *cmdbuf,
    tu6_emit_event_write(cmdbuf, &cmdbuf->cs, CACHE_FLUSH_TS, true);
 }
 
+static void
+tu_copy_buffer_to_image_step(struct tu_cmd_buffer *cmdbuf,
+                             struct tu_buffer *src_buffer,
+                             struct tu_image *dst_image,
+                             const VkBufferImageCopy *copy_info,
+                             VkFormat format,
+                             uint32_t layer,
+                             uint64_t src_va)
+{
+   const enum a6xx_color_fmt rb_fmt = tu6_get_native_format(format)->rb;
+
+   uint64_t dst_va = dst_image->bo->iova + dst_image->bo_offset + dst_image->layer_size * layer + dst_image->levels[copy_info->imageSubresource.mipLevel].offset;
+   unsigned dst_pitch = dst_image->levels[copy_info->imageSubresource.mipLevel].pitch *
+                        vk_format_get_blocksize(format);
+
+   unsigned src_pitch;
+   unsigned src_offset = 0;
+   if (copy_info->imageExtent.height == 1) {
+      /* Can't find this in the spec, but not having it is sort of insane? */
+      assert(src_va % vk_format_get_blocksize(format) == 0);
+
+      src_offset = (src_va & 63) / vk_format_get_blocksize(format);
+      src_va &= ~63;
+
+      src_pitch = align((src_offset + copy_info->imageExtent.width) * vk_format_get_blocksize(format), 64);
+   } else {
+      unsigned src_pixel_stride = copy_info->bufferRowLength
+                                  ? copy_info->bufferRowLength
+                                  : copy_info->imageExtent.width;
+      src_pitch = src_pixel_stride * vk_format_get_blocksize(format);
+      assert(!(src_pitch & 63));
+      assert(!(src_va & 63));
+   }
+
+   tu_cs_reserve_space(cmdbuf->device, &cmdbuf->cs, 48);
+
+   /*
+    * Emit source:
+    */
+   tu_cs_emit_pkt4(&cmdbuf->cs, REG_A6XX_SP_PS_2D_SRC_INFO, 13);
+   tu_cs_emit(&cmdbuf->cs, A6XX_SP_PS_2D_SRC_INFO_COLOR_FORMAT(rb_fmt) |
+                              A6XX_SP_PS_2D_SRC_INFO_TILE_MODE(TILE6_LINEAR) |
+                              A6XX_SP_PS_2D_SRC_INFO_COLOR_SWAP(WZYX) |
+                              0x500000);
+   tu_cs_emit(&cmdbuf->cs,
+              A6XX_SP_PS_2D_SRC_SIZE_WIDTH(src_offset + copy_info->imageExtent.width) |
+                 A6XX_SP_PS_2D_SRC_SIZE_HEIGHT(
+                    copy_info->imageExtent.height)); /* SP_PS_2D_SRC_SIZE */
+   tu_cs_emit_qw(&cmdbuf->cs, src_va);
+   tu_cs_emit(&cmdbuf->cs, A6XX_SP_PS_2D_SRC_PITCH_PITCH(src_pitch));
+
+   tu_cs_emit(&cmdbuf->cs, 0x00000000);
+   tu_cs_emit(&cmdbuf->cs, 0x00000000);
+   tu_cs_emit(&cmdbuf->cs, 0x00000000);
+   tu_cs_emit(&cmdbuf->cs, 0x00000000);
+   tu_cs_emit(&cmdbuf->cs, 0x00000000);
+
+   tu_cs_emit(&cmdbuf->cs, 0x00000000);
+   tu_cs_emit(&cmdbuf->cs, 0x00000000);
+   tu_cs_emit(&cmdbuf->cs, 0x00000000);
+
+   /*
+    * Emit destination:
+    */
+   tu_cs_emit_pkt4(&cmdbuf->cs, REG_A6XX_RB_2D_DST_INFO, 9);
+   tu_cs_emit(&cmdbuf->cs,
+              A6XX_RB_2D_DST_INFO_COLOR_FORMAT(rb_fmt) |
+                 A6XX_RB_2D_DST_INFO_TILE_MODE(dst_image->tile_mode) |
+                 A6XX_RB_2D_DST_INFO_COLOR_SWAP(WZYX));
+   tu_cs_emit_qw(&cmdbuf->cs, dst_va);
+   tu_cs_emit(&cmdbuf->cs, A6XX_RB_2D_DST_SIZE_PITCH(dst_pitch));
+   tu_cs_emit(&cmdbuf->cs, 0x00000000);
+   tu_cs_emit(&cmdbuf->cs, 0x00000000);
+   tu_cs_emit(&cmdbuf->cs, 0x00000000);
+   tu_cs_emit(&cmdbuf->cs, 0x00000000);
+   tu_cs_emit(&cmdbuf->cs, 0x00000000);
+
+   tu_cs_emit_pkt4(&cmdbuf->cs, REG_A6XX_GRAS_2D_SRC_TL_X, 4);
+   tu_cs_emit(&cmdbuf->cs, A6XX_GRAS_2D_SRC_TL_X_X(src_offset));
+   tu_cs_emit(&cmdbuf->cs,
+              A6XX_GRAS_2D_SRC_BR_X_X(src_offset + copy_info->imageExtent.width - 1));
+   tu_cs_emit(&cmdbuf->cs, A6XX_GRAS_2D_SRC_TL_Y_Y(0));
+   tu_cs_emit(&cmdbuf->cs,
+              A6XX_GRAS_2D_SRC_BR_Y_Y(copy_info->imageExtent.height - 1));
+
+   tu_cs_emit_pkt4(&cmdbuf->cs, REG_A6XX_GRAS_2D_DST_TL, 2);
+   tu_cs_emit(&cmdbuf->cs,
+              A6XX_GRAS_2D_DST_TL_X(copy_info->imageOffset.x) |
+                 A6XX_GRAS_2D_DST_TL_Y(copy_info->imageOffset.y));
+   tu_cs_emit(&cmdbuf->cs,
+              A6XX_GRAS_2D_DST_BR_X(copy_info->imageOffset.x +
+                                    copy_info->imageExtent.width - 1) |
+                 A6XX_GRAS_2D_DST_BR_Y(copy_info->imageOffset.y +
+                                       copy_info->imageExtent.height - 1));
+
+   tu_cs_emit_pkt7(&cmdbuf->cs, CP_EVENT_WRITE, 1);
+   tu_cs_emit(&cmdbuf->cs, 0x3f);
+   tu_cs_emit_wfi(&cmdbuf->cs);
+
+   tu_cs_emit_pkt4(&cmdbuf->cs, REG_A6XX_RB_UNKNOWN_8C01, 1);
+   tu_cs_emit(&cmdbuf->cs, 0);
+
+   tu_cs_emit_pkt4(&cmdbuf->cs, REG_A6XX_SP_2D_SRC_FORMAT, 1);
+   tu_cs_emit(&cmdbuf->cs, tu6_sp_2d_src_format(format));
+
+   tu_cs_emit_pkt4(&cmdbuf->cs, REG_A6XX_RB_UNKNOWN_8E04, 1);
+   tu_cs_emit(&cmdbuf->cs, 0x01000000);
+
+   tu_cs_emit_pkt7(&cmdbuf->cs, CP_BLIT, 1);
+   tu_cs_emit(&cmdbuf->cs, CP_BLIT_0_OP(BLIT_OP_SCALE));
+
+   tu_cs_emit_wfi(&cmdbuf->cs);
+
+   tu_cs_emit_pkt4(&cmdbuf->cs, REG_A6XX_RB_UNKNOWN_8E04, 1);
+   tu_cs_emit(&cmdbuf->cs, 0);
+}
+
+static void
+tu_copy_buffer_to_image(struct tu_cmd_buffer *cmdbuf,
+                        struct tu_buffer *src_buffer,
+                        struct tu_image *dst_image,
+                        const VkBufferImageCopy *copy_info)
+{
+   tu_bo_list_add(&cmdbuf->bo_list, src_buffer->bo, MSM_SUBMIT_BO_READ);
+   tu_bo_list_add(&cmdbuf->bo_list, dst_image->bo, MSM_SUBMIT_BO_WRITE);
+
+   /* general setup */
+   tu_dma_prepare(cmdbuf);
+
+   tu_cs_reserve_space(cmdbuf->device, &cmdbuf->cs, 6);
+
+   /* buffer copy setup */
+   tu_cs_emit_pkt7(&cmdbuf->cs, CP_SET_MARKER, 1);
+   tu_cs_emit(&cmdbuf->cs, A2XX_CP_SET_MARKER_0_MODE(RM6_BLIT2DSCALE));
+
+   VkFormat format = dst_image->vk_format;
+   const enum a6xx_color_fmt rb_fmt = tu6_get_native_format(format)->rb;
+
+   const uint32_t blit_cntl = blit_control(rb_fmt) | 0x20000000;
+
+   tu_cs_emit_pkt4(&cmdbuf->cs, REG_A6XX_RB_2D_BLIT_CNTL, 1);
+   tu_cs_emit(&cmdbuf->cs, blit_cntl);
+
+   tu_cs_emit_pkt4(&cmdbuf->cs, REG_A6XX_GRAS_2D_BLIT_CNTL, 1);
+   tu_cs_emit(&cmdbuf->cs, blit_cntl);
+
+   unsigned src_pixel_stride = copy_info->bufferRowLength
+                                  ? copy_info->bufferRowLength
+                                  : copy_info->imageExtent.width;
+   unsigned cpp = vk_format_get_blocksize(format);
+   unsigned src_pitch = src_pixel_stride * cpp;
+
+   for (unsigned layer_offset = 0; layer_offset < copy_info->imageSubresource.layerCount; ++layer_offset) {
+      unsigned layer = copy_info->imageSubresource.baseArrayLayer + layer_offset;
+      uint64_t src_va = src_buffer->bo->iova + src_buffer->bo_offset + copy_info->bufferOffset + layer_offset * copy_info->bufferImageHeight * src_pitch;
+       
+      if ((src_pitch & 63) || (src_va & 63)) {
+         /* Do a per line copy */
+         VkBufferImageCopy line_copy_info = *copy_info;
+         line_copy_info.imageExtent.height = 1;
+         for (unsigned r = 0; r < copy_info->imageExtent.height; ++r) {
+            /*
+             * if src_va is not aligned the line copy will need to adjust. Give it
+             * room to do so.
+             */
+            unsigned max_width = 16384 - (src_va & 0x3f) ? 64 : 0;
+            line_copy_info.imageOffset.x = copy_info->imageOffset.x;
+            line_copy_info.imageExtent.width = copy_info->imageExtent.width;
+            
+            for (unsigned c = 0; c < copy_info->imageExtent.width; c += max_width) {
+               tu_copy_buffer_to_image_step(cmdbuf, src_buffer, dst_image, &line_copy_info, format, layer, src_va + c * cpp);
+
+               line_copy_info.imageOffset.x += max_width;
+               line_copy_info.imageExtent.width -= max_width;
+            }
+   
+            line_copy_info.imageOffset.y++;
+            src_va += src_pitch;
+         }
+      } else {
+         tu_copy_buffer_to_image_step(cmdbuf, src_buffer, dst_image, copy_info, format, layer, src_va);
+      }
+   }
+
+   tu_cs_reserve_space(cmdbuf->device, &cmdbuf->cs, 15);
+
+   tu6_emit_event_write(cmdbuf, &cmdbuf->cs, 0x1d, true);
+   tu6_emit_event_write(cmdbuf, &cmdbuf->cs, FACENESS_FLUSH, true);
+   tu6_emit_event_write(cmdbuf, &cmdbuf->cs, CACHE_FLUSH_TS, true);
+}
+
 static void
 tu_copy_image_to_buffer_step(struct tu_cmd_buffer *cmdbuf,
                              struct tu_image *src_image,
@@ -427,16 +618,6 @@ tu_CmdCopyBuffer(VkCommandBuffer commandBuffer,
    }
 }
 
-static void
-meta_copy_buffer_to_image(struct tu_cmd_buffer *cmd_buffer,
-                          struct tu_buffer *buffer,
-                          struct tu_image *image,
-                          VkImageLayout layout,
-                          uint32_t regionCount,
-                          const VkBufferImageCopy *pRegions)
-{
-}
-
 void
 tu_CmdCopyBufferToImage(VkCommandBuffer commandBuffer,
                         VkBuffer srcBuffer,
@@ -449,8 +630,10 @@ tu_CmdCopyBufferToImage(VkCommandBuffer commandBuffer,
    TU_FROM_HANDLE(tu_image, dest_image, destImage);
    TU_FROM_HANDLE(tu_buffer, src_buffer, srcBuffer);
 
-   meta_copy_buffer_to_image(cmd_buffer, src_buffer, dest_image,
-                             destImageLayout, regionCount, pRegions);
+   for (unsigned i = 0; i < regionCount; ++i) {
+      tu_copy_buffer_to_image(cmd_buffer, src_buffer, dest_image,
+                              pRegions + i);
+   }
 }
 
 void