From: Jonathan Marek <jonathan@marek.ca>
Date: Tue, 12 May 2020 15:28:51 +0000 (-0400)
Subject: turnip: enable tiling for compressed formats
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=d76e722ed63607ecead2c66ef9f3a37a12b62bab;p=mesa.git

turnip: enable tiling for compressed formats

Now that layout code supports this, we can enable it.

Signed-off-by: Jonathan Marek <jonathan@marek.ca>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5009>
---

diff --git a/src/freedreno/vulkan/tu_image.c b/src/freedreno/vulkan/tu_image.c
index 45dff2df951..8c0e8c5341f 100644
--- a/src/freedreno/vulkan/tu_image.c
+++ b/src/freedreno/vulkan/tu_image.c
@@ -90,12 +90,15 @@ tu_image_create(VkDevice _device,
 
    /* disable tiling when linear is requested and for compressed formats */
    if (pCreateInfo->tiling == VK_IMAGE_TILING_LINEAR ||
-       modifier == DRM_FORMAT_MOD_LINEAR ||
-       vk_format_is_compressed(image->vk_format)) {
+       modifier == DRM_FORMAT_MOD_LINEAR) {
       image->layout.tile_mode = TILE6_LINEAR;
       ubwc_enabled = false;
    }
 
+   /* don't use UBWC with compressed formats */
+   if (vk_format_is_compressed(image->vk_format))
+      ubwc_enabled = false;
+
    /* UBWC can't be used with E5B9G9R9 */
    if (image->vk_format == VK_FORMAT_E5B9G9R9_UFLOAT_PACK32)
       ubwc_enabled = false;