Module: Mesa Branch: staging/21.0 Commit: a49fd8b1319077663424bf3cfefa8d84a3d2d9c6 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=a49fd8b1319077663424bf3cfefa8d84a3d2d9c6
Author: Tapani Pälli <[email protected]> Date: Wed May 12 15:19:43 2021 +0300 isl: require hiz for depth surface in isl_surf_get_ccs_surf Fixes: 752eefdb ("intel/isl: Refactor isl_surf_get_ccs_surf") Signed-off-by: Tapani Pälli <[email protected]> Reviewed-by: Nanley Chery <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10768> (cherry picked from commit 343d90b6ab536ce92050035682c072ad1c21b694) Conflicts: src/intel/isl/isl.c --- .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 3449b455021..fa7adf07c2c 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -2137,7 +2137,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 e5d324a537c..8af9705c9c0 100644 --- a/src/intel/isl/isl.c +++ b/src/intel/isl/isl.c @@ -2112,6 +2112,11 @@ isl_surf_get_ccs_surf(const struct isl_device *dev, return false; if (ISL_DEV_GEN(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_GEN12_CCS_8BPP_Y0; break; _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
