Module: Mesa Branch: staging/22.1 Commit: 3412aaf4f17c5383b8df9a791781ba1c5a1e5842 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=3412aaf4f17c5383b8df9a791781ba1c5a1e5842
Author: Tapani Pälli <[email protected]> Date: Sat Apr 23 09:29:08 2022 +0300 isl: disable mcs (and mcs+ccs) for color msaa on DG2 Fixes lots of various test failures in: dEQP-VK.pipeline.multisample.min_sample_shading_disabled.* dEQP-GLES3.functional*multisample.* KHR-GL*sample_variables.* Cc: mesa-stable Signed-off-by: Tapani Pälli <[email protected]> Acked-by: Kenneth Graunke <[email protected]> Acked-by: Nanley Chery <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13991> (cherry picked from commit d3ef3657b280b3c273957641183e64d388804d08) --- .pick_status.json | 2 +- src/intel/isl/isl.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.pick_status.json b/.pick_status.json index abdc1161901..4066a8ef497 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -202,7 +202,7 @@ "description": "isl: disable mcs (and mcs+ccs) for color msaa on DG2", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null }, diff --git a/src/intel/isl/isl.c b/src/intel/isl/isl.c index 56e10f256c7..ca8d26b78c7 100644 --- a/src/intel/isl/isl.c +++ b/src/intel/isl/isl.c @@ -2097,6 +2097,10 @@ isl_surf_get_mcs_surf(const struct isl_device *dev, if (surf->msaa_layout != ISL_MSAA_LAYOUT_ARRAY) return false; + /* We are seeing failures with mcs on dg2, so disable it for now. */ + if (intel_device_info_is_dg2(dev->info)) + return false; + /* The following are true of all multisampled surfaces */ assert(surf->samples > 1); assert(surf->dim == ISL_SURF_DIM_2D);
