drm/amd/display: Handle GFX10_RBPLUS modifiers for dcc_ind_blk

Adds the missing logic to set the correct value of dcc_ind_blk for this tiling version.

Signed-off-by: Joshua Ashton <joshua@froggi.es>
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Acked-by: Harry Wentland <harry.wentland@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
index e577bc93465bebb5a520ba69860d1cddf36066b8..db2ca49a36e1a316af7790b26301370200cc0d48 100644 (file)
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -5053,14 +5053,26 @@ fill_gfx9_plane_attributes_from_modifiers(struct amdgpu_device *adev,
        if (modifier_has_dcc(modifier) && !force_disable_dcc) {
                uint64_t dcc_address = afb->address + afb->base.offsets[1];
                bool independent_64b_blks = AMD_FMT_MOD_GET(DCC_INDEPENDENT_64B, modifier);
+               bool independent_128b_blks = AMD_FMT_MOD_GET(DCC_INDEPENDENT_128B, modifier);
 
                dcc->enable = 1;
                dcc->meta_pitch = afb->base.pitches[1];
                dcc->independent_64b_blks = independent_64b_blks;
-               if (independent_64b_blks)
-                       dcc->dcc_ind_blk = hubp_ind_block_64b;
-               else
-                       dcc->dcc_ind_blk = hubp_ind_block_unconstrained;
+               if (AMD_FMT_MOD_GET(TILE_VERSION, modifier) == AMD_FMT_MOD_TILE_VER_GFX10_RBPLUS) {
+                       if (independent_64b_blks && independent_128b_blks)
+                               dcc->dcc_ind_blk = hubp_ind_block_64b;
+                       else if (independent_128b_blks)
+                               dcc->dcc_ind_blk = hubp_ind_block_128b;
+                       else if (independent_64b_blks && !independent_128b_blks)
+                               dcc->dcc_ind_blk = hubp_ind_block_64b_no_128bcl;
+                       else
+                               dcc->dcc_ind_blk = hubp_ind_block_unconstrained;
+               } else {
+                       if (independent_64b_blks)
+                               dcc->dcc_ind_blk = hubp_ind_block_64b;
+                       else
+                               dcc->dcc_ind_blk = hubp_ind_block_unconstrained;
+               }
 
                address->grph.meta_addr.low_part = lower_32_bits(dcc_address);
                address->grph.meta_addr.high_part = upper_32_bits(dcc_address);