Commit f2e7d856 authored by Marek Olšák's avatar Marek Olšák Committed by Alex Deucher
Browse files

drm/amd/display: fix DCC settings for DCN3 



ind_block_64b_no_128bcl means INDEP_64B && INDEP_128B &&
MAX_COMPRESSED_BLOCK_SIZE == 64B. Only used by gfx10.3.

ind_block_64b means INDEP_64B && !INDEP_128B &&
MAX_COMPRESSED_BLOCK_SIZE == 64B. Only used by gfx9 and gfx10.

Signed-off-by: default avatarMarek Olšák <marek.olsak@amd.com>
Acked-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 4874ecf5

drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c

+2 −1
Original line number Diff line number Diff line
@@ -97,9 +97,10 @@ 
 * - 3.41.0 - Add video codec query

 * - 3.42.0 - Add 16bpc fixed point display support

 * - 3.43.0 - Add device hot plug/unplug support

 * - 3.44.0 - DCN3 supports DCC independent block settings: !64B && 128B, 64B && 128B

 */

#define KMS_DRIVER_MAJOR	3

#define KMS_DRIVER_MINOR	43

#define KMS_DRIVER_MINOR	44

#define KMS_DRIVER_PATCHLEVEL	0



int amdgpu_vram_limit;

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

+2 −2
Original line number Diff line number Diff line
@@ -5105,11 +5105,11 @@ fill_gfx9_plane_attributes_from_modifiers(struct amdgpu_device *adev, 
		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;

				dcc->dcc_ind_blk = hubp_ind_block_64b_no_128bcl;

			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;

				dcc->dcc_ind_blk = hubp_ind_block_64b;

			else

				dcc->dcc_ind_blk = hubp_ind_block_unconstrained;

		} else {