anv: remove aux checking asserts

Zink is running into those asserts on CI. The problem is that with non
auxilary modifiers like I915_FORMAT_MOD_Y_TILED, we might still
allocate larger buffers with IMPLICIT_CCS.

This isn't a complete fix, the real fix with come with
https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25003 where
we stop overallocating and those assert will match the private binding
allocation.

Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Fixes: 569f80f2df ("anv: Reduce accesses of isl_mod_info->aux_usage")
Acked-by: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25099>

diff --git a/src/intel/ci/anv-tgl-fails.txt b/src/intel/ci/anv-tgl-fails.txt
index a5583b0..1ed9fc5 100644 (file)
--- a/src/intel/ci/anv-tgl-fails.txt
+++ b/src/intel/ci/anv-tgl-fails.txt
@@ -2,55 +2,9 @@
 dEQP-VK.pipeline.extended_dynamic_state.before_good_static.stencil_state_face_front_ge_inc_clamp_clear_255_ref_255_depthfail,Fail
 dEQP-VK.pipeline.extended_dynamic_state.between_pipelines.stencil_state_face_front_ge_inc_clamp_clear_255_ref_255_depthfail,Fail
 
-# ../src/intel/vulkan/genX_cmd_buffer.c:1305: transition_color_buffer: Assertion `isl_mod_info->aux_usage != ISL_AUX_USAGE_NONE' failed.
-dEQP-VK.drm_format_modifiers.export_import_fmt_features2.a1r5g5b5_unorm_pack16,Crash
-dEQP-VK.drm_format_modifiers.export_import_fmt_features2.a8b8g8r8_srgb_pack32,Crash
-dEQP-VK.drm_format_modifiers.export_import_fmt_features2.a8b8g8r8_unorm_pack32,Crash
-dEQP-VK.drm_format_modifiers.export_import_fmt_features2.b5g5r5a1_unorm_pack16,Crash
-dEQP-VK.drm_format_modifiers.export_import_fmt_features2.b8g8r8a8_srgb,Crash
-dEQP-VK.drm_format_modifiers.export_import_fmt_features2.b8g8r8a8_unorm,Crash
-dEQP-VK.drm_format_modifiers.export_import_fmt_features2.r16_sfloat,Crash
-dEQP-VK.drm_format_modifiers.export_import_fmt_features2.r16_unorm,Crash
-dEQP-VK.drm_format_modifiers.export_import_fmt_features2.r16g16_sfloat,Crash
-dEQP-VK.drm_format_modifiers.export_import_fmt_features2.r16g16_unorm,Crash
-dEQP-VK.drm_format_modifiers.export_import_fmt_features2.r16g16b16a16_sfloat,Crash
-dEQP-VK.drm_format_modifiers.export_import_fmt_features2.r16g16b16a16_unorm,Crash
-dEQP-VK.drm_format_modifiers.export_import_fmt_features2.r32_sfloat,Crash
-dEQP-VK.drm_format_modifiers.export_import_fmt_features2.r32g32b32a32_sfloat,Crash
-dEQP-VK.drm_format_modifiers.export_import_fmt_features2.r4g4b4a4_unorm_pack16,Crash
-dEQP-VK.drm_format_modifiers.export_import_fmt_features2.r5g5b5a1_unorm_pack16,Crash
-dEQP-VK.drm_format_modifiers.export_import_fmt_features2.r8_unorm,Crash
-dEQP-VK.drm_format_modifiers.export_import_fmt_features2.r8g8_unorm,Crash
-dEQP-VK.drm_format_modifiers.export_import_fmt_features2.r8g8b8a8_srgb,Crash
-dEQP-VK.drm_format_modifiers.export_import_fmt_features2.r8g8b8a8_unorm,Crash
-dEQP-VK.drm_format_modifiers.export_import.a1r5g5b5_unorm_pack16,Crash
-dEQP-VK.drm_format_modifiers.export_import.a4r4g4b4_unorm_pack16,Crash
-dEQP-VK.drm_format_modifiers.export_import.a8b8g8r8_unorm_pack32,Crash
-dEQP-VK.drm_format_modifiers.export_import.b4g4r4a4_unorm_pack16,Crash
-dEQP-VK.drm_format_modifiers.export_import.b5g5r5a1_unorm_pack16,Crash
-dEQP-VK.drm_format_modifiers.export_import.b5g6r5_unorm_pack16,Crash
-dEQP-VK.drm_format_modifiers.export_import.b8g8r8a8_srgb,Crash
-dEQP-VK.drm_format_modifiers.export_import.b8g8r8a8_unorm,Crash
-dEQP-VK.drm_format_modifiers.export_import.r16_sfloat,Crash
-dEQP-VK.drm_format_modifiers.export_import.r16_unorm,Crash
-dEQP-VK.drm_format_modifiers.export_import.r16g16_sfloat,Crash
-dEQP-VK.drm_format_modifiers.export_import.r16g16b16a16_sfloat,Crash
-dEQP-VK.drm_format_modifiers.export_import.r16g16b16a16_unorm,Crash
-dEQP-VK.drm_format_modifiers.export_import.r32_sfloat,Crash
-dEQP-VK.drm_format_modifiers.export_import.r32g32_sfloat,Crash
-dEQP-VK.drm_format_modifiers.export_import.r32g32b32a32_sfloat,Crash
-dEQP-VK.drm_format_modifiers.export_import.r4g4b4a4_unorm_pack16,Crash
-dEQP-VK.drm_format_modifiers.export_import.r5g5b5a1_unorm_pack16,Crash
-dEQP-VK.drm_format_modifiers.export_import.r5g6b5_unorm_pack16,Crash
-dEQP-VK.drm_format_modifiers.export_import.r8_unorm,Crash
-dEQP-VK.drm_format_modifiers.export_import.r8g8_unorm,Crash
-dEQP-VK.drm_format_modifiers.export_import.r8g8b8a8_srgb,Crash
-
 # sharding from 10 to 12 jobs
 dEQP-VK.drm_format_modifiers.export_import.r8g8b8a8_unorm,Crash
 dEQP-VK.drm_format_modifiers.export_import_fmt_features2.a4r4g4b4_unorm_pack16,Crash
-dEQP-VK.drm_format_modifiers.export_import_fmt_features2.b5g6r5_unorm_pack16,Crash
-dEQP-VK.drm_format_modifiers.export_import_fmt_features2.r32g32_sfloat,Crash
 dEQP-VK.drm_format_modifiers.export_import.a8b8g8r8_srgb_pack32,Crash
 dEQP-VK.drm_format_modifiers.export_import.r16g16_unorm,Crash
 

diff --git a/src/intel/vulkan/genX_cmd_buffer.c b/src/intel/vulkan/genX_cmd_buffer.c
index 95d9057..40fc7bf 100644 (file)
--- a/src/intel/vulkan/genX_cmd_buffer.c
+++ b/src/intel/vulkan/genX_cmd_buffer.c
@@ -1110,16 +1110,12 @@ transition_color_buffer(struct anv_cmd_buffer *cmd_buffer,
 
       if (image->planes[plane].aux_surface.memory_range.binding ==
           ANV_IMAGE_MEMORY_BINDING_PRIVATE) {
-         assert(!isl_drm_modifier_has_aux(isl_mod_info->modifier));
-
          /* The aux surface, like the fast clear state, lives in
           * a driver-private bo.  We must initialize the aux surface for the
           * same reasons we must initialize the fast clear state.
           */
          must_init_aux_surface = true;
       } else {
-         assert(isl_drm_modifier_has_aux(isl_mod_info->modifier));
-
          /* The aux surface, unlike the fast clear state, lives in
           * application-visible VkDeviceMemory and is shared with the
           * external/foreign queue. Therefore, when we acquire ownership of the