From 6f75431e9889d7614ad07a1112978e3f995fc12b Mon Sep 17 00:00:00 2001 From: Lionel Landwerlin Date: Wed, 18 Feb 2026 10:32:16 +0200 Subject: [PATCH] anv: disable ccs modifier reporting when ccs modifiers are disabled MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reporting the modifiers when we're going to disable it in the back hits various asserts in anv_image.c Signed-off-by: Lionel Landwerlin Fixes: 2418c91537 ("anv/drirc: disable Xe2 CCS drm modifiers for GTK engine") Helps: https://gitlab.freedesktop.org/mesa/mesa/-/issues/14853 Reviewed-by: Tapani Pälli (cherry picked from commit 4f38b5c888a34cd6b06c89dcd6d742ca335e0ec6) Part-of: --- .pick_status.json | 2 +- src/intel/vulkan/anv_formats.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.pick_status.json b/.pick_status.json index 6c66a3058e2..a1ea137deec 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1874,7 +1874,7 @@ "description": "anv: disable ccs modifier reporting when ccs modifiers are disabled", "nominated": true, "nomination_type": 2, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "2418c9153758783d250982f9b84fb65b1b484294", "notes": null diff --git a/src/intel/vulkan/anv_formats.c b/src/intel/vulkan/anv_formats.c index 579d9cef71b..8acece92d4e 100644 --- a/src/intel/vulkan/anv_formats.c +++ b/src/intel/vulkan/anv_formats.c @@ -1164,6 +1164,11 @@ get_drm_format_modifier_properties_list(const struct anv_physical_device *physic if (!features) continue; + if (physical_device->info.ver >= 20 && + physical_device->instance->disable_xe2_drm_ccs_modifiers && + isl_mod_info->supports_render_compression) + continue; + const uint32_t planes = isl_drm_modifier_get_plane_count(&physical_device->info, isl_mod_info->modifier,