X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fintel%2Fisl%2Fisl_format.c;h=5f92c3e1f3686ae150df22f87b088e535cb92f29;hb=db957f9135a401cdf2f5434096723dd2ec629273;hp=57964650dc6ab842782d3791cd13d81fbd4b8e19;hpb=5bea0cf77956d748ea929e12d12756692f04a33f;p=mesa.git

diff --git a/src/intel/isl/isl_format.c b/src/intel/isl/isl_format.c
index 57964650dc6..5f92c3e1f36 100644
--- a/src/intel/isl/isl_format.c
+++ b/src/intel/isl/isl_format.c
@@ -928,6 +928,15 @@ isl_formats_are_ccs_e_compatible(const struct gen_device_info *devinfo,
        !isl_format_supports_ccs_e(devinfo, format2))
       return false;
 
+   /* Gen12 added CCS_E support for A8_UNORM, A8_UNORM and R8_UNORM share the
+    * same aux map format encoding so they are definitely compatible.
+    */
+   if (format1 == ISL_FORMAT_A8_UNORM)
+      format1 = ISL_FORMAT_R8_UNORM;
+
+   if (format2 == ISL_FORMAT_A8_UNORM)
+      format2 = ISL_FORMAT_R8_UNORM;
+
    const struct isl_format_layout *fmtl1 = isl_format_get_layout(format1);
    const struct isl_format_layout *fmtl2 = isl_format_get_layout(format2);