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

drm/amd/powerplay: correct Navi1X temperature limit settings 



These are needed for temp1/2/3 related hwmon interfaces.

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 0b590970

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

+1 −5
Original line number Diff line number Diff line
@@ -56,10 +56,6 @@ 


#define to_amdgpu_device(x) (container_of(x, struct amdgpu_device, pm.smu_i2c))



#define CTF_OFFSET_EDGE			5

#define CTF_OFFSET_HOTSPOT		5

#define CTF_OFFSET_HBM			5



#define MSG_MAP(msg, index, valid_in_vf) \

	[SMU_MSG_##msg] = {1, (index), (valid_in_vf)}

#define ARCTURUS_FEA_MAP(smu_feature, arcturus_feature) \
@@ -1048,7 +1044,7 @@ static int arcturus_get_thermal_temperature_range(struct smu_context *smu, 
		SMU_TEMPERATURE_UNITS_PER_CENTIGRADES;

	range->mem_crit_max = pptable->TmemLimit *

		SMU_TEMPERATURE_UNITS_PER_CENTIGRADES;

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

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

		SMU_TEMPERATURE_UNITS_PER_CENTIGRADES;



	return 0;

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

+4 −0
Original line number Diff line number Diff line
@@ -66,6 +66,10 @@ 
#define WORKLOAD_MAP(profile, workload) \

	[profile] = {1, (workload)}



#define CTF_OFFSET_EDGE			5

#define CTF_OFFSET_HOTSPOT		5

#define CTF_OFFSET_MEM			5



static const struct smu_temperature_range smu11_thermal_policy[] =

{

	{-273150,  99000, 99000, -273150, 99000, 99000, -273150, 99000, 99000},

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

+13 −4
Original line number Diff line number Diff line
@@ -1856,13 +1856,22 @@ 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 || !powerplay_table)

	if (!range)

		return -EINVAL;



	range->max = powerplay_table->software_shutdown_temp *

	range->max = pptable->TedgeLimit *

		SMU_TEMPERATURE_UNITS_PER_CENTIGRADES;

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

		SMU_TEMPERATURE_UNITS_PER_CENTIGRADES;

	range->hotspot_crit_max = pptable->ThotspotLimit *

		SMU_TEMPERATURE_UNITS_PER_CENTIGRADES;

	range->hotspot_emergency_max = (pptable->ThotspotLimit + CTF_OFFSET_HOTSPOT) *

		SMU_TEMPERATURE_UNITS_PER_CENTIGRADES;

	range->mem_crit_max = pptable->TmemLimit *

		SMU_TEMPERATURE_UNITS_PER_CENTIGRADES;

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

		SMU_TEMPERATURE_UNITS_PER_CENTIGRADES;



	return 0;