From 69d91ae9753d8698eed938fe97c5daae6729b14d Mon Sep 17 00:00:00 2001 From: Nanley Chery Date: Wed, 4 Jun 2025 10:14:14 -0400 Subject: [PATCH] intel/blorp: Use get_copy_format_for_bpb more for gfx12.5 Use get_copy_format_for_bpb() instead of get_ccs_compatible_uint_format() when performing blorp_copy(). This matches the code path taken on gfx20 and increases the testing of cases which would impact gfx12.0 in isl_get_sampler_clear_field_offset(). Reviewed-by: Lionel Landwerlin Part-of: --- src/intel/blorp/blorp_blit.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/intel/blorp/blorp_blit.c b/src/intel/blorp/blorp_blit.c index 15758c7ac42..191af2db3d4 100644 --- a/src/intel/blorp/blorp_blit.c +++ b/src/intel/blorp/blorp_blit.c @@ -2779,11 +2779,11 @@ blorp_copy_get_color_format(const struct isl_device *isl_dev, * to properly interpret the clear color of imported dmabuf surfaces. */ return surf_format; - } else if (ISL_GFX_VER(isl_dev) <= 12 && + } else if (ISL_GFX_VERX10(isl_dev) <= 120 && isl_format_supports_ccs_e(isl_dev->info, surf_format)) { - /* On gfx9-12, choose a copy format that maintains compatibility with + /* On gfx9-12.0, choose a copy format that maintains compatibility with * CCS_E. Although format reinterpretation doesn't affect compression - * support while rendering on gfx12, the sampler does have reduced + * support while rendering on gfx12.0, the sampler does have reduced * support for compression when the bits-per-channel changes. */ return get_ccs_compatible_uint_format(fmtl);