Module: Mesa Branch: staging/23.3 Commit: 193256f9e77f7ca4be29926dcf84abdcf6737b8d URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=193256f9e77f7ca4be29926dcf84abdcf6737b8d
Author: Lionel Landwerlin <lionel.g.landwer...@intel.com> Date: Wed Nov 8 16:40:49 2023 +0200 isl: disable MCS compression on R9G9B9E5 Not supported according to the docs and will trigger an assert isl_get_render_compression_format(). Signed-off-by: Lionel Landwerlin <lionel.g.landwer...@intel.com> Cc: mesa-stable Reviewed-by: Sagar Ghuge <sagar.gh...@intel.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26112> (cherry picked from commit d4499c4cb26b87876f0ee16562a4c5b2bd4f8860) --- .pick_status.json | 2 +- src/intel/isl/isl.c | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.pick_status.json b/.pick_status.json index 164c39fe3e9..c796fc086ed 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -124,7 +124,7 @@ "description": "isl: disable MCS compression on R9G9B9E5", "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 d96879c6f00..e8216ae138f 100644 --- a/src/intel/isl/isl.c +++ b/src/intel/isl/isl.c @@ -2774,6 +2774,13 @@ isl_surf_get_mcs_surf(const struct isl_device *dev, if (intel_device_info_is_dg2(dev->info)) return false; + /* On Gfx12+ this format is not listed in TGL PRMs, Volume 2b: Command + * Reference: Enumerations, RenderCompressionFormat + */ + if (ISL_GFX_VER(dev) >= 12 && + surf->format == ISL_FORMAT_R9G9B9E5_SHAREDEXP) + return false; + /* The following are true of all multisampled surfaces */ assert(surf->samples > 1); assert(surf->dim == ISL_SURF_DIM_2D);
