From eeb1fd90fc08fc40181807c19eea1d4c4a116377 Mon Sep 17 00:00:00 2001 From: Danylo Piliaiev Date: Fri, 21 Jul 2023 13:27:38 +0200 Subject: [PATCH] tu,freedreno: Forbid blit event for R8G8_SRGB due to gpu faults Same cause as for other R8G8 formats - msaa resolve via blit event causes gpu fault. Fixes: dEQP-VK.api.image_clearing.*.clear_color_attachment.*.r8g8_srgb_* Fixes: 029919f3c83f379065515708188d5c439c3fa6bc ("tu: allow using resolve engine for SRGB MSAA resolves") Cc: mesa-stable Signed-off-by: Danylo Piliaiev Part-of: --- src/freedreno/vulkan/tu_clear_blit.cc | 1 + src/gallium/drivers/freedreno/a6xx/fd6_gmem.cc | 1 + 2 files changed, 2 insertions(+) diff --git a/src/freedreno/vulkan/tu_clear_blit.cc b/src/freedreno/vulkan/tu_clear_blit.cc index d50c7144b20..6712dd4a031 100644 --- a/src/freedreno/vulkan/tu_clear_blit.cc +++ b/src/freedreno/vulkan/tu_clear_blit.cc @@ -3295,6 +3295,7 @@ blit_can_resolve(VkFormat format) case VK_FORMAT_R8G8_UNORM: case VK_FORMAT_R8G8_UINT: case VK_FORMAT_R8G8_SINT: + case VK_FORMAT_R8G8_SRGB: /* TODO: this one should be able to work? */ case VK_FORMAT_D24_UNORM_S8_UINT: return false; diff --git a/src/gallium/drivers/freedreno/a6xx/fd6_gmem.cc b/src/gallium/drivers/freedreno/a6xx/fd6_gmem.cc index 55b5d64c898..c4dea7cb1bd 100644 --- a/src/gallium/drivers/freedreno/a6xx/fd6_gmem.cc +++ b/src/gallium/drivers/freedreno/a6xx/fd6_gmem.cc @@ -1486,6 +1486,7 @@ blit_can_resolve(enum pipe_format format) case PIPE_FORMAT_R8G8_UNORM: case PIPE_FORMAT_R8G8_UINT: case PIPE_FORMAT_R8G8_SINT: + case PIPE_FORMAT_R8G8_SRGB: /* TODO: this one should be able to work? */ case PIPE_FORMAT_Z24_UNORM_S8_UINT: return false;