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,