Commit 9e0880d9 authored by Nicholas Kazlauskas's avatar Nicholas Kazlauskas Committed by Alex Deucher
Browse files

drm/amd/display: Drop DMCUB from DCN21 resources 



The interface to the DMCUB won't be through DC itself. DC will instead
call into the DMUB interface introduced with a future change.

The CONFIG_DRM_AMD_DC_DMUB defines will still be used for now but will
be dropped at the end of the series.

Since this define was never configurable in the first place this code
wasn't used.

Signed-off-by: default avatarNicholas Kazlauskas <nicholas.kazlauskas@amd.com>
Reviewed-by: default avatarHersen Wu <hersenxs.wu@amd.com>
Acked-by: default avatarHarry Wentland <harry.wentland@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 2bd2a27f

drivers/gpu/drm/amd/display/dc/dcn21/dcn21_resource.c

+0 −31
Original line number Diff line number Diff line
@@ -373,20 +373,6 @@ static const struct dce_abm_mask abm_mask = { 
		ABM_MASK_SH_LIST_DCN20(_MASK)

};



#ifdef CONFIG_DRM_AMD_DC_DMUB

static const struct dcn21_dmcub_registers dmcub_regs = {

		DMCUB_REG_LIST_DCN()

};



static const struct dcn21_dmcub_shift dmcub_shift = {

		DMCUB_COMMON_MASK_SH_LIST_BASE(__SHIFT)

};



static const struct dcn21_dmcub_mask dmcub_mask = {

		DMCUB_COMMON_MASK_SH_LIST_BASE(_MASK)

};

#endif



#define audio_regs(id)\

[id] = {\

		AUD_COMMON_REG_LIST(id)\
@@ -970,11 +956,6 @@ static void destruct(struct dcn21_resource_pool *pool) 
	if (pool->base.dmcu != NULL)

		dce_dmcu_destroy(&pool->base.dmcu);



#ifdef CONFIG_DRM_AMD_DC_DMUB

	if (pool->base.dmcub != NULL)

		dcn21_dmcub_destroy(&pool->base.dmcub);

#endif



	if (pool->base.dccg != NULL)

		dcn_dccg_destroy(&pool->base.dccg);
@@ -1766,18 +1747,6 @@ static bool construct( 
		goto create_fail;

	}



#ifdef CONFIG_DRM_AMD_DC_DMUB

	pool->base.dmcub = dcn21_dmcub_create(ctx,

			&dmcub_regs,

			&dmcub_shift,

			&dmcub_mask);

	if (pool->base.dmcub == NULL) {

		dm_error("DC: failed to create dmcub!\n");

		BREAK_TO_DEBUGGER();

		goto create_fail;

	}

#endif



	pool->base.pp_smu = dcn21_pp_smu_create(ctx);



	num_pipes = dcn2_1_ip.max_num_dpp;

CRA Git | Maintained and supported by SUSTech CRA and CCSE