Commit 07740adc authored by Likun Gao's avatar Likun Gao Committed by Alex Deucher
Browse files

drm/amd/powerplay: add od condition for power limit 



Add condition to judge whether overdrive is enabled and correct power
limit value for overdrive used by power limit interface.

Signed-off-by: default avatarLikun Gao <Likun.Gao@amd.com>
Reviewed-by: default avatarKevin Wang <kevin1.wang@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Reviewed-by: default avatarHuang Rui <ray.huang@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 3b94fb10

drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h

+1 −0
Original line number Diff line number Diff line
@@ -307,6 +307,7 @@ struct smu_table_context 
	struct smu_table		memory_pool;

	uint16_t                        software_shutdown_temp;

	uint8_t                         thermal_controller_type;

	uint16_t			TDPODLimit;



	uint8_t				*od_feature_capabilities;

	uint32_t			*od_settings_max;

drivers/gpu/drm/amd/powerplay/smu_v11_0.c

+15 −0
Original line number Diff line number Diff line
@@ -925,6 +925,10 @@ static int smu_v11_0_get_power_limit(struct smu_context *smu, 
	if (get_default) {

		mutex_lock(&smu->mutex);

		*limit = smu->default_power_limit;

		if (smu->od_enabled) {

			*limit *= (100 + smu->smu_table.TDPODLimit);

			*limit /= 100;

		}

		mutex_unlock(&smu->mutex);

	} else {

		ret = smu_send_smc_msg_with_param(smu, SMU_MSG_GetPptLimit,
@@ -942,8 +946,19 @@ static int smu_v11_0_get_power_limit(struct smu_context *smu, 


static int smu_v11_0_set_power_limit(struct smu_context *smu, uint32_t n)

{

	uint32_t max_power_limit;

	int ret = 0;



	if (n == 0)

		n = smu->default_power_limit;



	max_power_limit = smu->default_power_limit;



	if (smu->od_enabled) {

		max_power_limit *= (100 + smu->smu_table.TDPODLimit);

		max_power_limit /= 100;

	}



	if (smu_feature_is_enabled(smu, FEATURE_PPT_BIT))

		ret = smu_send_smc_msg_with_param(smu, SMU_MSG_SetPptLimit, n);

	if (ret) {

drivers/gpu/drm/amd/powerplay/vega20_ppt.c

+1 −0
Original line number Diff line number Diff line
@@ -274,6 +274,7 @@ static int vega20_store_powerplay_table(struct smu_context *smu) 


	table_context->software_shutdown_temp = powerplay_table->usSoftwareShutdownTemp;

	table_context->thermal_controller_type = powerplay_table->ucThermalControllerType;

	table_context->TDPODLimit = le32_to_cpu(powerplay_table->OverDrive8Table.ODSettingsMax[ATOM_VEGA20_ODSETTING_POWERPERCENTAGE]);



	ret = vega20_setup_od8_information(smu);

CRA Git | Maintained and supported by SUSTech CRA and CCSE