Module: Mesa Branch: staging/22.2 Commit: 26b95ed4033e1be5679129fe0b0678a25176b21e URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=26b95ed4033e1be5679129fe0b0678a25176b21e
Author: Bas Nieuwenhuizen <[email protected]> Date: Fri Aug 19 14:58:30 2022 +0200 amd/common: Disable DCC retile modifiers on RDNA1 Some claims of corruption, modifier-less Mesa already doesn't do it. Since these modifiers have no purpose besides being displayed lets just disable in Mesa. Cc: mesa-stable Tested-by: Michel Dänzer <[email protected]> Acked-by: Pierre-Eric Pelloux-Prayer <[email protected]> Reviewed-by: Marek Olšák <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18140> (cherry picked from commit ae7532e0cce8b5987335aadda712f1dc3f8ad5e3) --- .pick_status.json | 2 +- src/amd/common/ac_surface.c | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 2f03749511a..2b8403ca7eb 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -3370,7 +3370,7 @@ "description": "amd/common: Disable DCC retile modifiers on RDNA1", "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 21e896334e6..6383803bb89 100644 --- a/src/amd/common/ac_surface.c +++ b/src/amd/common/ac_surface.c @@ -362,15 +362,11 @@ bool ac_get_supported_modifiers(const struct radeon_info *info, AMD_FMT_MOD_SET(DCC_RETILE, 1) | AMD_FMT_MOD_SET(DCC_INDEPENDENT_128B, 1) | AMD_FMT_MOD_SET(DCC_MAX_COMPRESSED_BLOCK, AMD_FMT_MOD_DCC_BLOCK_128B)) - } - - if (info->family == CHIP_NAVI12 || info->family == CHIP_NAVI14 || info->gfx_level >= GFX10_3) { - bool independent_128b = info->gfx_level >= GFX10_3; ADD_MOD(AMD_FMT_MOD | common_dcc | AMD_FMT_MOD_SET(DCC_RETILE, 1) | AMD_FMT_MOD_SET(DCC_INDEPENDENT_64B, 1) | - AMD_FMT_MOD_SET(DCC_INDEPENDENT_128B, independent_128b) | + AMD_FMT_MOD_SET(DCC_INDEPENDENT_128B, 1) | AMD_FMT_MOD_SET(DCC_MAX_COMPRESSED_BLOCK, AMD_FMT_MOD_DCC_BLOCK_64B)) }
