From: Eric Anholt Date: Thu, 16 Jan 2020 00:58:21 +0000 (-0800) Subject: turnip: Disable UBWC on images used as storage images. X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=d1166a3b3a96845ac2173ef56caee55c9a1ca849;p=mesa.git turnip: Disable UBWC on images used as storage images. The closed GL driver doesn't use UBWC on any storage images. It does tile mostly (skipping tiling on writeonly images, it seems), but for freedreno we've been enabling tiling in all cases and it's fine. We do need to disable UBWC, as tests fail otherwise and just plugging in the equivalent UBWC regs like we were setting up a texture isn't enough. Fixes dEQP-VK.image.atomic_operations.* Reviewed-by: Jonathan Marek Tested-by: Marge Bot Part-of: --- diff --git a/src/freedreno/vulkan/tu_image.c b/src/freedreno/vulkan/tu_image.c index 978b1b18453..f596feb9855 100644 --- a/src/freedreno/vulkan/tu_image.c +++ b/src/freedreno/vulkan/tu_image.c @@ -126,6 +126,18 @@ tu_image_create(VkDevice _device, ubwc_enabled = false; } + /* Disable UBWC for storage images. + * + * The closed GL driver skips UBWC for storage images (and additionally + * uses linear for writeonly images). We seem to have image tiling working + * in freedreno in general, so turnip matches that. freedreno also enables + * UBWC on images, but it's not really tested due to the lack of + * UBWC-enabled mipmaps in freedreno currently. Just match the closed GL + * behavior of no UBWC. + */ + if (image->usage & VK_IMAGE_USAGE_STORAGE_BIT) + ubwc_enabled = false; + uint32_t ubwc_blockwidth, ubwc_blockheight; fdl6_get_ubwc_blockwidth(&image->layout, &ubwc_blockwidth, &ubwc_blockheight);