From daa1468b54360f028744ea7cf42d22aa5dfd5ba0 Mon Sep 17 00:00:00 2001 From: Daniel Stone Date: Wed, 8 Mar 2023 15:03:35 +0000 Subject: [PATCH] intel/isl: Don't scream FINISHME into logs for 3D vs. CCS This would probably be a nice optimisation to have, but it really does make the CTS logs awful: https://gitlab.freedesktop.org/mesa/mesa/-/jobs/37692447 Just demote this isl_finishme() to a comment; given it's been unfinished since 2019, we can probably live without it. Fixes: 126c9562d98b ("isl: Redefine the CCS layout for Gen12") Part-of: --- src/intel/isl/isl.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/intel/isl/isl.c b/src/intel/isl/isl.c index fe752d0a28c..4d09800cd1b 100644 --- a/src/intel/isl/isl.c +++ b/src/intel/isl/isl.c @@ -2234,14 +2234,11 @@ isl_surf_supports_ccs(const struct isl_device *dev, if (surf->row_pitch_B % 512 != 0) return false; - /* According to Wa_1406738321, 3D textures need a blit to a new + /* TODO: According to Wa_1406738321, 3D textures need a blit to a new * surface in order to perform a resolve. For now, just disable CCS. */ - if (surf->dim == ISL_SURF_DIM_3D) { - isl_finishme("%s:%s: CCS for 3D textures is disabled, but a workaround" - " is available.", __FILE__, __func__); + if (surf->dim == ISL_SURF_DIM_3D) return false; - } /* Wa_1207137018 *