fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-25 02:10:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

panvk: Stop using panvk_image_can_use_afbc() in panvk_image_can_use_mod()

Browse source 
panvk_image_can_use_afbc() doesn't know about depth/stencil format
lowering, and does the AFBC format check on the wrong format if planar
depth/stencil is enabled. Inline what we need from this helper in
panvk_image_can_use_mod(). Ultimately we should make it so that
panvk_image_can_use_afbc() uses panvk_image_can_use_mod() and not the
other way around.

Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
Reviewed-by: Eric R. Smith <eric.smith@collabora.com>
Reviewed-by: Christoph Pillmayer <christoph.pillmayer@arm.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/37158>
This commit is contained in:
Boris Brezillon 2025-09-05 19:35:34 +02:00 • committed by Marge Bot
parent 2cd851a55f
commit 741df48085
1 changed files with 21 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/panfrost/vulkan/panvk_image.c
View file

@ -148,6 +148,7 @@ panvk_image_can_use_mod(struct panvk_image *image,
{
struct panvk_physical_device *phys_dev =
to_panvk_physical_device(image->vk.base.device->physical);
unsigned arch = pan_arch(phys_dev->kmod.props.gpu_id);
struct panvk_instance *instance =
to_panvk_instance(image->vk.base.device->physical->instance);
bool forced_linear = (instance->debug_flags & PANVK_DEBUG_LINEAR) ||
@ -160,10 +161,26 @@ panvk_image_can_use_mod(struct panvk_image *image,
return mod == DRM_FORMAT_MOD_LINEAR;
if (drm_is_afbc(mod)) {
if (!panvk_image_can_use_afbc(phys_dev, image->vk.format,
image->vk.usage | image->vk.stencil_usage,
image->vk.image_type, image->vk.tiling,
image->vk.create_flags))
/* AFBC explicitly disabled. */
if (instance->debug_flags & PANVK_DEBUG_NO_AFBC)
return false;
/* Non-optimal tiling requested. */
if (image->vk.tiling != VK_IMAGE_TILING_OPTIMAL)
return false;
/* Can't do AFBC if store/host copy is requested. */
if ((image->vk.usage | image->vk.stencil_usage) &
(VK_IMAGE_USAGE_STORAGE_BIT | VK_IMAGE_USAGE_HOST_TRANSFER_BIT))
return false;
/* Can't do AFBC on v7- if mutable format is requested. */
if ((image->vk.create_flags & VK_IMAGE_CREATE_MUTABLE_FORMAT_BIT) &&
arch <= 7)
return false;
/* Disable AFBC on YUV-planar for now. */
if (vk_format_get_plane_count(image->vk.format) > 1)
return false;
/* We can't have separate depth/stencil layout transitions with