Module: Mesa Branch: staging/23.0 Commit: 8e555ca63e467feda4f0aaeddb5fcc52eb7c2592 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=8e555ca63e467feda4f0aaeddb5fcc52eb7c2592
Author: Tapani Pälli <[email protected]> Date: Wed Apr 12 08:41:21 2023 +0300 isl: disable mcs (and mcs+ccs) for color msaa on gfxver 125 Same/similar issues are seen on MTL platform as DG2 so disable for both. Cc: mesa-stable Signed-off-by: Tapani Pälli <[email protected]> Acked-by: Lionel Landwerlin <[email protected]> Acked-by: Nanley Chery <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22435> (cherry picked from commit d561bac6bb1a037260a07eb3738d81bb3b095dd7) --- .pick_status.json | 2 +- src/intel/isl/isl.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 887208a6380..2151ff1464d 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -2714,7 +2714,7 @@ "description": "isl: disable mcs (and mcs+ccs) for color msaa on gfxver 125", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null, "notes": null diff --git a/src/intel/isl/isl.c b/src/intel/isl/isl.c index 44ba6cef32b..269b3995fd9 100644 --- a/src/intel/isl/isl.c +++ b/src/intel/isl/isl.c @@ -2132,8 +2132,8 @@ 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)) + /* We are seeing failures with mcs on dg2/mtl, so disable it for now. */ + if (ISL_GFX_VERX10(dev) == 125) return false; /* The following are true of all multisampled surfaces */
