Module: Mesa Branch: main Commit: e2f0c859c2b8092bef58ee396ab1d5b6f18d5eb5 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=e2f0c859c2b8092bef58ee396ab1d5b6f18d5eb5
Author: Nanley Chery <[email protected]> Date: Wed Mar 16 14:25:28 2022 -0700 Revert "anv: Disable CCS_E for some 8/16bpp copies on TGL+" This reverts commit d68b2db89ca38f3f6c0d3ebd65945c471d864d58. With this change, no regressions have been observed with the dEQP-VK.synchronization* test group. There are regressions with dEQP-VK.drm_format_modifiers.export_import.*, but those have been root-caused to be test issues (see 3575). Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/6125 Fixes: 57445adc891 ("anv: Re-enable CCS_E on TGL+") Reviewed-by: Tapani Pälli <[email protected]> Reviewed-by: Lionel Landwerlin <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15420> --- src/intel/vulkan/anv_image.c | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/src/intel/vulkan/anv_image.c b/src/intel/vulkan/anv_image.c index 6787d6493c1..ec4dd1ff0f0 100644 --- a/src/intel/vulkan/anv_image.c +++ b/src/intel/vulkan/anv_image.c @@ -2040,20 +2040,6 @@ anv_layout_to_aux_state(const struct intel_device_info * const devinfo, bool aux_supported = true; bool clear_supported = isl_aux_usage_has_fast_clears(aux_usage); - const struct isl_format_layout *fmtl = - isl_format_get_layout(image->planes[plane].primary_surface.isl.format); - - /* Disabling CCS for the following case avoids failures in: - * - dEQP-VK.drm_format_modifiers.export_import.* - * - dEQP-VK.synchronization* - */ - if (usage & (VK_IMAGE_USAGE_TRANSFER_DST_BIT | - VK_IMAGE_USAGE_TRANSFER_SRC_BIT) && fmtl->bpb <= 16 && - aux_usage == ISL_AUX_USAGE_CCS_E && devinfo->ver >= 12) { - aux_supported = false; - clear_supported = false; - } - if ((usage & VK_IMAGE_USAGE_INPUT_ATTACHMENT_BIT) && !read_only) { /* This image could be used as both an input attachment and a render * target (depth, stencil, or color) at the same time and this can cause
