Commit 064329c5 authored by Evan Quan's avatar Evan Quan Committed by Alex Deucher
Browse files

drm/amd/pm: expose swctf threshold setting for legacy powerplay 



Preparation for coming optimization which eliminates the influence of
GPU temperature momentary fluctuation.

Signed-off-by: default avatarEvan Quan <evan.quan@amd.com>
Reviewed-by: default avatarLijo Lazar <lijo.lazar@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent b877934e

drivers/gpu/drm/amd/pm/inc/amdgpu_dpm.h

+2 −0
Original line number Diff line number Diff line
@@ -89,6 +89,8 @@ struct amdgpu_dpm_thermal { 
	int                max_mem_crit_temp;

	/* memory max emergency(shutdown) temp */

	int                max_mem_emergency_temp;

	/* SWCTF threshold */

	int                sw_ctf_threshold;

	/* was last interrupt low to high or high to low */

	bool               high_to_low;

	/* interrupt source */

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

+3 −1
Original line number Diff line number Diff line
@@ -241,7 +241,8 @@ int phm_start_thermal_controller(struct pp_hwmgr *hwmgr) 
		TEMP_RANGE_MAX,

		TEMP_RANGE_MIN,

		TEMP_RANGE_MAX,

		TEMP_RANGE_MAX};

		TEMP_RANGE_MAX,

		0};

	struct amdgpu_device *adev = hwmgr->adev;



	if (!hwmgr->not_vf)
@@ -265,6 +266,7 @@ int phm_start_thermal_controller(struct pp_hwmgr *hwmgr) 
	adev->pm.dpm.thermal.min_mem_temp = range.mem_min;

	adev->pm.dpm.thermal.max_mem_crit_temp = range.mem_crit_max;

	adev->pm.dpm.thermal.max_mem_emergency_temp = range.mem_emergency_max;

	adev->pm.dpm.thermal.sw_ctf_threshold = range.sw_ctf_threshold;



	return ret;

}

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

+2 −0
Original line number Diff line number Diff line
@@ -5432,6 +5432,8 @@ static int smu7_get_thermal_temperature_range(struct pp_hwmgr *hwmgr, 
		thermal_data->max = data->thermal_temp_setting.temperature_shutdown *

			PP_TEMPERATURE_UNITS_PER_CENTIGRADES;



	thermal_data->sw_ctf_threshold = thermal_data->max;



	return 0;

}

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

+10 −0
Original line number Diff line number Diff line
@@ -5241,6 +5241,9 @@ static int vega10_get_thermal_temperature_range(struct pp_hwmgr *hwmgr, 
{

	struct vega10_hwmgr *data = hwmgr->backend;

	PPTable_t *pp_table = &(data->smc_state_table.pp_table);

	struct phm_ppt_v2_information *pp_table_info =

		(struct phm_ppt_v2_information *)(hwmgr->pptable);

	struct phm_tdp_table *tdp_table = pp_table_info->tdp_table;



	memcpy(thermal_data, &SMU7ThermalWithDelayPolicy[0], sizeof(struct PP_TemperatureRange));
@@ -5257,6 +5260,13 @@ static int vega10_get_thermal_temperature_range(struct pp_hwmgr *hwmgr, 
	thermal_data->mem_emergency_max = (pp_table->ThbmLimit + CTF_OFFSET_HBM)*

		PP_TEMPERATURE_UNITS_PER_CENTIGRADES;



	if (tdp_table->usSoftwareShutdownTemp > pp_table->ThotspotLimit &&

	    tdp_table->usSoftwareShutdownTemp < VEGA10_THERMAL_MAXIMUM_ALERT_TEMP)

		thermal_data->sw_ctf_threshold = tdp_table->usSoftwareShutdownTemp;

	else

		thermal_data->sw_ctf_threshold = VEGA10_THERMAL_MAXIMUM_ALERT_TEMP;

	thermal_data->sw_ctf_threshold *= PP_TEMPERATURE_UNITS_PER_CENTIGRADES;



	return 0;

}

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

+4 −0
Original line number Diff line number Diff line
@@ -2763,6 +2763,8 @@ static int vega12_notify_cac_buffer_info(struct pp_hwmgr *hwmgr, 
static int vega12_get_thermal_temperature_range(struct pp_hwmgr *hwmgr,

		struct PP_TemperatureRange *thermal_data)

{

	struct phm_ppt_v3_information *pptable_information =

		(struct phm_ppt_v3_information *)hwmgr->pptable;

	struct vega12_hwmgr *data =

			(struct vega12_hwmgr *)(hwmgr->backend);

	PPTable_t *pp_table = &(data->smc_state_table.pp_table);
@@ -2781,6 +2783,8 @@ static int vega12_get_thermal_temperature_range(struct pp_hwmgr *hwmgr, 
		PP_TEMPERATURE_UNITS_PER_CENTIGRADES;

	thermal_data->mem_emergency_max = (pp_table->ThbmLimit + CTF_OFFSET_HBM)*

		PP_TEMPERATURE_UNITS_PER_CENTIGRADES;

	thermal_data->sw_ctf_threshold = pptable_information->us_software_shutdown_temp *

		PP_TEMPERATURE_UNITS_PER_CENTIGRADES;



	return 0;

}