Module: Mesa Branch: main Commit: 4de0264010a69d491b734c8cdd0e3d18064c67f3 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=4de0264010a69d491b734c8cdd0e3d18064c67f3
Author: Sagar Ghuge <sagar.gh...@intel.com> Date: Fri Nov 3 17:46:39 2023 -0700 iris: Disable CCS compression on top of MSAA compression on ACM We need to manually resolve the CCS surface when it's available along with the MSAA compression, currently we don't handle that so disable the CCS compression for now. Signed-off-by: Sagar Ghuge <sagar.gh...@intel.com> Reviewed-by: Kenneth Graunke <kenn...@whitecape.org> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26043> --- src/gallium/drivers/iris/iris_resource.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/gallium/drivers/iris/iris_resource.c b/src/gallium/drivers/iris/iris_resource.c index 3ef5e6674f0..e1fbd85a7c2 100644 --- a/src/gallium/drivers/iris/iris_resource.c +++ b/src/gallium/drivers/iris/iris_resource.c @@ -861,7 +861,10 @@ iris_resource_configure_aux(struct iris_screen *screen, if (has_mcs) { assert(!res->mod_info); assert(!has_hiz); - if (has_ccs) { + /* We are seeing failures with CCS compression on top of MSAA + * compression, so just enable MSAA compression for now on DG2. + */ + if (!intel_device_info_is_dg2(devinfo) && has_ccs) { res->aux.usage = ISL_AUX_USAGE_MCS_CCS; } else { res->aux.usage = ISL_AUX_USAGE_MCS;