fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-08 22:08:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

anv: Prepare dmabufs for clear color arrays

Browse source 
In later commits, we'll rely on the number of view formats used by an
image to determine the size allocated for an array of clear colors in
the aux-state tracking buffer. Having a single view format for dmabufs
with clear color support allows anv to transparently handle this case.

Restrict the number of view formats by explicitly setting the image
format list to incomplete. Secondly, loosen the non-zero clear color
restriction on clear color supporting dmabufs. Those images can support
any clear color even with an incomplete list because we restrict
problematic accesses for the clear color during the negotiation phase.
Lastly, update add_all_surfaces_explicit_layout() to assert that the
sizing of the imported clear color struct meets expectations.

Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/31743>
This commit is contained in:
Nanley Chery 2024-09-10 14:16:21 -04:00 • committed by Marge Bot
parent f5f0354447
commit 8f9ed7e932
1 changed files with 27 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/intel/vulkan/anv_image.c
View file

@ -399,8 +399,17 @@ can_fast_clear_with_non_zero_color(const struct intel_device_info *devinfo,
/* Generally, enabling non-zero fast-clears is dependent on knowing which
* formats will be used with the surface. So, disable them if we lack this
* knowledge.
*
* For dmabufs with clear color modifiers, we already restrict
* problematic accesses for the clear color during the negotiation
* phase. So, don't restrict clear color support in this case.
*/
if (anv_image_view_formats_incomplete(image))
const struct isl_drm_modifier_info *isl_mod_info =
image->vk.tiling == VK_IMAGE_TILING_DRM_FORMAT_MODIFIER_EXT ?
isl_drm_modifier_get_info(image->vk.drm_format_mod) : NULL;
if (anv_image_view_formats_incomplete(image) &&
!(isl_mod_info && isl_mod_info->supports_clear_color))
return false;
enum isl_format img_format = image->planes[plane].primary_surface.isl.format;
@ -1419,6 +1428,10 @@ add_all_surfaces_explicit_layout(
return result;
assert(isl_aux_usage_has_ccs(image->planes[plane].aux_usage));
if (aux_state_offset != ANV_OFFSET_IMPLICIT) {
assert(image->planes[plane].fast_clear_memory_range.size <=
device->isl_dev.ss.clear_color_state_size);
}
}
}
@ -1844,6 +1857,19 @@ anv_image_init(struct anv_device *device, struct anv_image *image,
}
}
if (isl_mod_info && isl_mod_info->supports_clear_color) {
if (image->num_view_formats > 1) {
/* We use the number of view formats to determine the number of
* CLEAR_COLOR structures to append to the image. For an imported
* dmabuf supporting clear colors, we're limited to a single such
* struct. So, mark the view format list as incomplete because doing
* so shrinks the list size to one.
*/
mark_image_view_formats_incomplete(image);
}
assert(image->num_view_formats == 1);
}
if (mod_explicit_info) {
r = add_all_surfaces_explicit_layout(device, image, fmt_list,
mod_explicit_info, isl_tiling_flags,