From b99dc621ec1a6a234a520b726485490d4aed89e5 Mon Sep 17 00:00:00 2001 From: Pierre-Eric Pelloux-Prayer Date: Wed, 3 Nov 2021 15:26:21 +0100 Subject: [PATCH] ac/surface: don't validate DCC settings if DCC isn't possible MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: mesa-stable Reviewed-by: Marek Olšák Part-of: (cherry picked from commit dbf602a6b39833c4cdc4b6769ec40ab384fd8bcb) --- .pick_status.json | 2 +- src/amd/common/ac_surface.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 399894f9565..6e01f473dfd 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1714,7 +1714,7 @@ "description": "ac/surface: don't validate DCC settings if DCC isn't possible", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null }, diff --git a/src/amd/common/ac_surface.c b/src/amd/common/ac_surface.c index 121093979b3..caaf220d851 100644 --- a/src/amd/common/ac_surface.c +++ b/src/amd/common/ac_surface.c @@ -2303,7 +2303,9 @@ static int gfx9_compute_surface(struct ac_addrlib *addrlib, const struct radeon_ !(surf->flags & (RADEON_SURF_DISABLE_DCC | RADEON_SURF_FORCE_SWIZZLE_MODE | RADEON_SURF_FORCE_MICRO_TILE_MODE)) && (surf->modifier == DRM_FORMAT_MOD_INVALID || - ac_modifier_has_dcc(surf->modifier))) { + ac_modifier_has_dcc(surf->modifier)) && + is_dcc_supported_by_DCN(info, config, surf, surf->u.gfx9.color.dcc.rb_aligned, + surf->u.gfx9.color.dcc.pipe_aligned)) { /* Validate that DCC is enabled if DCN can do it. */ if ((info->use_display_dcc_unaligned || info->use_display_dcc_with_retile_blit) && AddrSurfInfoIn.flags.display && surf->bpe == 4) {