Commit a86396c3 authored by Joshua Ashton's avatar Joshua Ashton Committed by Alex Deucher
Browse files

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: default avatarJoshua Ashton <joshua@froggi.es>
Reviewed-by: default avatarBas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Acked-by: default avatarHarry Wentland <harry.wentland@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 3d360154

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c

+16 −4
Original line number Diff line number Diff line
@@ -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 (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);