Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e5eb3717 authored by Rex Zhu's avatar Rex Zhu Committed by Alex Deucher
Browse files

drm/amd/powerplay: fix bug that get wrong polaris evv voltage. 



value is 32 bits for polaris, not 16.

Signed-off-by: default avatarRex Zhu <Rex.Zhu@amd.com>
Reviewed-by: default avatarKen Wang <Qingqing.Wang@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 4b242760

drivers/gpu/drm/amd/powerplay/hwmgr/polaris10_hwmgr.c

+4 −3
Original line number Diff line number Diff line
@@ -2685,7 +2685,7 @@ static int polaris10_get_evv_voltages(struct pp_hwmgr *hwmgr) 
{

	struct polaris10_hwmgr *data = (struct polaris10_hwmgr *)(hwmgr->backend);

	uint16_t vv_id;

	uint16_t vddc = 0;

	uint32_t vddc = 0;

	uint16_t i, j;

	uint32_t sclk = 0;

	struct phm_ppt_v1_information *table_info =
@@ -2716,8 +2716,9 @@ static int polaris10_get_evv_voltages(struct pp_hwmgr *hwmgr) 
						continue);





			/* need to make sure vddc is less than 2v or else, it could burn the ASIC. */

			PP_ASSERT_WITH_CODE((vddc < 2000 && vddc != 0),

			/* need to make sure vddc is less than 2v or else, it could burn the ASIC.

			 * real voltage level in unit of 0.01mv */

			PP_ASSERT_WITH_CODE((vddc < 200000 && vddc != 0),

					"Invalid VDDC value", result = -EINVAL;);



			/* the voltage should not be zero nor equal to leakage ID */

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

+2 −2
Original line number Diff line number Diff line
@@ -1256,7 +1256,7 @@ int atomctrl_set_ac_timing_ai(struct pp_hwmgr *hwmgr, uint32_t memory_clock, 
}



int atomctrl_get_voltage_evv_on_sclk_ai(struct pp_hwmgr *hwmgr, uint8_t voltage_type,

				uint32_t sclk, uint16_t virtual_voltage_Id, uint16_t *voltage)

				uint32_t sclk, uint16_t virtual_voltage_Id, uint32_t *voltage)

{



	int result;
@@ -1274,7 +1274,7 @@ int atomctrl_get_voltage_evv_on_sclk_ai(struct pp_hwmgr *hwmgr, uint8_t voltage_ 
	if (0 != result)

		return result;



	*voltage = get_voltage_info_param_space.usVoltageLevel;

	*voltage = ((GET_EVV_VOLTAGE_INFO_OUTPUT_PARAMETER_V1_3 *)(&get_voltage_info_param_space))->ulVoltageLevel;



	return result;

}

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

+1 −1
Original line number Diff line number Diff line
@@ -305,7 +305,7 @@ extern int atomctrl_get_engine_pll_dividers_ai(struct pp_hwmgr *hwmgr, uint32_t 
extern int atomctrl_set_ac_timing_ai(struct pp_hwmgr *hwmgr, uint32_t memory_clock,

								uint8_t level);

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

				uint32_t sclk, uint16_t virtual_voltage_Id, uint16_t *voltage);

				uint32_t sclk, uint16_t virtual_voltage_Id, uint32_t *voltage);

extern int atomctrl_get_smc_sclk_range_table(struct pp_hwmgr *hwmgr, struct pp_atom_ctrl_sclk_range_table *table);



extern int atomctrl_get_avfs_information(struct pp_hwmgr *hwmgr, struct pp_atom_ctrl__avfs_parameters *param);