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

drm/amd/powerplay: cache the software_shutdown_temp 



As it's needed in the succeeding thermal irq setting.

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 2b1f12a2

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

+4 −0
Original line number Diff line number Diff line
@@ -1029,6 +1029,9 @@ static int arcturus_force_clk_levels(struct smu_context *smu, 
static int arcturus_get_thermal_temperature_range(struct smu_context *smu,

						struct smu_temperature_range *range)

{

	struct smu_table_context *table_context = &smu->smu_table;

	struct smu_11_0_powerplay_table *powerplay_table =

				table_context->power_play_table;

	PPTable_t *pptable = smu->smu_table.driver_pptable;



	if (!range)
@@ -1046,6 +1049,7 @@ static int arcturus_get_thermal_temperature_range(struct smu_context *smu, 
		SMU_TEMPERATURE_UNITS_PER_CENTIGRADES;

	range->mem_emergency_max = (pptable->TmemLimit + CTF_OFFSET_MEM)*

		SMU_TEMPERATURE_UNITS_PER_CENTIGRADES;

	range->software_shutdown_temp = powerplay_table->software_shutdown_temp;



	return 0;

}

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

+1 −0
Original line number Diff line number Diff line
@@ -119,6 +119,7 @@ struct smu_temperature_range { 
	int mem_min;

	int mem_crit_max;

	int mem_emergency_max;

	int software_shutdown_temp;

};



struct smu_state_validation_block {

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

+4 −0
Original line number Diff line number Diff line
@@ -1856,6 +1856,9 @@ static int navi10_get_uclk_dpm_states(struct smu_context *smu, uint32_t *clocks_ 
static int navi10_get_thermal_temperature_range(struct smu_context *smu,

						struct smu_temperature_range *range)

{

	struct smu_table_context *table_context = &smu->smu_table;

	struct smu_11_0_powerplay_table *powerplay_table =

				table_context->power_play_table;

	PPTable_t *pptable = smu->smu_table.driver_pptable;



	if (!range)
@@ -1873,6 +1876,7 @@ static int navi10_get_thermal_temperature_range(struct smu_context *smu, 
		SMU_TEMPERATURE_UNITS_PER_CENTIGRADES;

	range->mem_emergency_max = (pptable->TmemLimit + CTF_OFFSET_MEM)*

		SMU_TEMPERATURE_UNITS_PER_CENTIGRADES;

	range->software_shutdown_temp = powerplay_table->software_shutdown_temp;



	return 0;

}

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

+4 −0
Original line number Diff line number Diff line
@@ -1645,6 +1645,9 @@ static int sienna_cichlid_get_uclk_dpm_states(struct smu_context *smu, uint32_t 
static int sienna_cichlid_get_thermal_temperature_range(struct smu_context *smu,

						struct smu_temperature_range *range)

{

	struct smu_table_context *table_context = &smu->smu_table;

	struct smu_11_0_7_powerplay_table *powerplay_table =

				table_context->power_play_table;

	PPTable_t *pptable = smu->smu_table.driver_pptable;



	if (!range)
@@ -1662,6 +1665,7 @@ static int sienna_cichlid_get_thermal_temperature_range(struct smu_context *smu, 
		SMU_TEMPERATURE_UNITS_PER_CENTIGRADES;

	range->mem_emergency_max = (pptable->TemperatureLimit[TEMP_MEM] + CTF_OFFSET_MEM)*

		SMU_TEMPERATURE_UNITS_PER_CENTIGRADES;

	range->software_shutdown_temp = powerplay_table->software_shutdown_temp;



	return 0;

}