From 91f972af198d17399567954be74fbf2142c98b6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tapani=20P=C3=A4lli?= Date: Wed, 12 May 2021 15:19:43 +0300 Subject: [PATCH] isl: require hiz for depth surface in isl_surf_get_ccs_surf MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes: 752eefdb ("intel/isl: Refactor isl_surf_get_ccs_surf") Signed-off-by: Tapani Pälli Reviewed-by: Nanley Chery Part-of: (cherry picked from commit 343d90b6ab536ce92050035682c072ad1c21b694) --- .pick_status.json | 2 +- src/intel/isl/isl.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.pick_status.json b/.pick_status.json index c717ef51343..81ec445a684 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -409,7 +409,7 @@ "description": "isl: require hiz for depth surface in isl_surf_get_ccs_surf", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": "752eefdb3db18389dba56dd7c4f9ca45ebe8fadd" }, diff --git a/src/intel/isl/isl.c b/src/intel/isl/isl.c index 76a80eb1338..03284896704 100644 --- a/src/intel/isl/isl.c +++ b/src/intel/isl/isl.c @@ -2116,6 +2116,11 @@ isl_surf_get_ccs_surf(const struct isl_device *dev, return false; if (ISL_GFX_VER(dev) >= 12) { + /* With depth surfaces, HIZ is required for CCS. */ + if (surf->usage & ISL_SURF_USAGE_DEPTH_BIT && + aux_surf->tiling != ISL_TILING_HIZ) + return false; + enum isl_format ccs_format; switch (isl_format_get_layout(surf->format)->bpb) { case 8: ccs_format = ISL_FORMAT_GFX12_CCS_8BPP_Y0; break;