Commit 0540eced authored by Evan Quan's avatar Evan Quan Committed by Alex Deucher
Browse files

drm/amd/powerplay: sort the call flow on temperature ranges retrieving 



This can help to maintain clear code layer.

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

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

+33 −0
Original line number Diff line number Diff line
@@ -991,6 +991,33 @@ static int smu_sw_fini(void *handle) 
	return 0;

}



static int smu_get_thermal_temperature_range(struct smu_context *smu)

{

	struct amdgpu_device *adev = smu->adev;

	struct smu_temperature_range *range =

				&smu->thermal_range;

	int ret = 0;



	if (!smu->ppt_funcs->get_thermal_temperature_range)

		return 0;



	ret = smu->ppt_funcs->get_thermal_temperature_range(smu, range);

	if (ret)

		return ret;



	adev->pm.dpm.thermal.min_temp = range->min;

	adev->pm.dpm.thermal.max_temp = range->max;

	adev->pm.dpm.thermal.max_edge_emergency_temp = range->edge_emergency_max;

	adev->pm.dpm.thermal.min_hotspot_temp = range->hotspot_min;

	adev->pm.dpm.thermal.max_hotspot_crit_temp = range->hotspot_crit_max;

	adev->pm.dpm.thermal.max_hotspot_emergency_temp = range->hotspot_emergency_max;

	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;



	return ret;

}



static int smu_smc_hw_setup(struct smu_context *smu)

{

	struct amdgpu_device *adev = smu->adev;
@@ -1095,6 +1122,12 @@ static int smu_smc_hw_setup(struct smu_context *smu) 
		return ret;

	}



	ret = smu_get_thermal_temperature_range(smu);

	if (ret) {

		dev_err(adev->dev, "Failed to get thermal temperature ranges!\n");

		return ret;

	}



	ret = smu_enable_thermal_alert(smu);

	if (ret) {

		dev_err(adev->dev, "Failed to enable thermal alert!\n");

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

+2 −0
Original line number Diff line number Diff line
@@ -1037,6 +1037,8 @@ static int arcturus_get_thermal_temperature_range(struct smu_context *smu, 
	if (!range)

		return -EINVAL;



	memcpy(range, &smu11_thermal_policy[0], sizeof(struct smu_temperature_range));



	range->max = pptable->TedgeLimit *

		SMU_TEMPERATURE_UNITS_PER_CENTIGRADES;

	range->edge_emergency_max = (pptable->TedgeLimit + CTF_OFFSET_EDGE) *

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

+1 −1
Original line number Diff line number Diff line
@@ -146,7 +146,6 @@ struct smu_power_state { 
	struct smu_state_pcie_block                   pcie;

	struct smu_state_display_block                display;

	struct smu_state_memroy_block                 memory;

	struct smu_temperature_range                  temperatures;

	struct smu_state_software_algorithm_block     software;

	struct smu_uvd_clocks                         uvd_clocks;

	struct smu_hw_power_state                     hardware;
@@ -386,6 +385,7 @@ struct smu_context 
	struct smu_feature		smu_feature;

	struct amd_pp_display_configuration  *display_config;

	struct smu_baco_context		smu_baco;

	struct smu_temperature_range	thermal_range;

	void *od_settings;

#if defined(CONFIG_DEBUG_FS)

	struct dentry                   *debugfs_sclk;

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

+2 −0
Original line number Diff line number Diff line
@@ -1864,6 +1864,8 @@ static int navi10_get_thermal_temperature_range(struct smu_context *smu, 
	if (!range)

		return -EINVAL;



	memcpy(range, &smu11_thermal_policy[0], sizeof(struct smu_temperature_range));



	range->max = pptable->TedgeLimit *

		SMU_TEMPERATURE_UNITS_PER_CENTIGRADES;

	range->edge_emergency_max = (pptable->TedgeLimit + CTF_OFFSET_EDGE) *

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

+2 −0
Original line number Diff line number Diff line
@@ -1653,6 +1653,8 @@ static int sienna_cichlid_get_thermal_temperature_range(struct smu_context *smu, 
	if (!range)

		return -EINVAL;



	memcpy(range, &smu11_thermal_policy[0], sizeof(struct smu_temperature_range));



	range->max = pptable->TemperatureLimit[TEMP_EDGE] *

		SMU_TEMPERATURE_UNITS_PER_CENTIGRADES;

	range->edge_emergency_max = (pptable->TemperatureLimit[TEMP_EDGE] + CTF_OFFSET_EDGE) *