freedreno/fdl: Set LOSSLESSCOMPEN for image when ubwc is enabled on a7xx

Signed-off-by: Danylo Piliaiev <dpiliaiev@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/23217>

diff --git a/src/freedreno/fdl/fd6_view.c b/src/freedreno/fdl/fd6_view.c
index b227c24..8976b88 100644 (file)
--- a/src/freedreno/fdl/fd6_view.c
+++ b/src/freedreno/fdl/fd6_view.c
@@ -419,6 +419,7 @@ fdl6_view_init(struct fdl6_view *view, const struct fdl_layout **layouts,
    view->RB_MRT_BUF_INFO =
       A6XX_RB_MRT_BUF_INFO_COLOR_TILE_MODE(tile_mode) |
       A6XX_RB_MRT_BUF_INFO_COLOR_FORMAT(color_format) |
+      COND(args->chip >= A7XX && ubwc_enabled, A7XX_RB_MRT_BUF_INFO_LOSSLESSCOMPEN) |
       A6XX_RB_MRT_BUF_INFO_COLOR_SWAP(color_swap);
 
    view->SP_FS_MRT_REG =

diff --git a/src/freedreno/fdl/freedreno_layout.h b/src/freedreno/fdl/freedreno_layout.h
index 97631e7..087ebf1 100644 (file)
--- a/src/freedreno/fdl/freedreno_layout.h
+++ b/src/freedreno/fdl/freedreno_layout.h
@@ -274,6 +274,7 @@ enum fdl_chroma_location {
 };
 
 struct fdl_view_args {
+   uint32_t chip;
    uint64_t iova;
    uint32_t base_miplevel;
    uint32_t level_count;

diff --git a/src/freedreno/vulkan/tu_clear_blit.cc b/src/freedreno/vulkan/tu_clear_blit.cc
index 044202f..f965a7f 100644 (file)
--- a/src/freedreno/vulkan/tu_clear_blit.cc
+++ b/src/freedreno/vulkan/tu_clear_blit.cc
@@ -1708,6 +1708,7 @@ tu6_dirty_lrz_fc(struct tu_cmd_buffer *cmd,
 }
 TU_GENX(tu6_dirty_lrz_fc);
 
+template<chip CHIP>
 static void
 tu_image_view_copy_blit(struct fdl6_view *iview,
                         struct tu_image *image,
@@ -1728,6 +1729,7 @@ tu_image_view_copy_blit(struct fdl6_view *iview,
       &image->layout[tu6_plane_index(image->vk.format, aspect_mask)];
 
    const struct fdl_view_args args = {
+      .chip = CHIP,
       .iova = image->iova,
       .base_miplevel = subres->mipLevel,
       .level_count = 1,
@@ -1742,6 +1744,7 @@ tu_image_view_copy_blit(struct fdl6_view *iview,
    fdl6_view_init(iview, &layout, &args, false);
 }
 
+template<chip CHIP>
 static void
 tu_image_view_copy(struct fdl6_view *iview,
                    struct tu_image *image,
@@ -1749,9 +1752,10 @@ tu_image_view_copy(struct fdl6_view *iview,
                    const VkImageSubresourceLayers *subres,
                    uint32_t layer)
 {
-   tu_image_view_copy_blit(iview, image, format, subres, layer, false);
+   tu_image_view_copy_blit<CHIP>(iview, image, format, subres, layer, false);
 }
 
+template<chip CHIP>
 static void
 tu_image_view_blit(struct fdl6_view *iview,
                    struct tu_image *image,
@@ -1761,7 +1765,7 @@ tu_image_view_blit(struct fdl6_view *iview,
    enum pipe_format format =
       tu6_plane_format(image->vk.format, tu6_plane_index(image->vk.format,
                                                          subres->aspectMask));
-   tu_image_view_copy_blit(iview, image, format, subres, layer, false);
+   tu_image_view_copy_blit<CHIP>(iview, image, format, subres, layer, false);
 }
 
 template <chip CHIP>
@@ -1867,15 +1871,16 @@ tu6_blit_image(struct tu_cmd_buffer *cmd,
    }
 
    struct fdl6_view dst, src;
-   tu_image_view_blit(&dst, dst_image, &info->dstSubresource,
-                      MIN2(info->dstOffsets[0].z, info->dstOffsets[1].z));
+   tu_image_view_blit<CHIP>(
+      &dst, dst_image, &info->dstSubresource,
+      MIN2(info->dstOffsets[0].z, info->dstOffsets[1].z));
 
    if (z_scale) {
-      tu_image_view_copy_blit(&src, src_image, src_format,
-                              &info->srcSubresource, 0, true);
+      tu_image_view_copy_blit<CHIP>(&src, src_image, src_format,
+                                    &info->srcSubresource, 0, true);
       ops->src(cmd, cs, &src, 0, filter, dst_format);
    } else {
-      tu_image_view_blit(&src, src_image, &info->srcSubresource, info->srcOffsets[0].z);
+      tu_image_view_blit<CHIP>(&src, src_image, &info->srcSubresource, info->srcOffsets[0].z);
    }
 
    for (uint32_t i = 0; i < layers; i++) {
@@ -1994,7 +1999,8 @@ tu_copy_buffer_to_image(struct tu_cmd_buffer *cmd,
               (VkSampleCountFlagBits) dst_image->layout[0].nr_samples);
 
    struct fdl6_view dst;
-   tu_image_view_copy(&dst, dst_image, dst_format, &info->imageSubresource, offset.z);
+   tu_image_view_copy<CHIP>(&dst, dst_image, dst_format,
+                            &info->imageSubresource, offset.z);
 
    for (uint32_t i = 0; i < layers; i++) {
       ops->dst(cs, &dst, i, src_format);
@@ -2077,7 +2083,8 @@ tu_copy_image_to_buffer(struct tu_cmd_buffer *cmd,
               VK_SAMPLE_COUNT_1_BIT);
 
    struct fdl6_view src;
-   tu_image_view_copy(&src, src_image, src_format, &info->imageSubresource, offset.z);
+   tu_image_view_copy<CHIP>(&src, src_image, src_format,
+                            &info->imageSubresource, offset.z);
 
    for (uint32_t i = 0; i < layers; i++) {
       ops->src(cmd, cs, &src, i, VK_FILTER_NEAREST, dst_format);
@@ -2232,8 +2239,8 @@ tu_copy_image_to_image(struct tu_cmd_buffer *cmd,
    struct fdl6_view dst, src;
 
    if (use_staging_blit) {
-      tu_image_view_copy(&dst, dst_image, dst_format, &info->dstSubresource, dst_offset.z);
-      tu_image_view_copy(&src, src_image, src_format, &info->srcSubresource, src_offset.z);
+      tu_image_view_copy<CHIP>(&dst, dst_image, dst_format, &info->dstSubresource, dst_offset.z);
+      tu_image_view_copy<CHIP>(&src, src_image, src_format, &info->srcSubresource, src_offset.z);
 
       struct fdl_layout staging_layout = { 0 };
       VkOffset3D staging_offset = { 0 };
@@ -2264,6 +2271,7 @@ tu_copy_image_to_image(struct tu_cmd_buffer *cmd,
       struct fdl6_view staging;
       const struct fdl_layout *staging_layout_ptr = &staging_layout;
       const struct fdl_view_args copy_to_args = {
+         .chip = CHIP,
          .iova = staging_bo->iova,
          .base_miplevel = 0,
          .level_count = info->srcSubresource.layerCount,
@@ -2293,6 +2301,7 @@ tu_copy_image_to_image(struct tu_cmd_buffer *cmd,
       tu_cs_emit_wfi(cs);
 
       const struct fdl_view_args copy_from_args = {
+         .chip = CHIP,
          .iova = staging_bo->iova,
          .base_miplevel = 0,
          .level_count = info->srcSubresource.layerCount,
@@ -2315,8 +2324,8 @@ tu_copy_image_to_image(struct tu_cmd_buffer *cmd,
          ops->run(cmd, cs);
       }
    } else {
-      tu_image_view_copy(&dst, dst_image, format, &info->dstSubresource, dst_offset.z);
-      tu_image_view_copy(&src, src_image, format, &info->srcSubresource, src_offset.z);
+      tu_image_view_copy<CHIP>(&dst, dst_image, format, &info->dstSubresource, dst_offset.z);
+      tu_image_view_copy<CHIP>(&src, src_image, format, &info->srcSubresource, src_offset.z);
 
       ops->setup(cmd, cs, format, format, info->dstSubresource.aspectMask,
                  0, false, dst_image->layout[0].ubwc,
@@ -2510,8 +2519,8 @@ tu_CmdResolveImage2KHR(VkCommandBuffer commandBuffer,
       coords(ops, cs, info->dstOffset, info->srcOffset, info->extent);
 
       struct fdl6_view dst, src;
-      tu_image_view_blit(&dst, dst_image, &info->dstSubresource, info->dstOffset.z);
-      tu_image_view_blit(&src, src_image, &info->srcSubresource, info->srcOffset.z);
+      tu_image_view_blit<CHIP>(&dst, dst_image, &info->dstSubresource, info->dstOffset.z);
+      tu_image_view_blit<CHIP>(&src, src_image, &info->srcSubresource, info->srcOffset.z);
 
       for (uint32_t i = 0; i < layers; i++) {
          ops->src(cmd, cs, &src, i, VK_FILTER_NEAREST, dst_format);
@@ -2667,7 +2676,7 @@ clear_image(struct tu_cmd_buffer *cmd,
          .baseArrayLayer = range->baseArrayLayer,
          .layerCount = 1,
       };
-      tu_image_view_copy_blit(&dst, image, format, &subresource, 0, false);
+      tu_image_view_copy_blit<CHIP>(&dst, image, format, &subresource, 0, false);
 
       for (uint32_t i = 0; i < layer_count; i++) {
          ops->dst(cs, &dst, i, format);

diff --git a/src/freedreno/vulkan/tu_image.cc b/src/freedreno/vulkan/tu_image.cc
index cd6f365..4932810 100644 (file)
--- a/src/freedreno/vulkan/tu_image.cc
+++ b/src/freedreno/vulkan/tu_image.cc
@@ -213,6 +213,7 @@ tu_image_view_init(struct tu_device *device,
                                         iview->swizzle);
 
    struct fdl_view_args args = {};
+   args.chip = device->physical_device->info->chip;
    args.iova = image->iova;
    args.base_array_layer = range->baseArrayLayer;
    args.base_miplevel = range->baseMipLevel;

diff --git a/src/gallium/drivers/freedreno/a6xx/fd6_gmem.cc b/src/gallium/drivers/freedreno/a6xx/fd6_gmem.cc
index c4dea7c..e6a7463 100644 (file)
--- a/src/gallium/drivers/freedreno/a6xx/fd6_gmem.cc
+++ b/src/gallium/drivers/freedreno/a6xx/fd6_gmem.cc
@@ -421,6 +421,8 @@ patch_fb_read_sysmem(struct fd_batch *batch)
       fdl6_get_ubwc_blockwidth(&rsc->layout, &block_width, &block_height);
 
       struct fdl_view_args args = {
+         .chip = A6XX,
+
          .iova = fd_bo_get_iova(rsc->bo),
 
          .base_miplevel = psurf->u.tex.level,

diff --git a/src/gallium/drivers/freedreno/a6xx/fd6_image.cc b/src/gallium/drivers/freedreno/a6xx/fd6_image.cc
index 2c3b189..964211c 100644 (file)
--- a/src/gallium/drivers/freedreno/a6xx/fd6_image.cc
+++ b/src/gallium/drivers/freedreno/a6xx/fd6_image.cc
@@ -73,6 +73,8 @@ fd6_image_descriptor(struct fd_context *ctx, const struct pipe_image_view *buf,
                             size);
    } else {
       struct fdl_view_args args = {
+         .chip = A6XX,
+
          .iova = rsc_iova(buf->resource, 0),
 
          .base_miplevel = buf->u.tex.level,

diff --git a/src/gallium/drivers/freedreno/a6xx/fd6_texture.cc b/src/gallium/drivers/freedreno/a6xx/fd6_texture.cc
index ee6489c..fff9408 100644 (file)
--- a/src/gallium/drivers/freedreno/a6xx/fd6_texture.cc
+++ b/src/gallium/drivers/freedreno/a6xx/fd6_texture.cc
@@ -419,6 +419,8 @@ fd6_sampler_view_update(struct fd_context *ctx,
       fdl6_buffer_view_init(so->descriptor, cso->format, swiz, iova, size);
    } else {
       struct fdl_view_args args = {
+         .chip = A6XX,
+
          /* Using relocs for addresses still */
          .iova = 0,