Commit 029479ac authored by Evan Quan's avatar Evan Quan Committed by Alex Deucher
Browse files

drm/amd/pm: drop redundant efuse mask calculations 



By moving that in atomfw_read_efuse().

Signed-off-by: default avatarEvan Quan <evan.quan@amd.com>
Acked-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 55544082

drivers/gpu/drm/amd/pm/powerplay/hwmgr/ppatomctrl.c

+7 −1
Original line number Diff line number Diff line
@@ -1295,12 +1295,18 @@ int atomctrl_get_engine_clock_spread_spectrum( 
}



int atomctrl_read_efuse(struct pp_hwmgr *hwmgr, uint16_t start_index,

		uint16_t end_index, uint32_t mask, uint32_t *efuse)

		uint16_t end_index, uint32_t *efuse)

{

	struct amdgpu_device *adev = hwmgr->adev;

	uint32_t mask;

	int result;

	READ_EFUSE_VALUE_PARAMETER efuse_param;



	if ((end_index - start_index)  == 31)

		mask = 0xFFFFFFFF;

	else

		mask = (1 << ((end_index - start_index) + 1)) - 1;



	efuse_param.sEfuse.usEfuseIndex = cpu_to_le16((start_index / 32) * 4);

	efuse_param.sEfuse.ucBitShift = (uint8_t)

			(start_index - ((start_index / 32) * 32));

drivers/gpu/drm/amd/pm/powerplay/hwmgr/ppatomctrl.h

+1 −1
Original line number Diff line number Diff line
@@ -300,7 +300,7 @@ extern int atomctrl_get_engine_pll_dividers_kong(struct pp_hwmgr *hwmgr, 
						 uint32_t clock_value,

						 pp_atomctrl_clock_dividers_kong *dividers);

extern int atomctrl_read_efuse(struct pp_hwmgr *hwmgr, uint16_t start_index,

		uint16_t end_index, uint32_t mask, uint32_t *efuse);

		uint16_t end_index, uint32_t *efuse);

extern int atomctrl_calculate_voltage_evv_on_sclk(struct pp_hwmgr *hwmgr, uint8_t voltage_type,

		uint32_t sclk, uint16_t virtual_voltage_Id, uint16_t *voltage, uint16_t dpm_level, bool debug);

extern int atomctrl_get_engine_pll_dividers_ai(struct pp_hwmgr *hwmgr, uint32_t clock_value, pp_atomctrl_clock_dividers_ai *dividers);

drivers/gpu/drm/amd/pm/powerplay/smumgr/fiji_smumgr.c

+1 −2
Original line number Diff line number Diff line
@@ -318,13 +318,12 @@ static bool fiji_is_hw_avfs_present(struct pp_hwmgr *hwmgr) 
{



	uint32_t efuse = 0;

	uint32_t mask = (1 << ((AVFS_EN_MSB - AVFS_EN_LSB) + 1)) - 1;



	if (!hwmgr->not_vf)

		return false;



	if (!atomctrl_read_efuse(hwmgr, AVFS_EN_LSB, AVFS_EN_MSB,

			mask, &efuse)) {

			&efuse)) {

		if (efuse)

			return true;

	}

drivers/gpu/drm/amd/pm/powerplay/smumgr/vegam_smumgr.c

+1 −2
Original line number Diff line number Diff line
@@ -1495,12 +1495,11 @@ static int vegam_populate_clock_stretcher_data_table(struct pp_hwmgr *hwmgr) 
			(struct phm_ppt_v1_information *)(hwmgr->pptable);

	struct phm_ppt_v1_clock_voltage_dependency_table *sclk_table =

			table_info->vdd_dep_on_sclk;

	uint32_t mask = (1 << ((STRAP_ASIC_RO_MSB - STRAP_ASIC_RO_LSB) + 1)) - 1;



	stretch_amount = (uint8_t)table_info->cac_dtp_table->usClockStretchAmount;



	atomctrl_read_efuse(hwmgr, STRAP_ASIC_RO_LSB, STRAP_ASIC_RO_MSB,

			mask, &efuse);

			&efuse);



	min = 1200;

	max = 2500;