diff --git a/.pick_status.json b/.pick_status.json index fd611abd34f..6c66a3058e2 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1884,7 +1884,7 @@ "description": "anv: apply the same ccs disabling for Xe3 than Xe2", "nominated": true, "nomination_type": 2, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "2418c9153758783d250982f9b84fb65b1b484294", "notes": null diff --git a/src/intel/vulkan/anv_image.c b/src/intel/vulkan/anv_image.c index 15f1219ddbe..61db8b0e5b4 100644 --- a/src/intel/vulkan/anv_image.c +++ b/src/intel/vulkan/anv_image.c @@ -1946,7 +1946,7 @@ anv_image_init(struct anv_device *device, struct anv_image *image, } /* Workaround to disable XE2 CCS modifiers from drirc. */ - if (device->info->ver == 20 && + if (device->info->ver >= 20 && image->vk.tiling == VK_IMAGE_TILING_DRM_FORMAT_MODIFIER_EXT && device->physical->instance->disable_xe2_drm_ccs_modifiers) isl_extra_usage_flags |= ISL_SURF_USAGE_DISABLE_AUX_BIT;