tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

drm/amd/pm: Remove unavailable temperature params

Temperature limits are not available for SMU v13.0.6. Also, edge
temperature is not tracked. Remove logic associated with those.

Signed-off-by: Lijo Lazar <lijo.lazar@amd.com>
Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com>
Reviewed-by: Yang Wang <kevinyang.wang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

authored by

Lijo Lazar and committed by
Alex Deucher 75458a84 8866d627

-43
-43
drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c
··· 82 82 83 83 #define smnPCIE_ESM_CTRL 0x111003D0 84 84 85 - static const struct smu_temperature_range smu_v13_0_6_thermal_policy[] = { 86 - { -273150, 99000, 99000, -273150, 99000, 99000, -273150, 99000, 99000 }, 87 - { 120000, 120000, 120000, 120000, 120000, 120000, 120000, 120000, 88 - 120000 }, 89 - }; 90 - 91 85 static const struct cmn2asic_msg_mapping smu_v13_0_6_message_map[SMU_MSG_MAX_COUNT] = { 92 86 MSG_MAP(TestMessage, PPSMC_MSG_TestMessage, 0), 93 87 MSG_MAP(GetSmuVersion, PPSMC_MSG_GetSmuVersion, 1), ··· 695 701 case METRICS_AVERAGE_SOCKETPOWER: 696 702 *value = SMUQ10_TO_UINT(metrics->SocketPower) << 8; 697 703 break; 698 - case METRICS_TEMPERATURE_EDGE: 699 - *value = 0; 700 - break; 701 704 case METRICS_TEMPERATURE_HOTSPOT: 702 705 *value = SMUQ10_TO_UINT(metrics->MaxSocketTemperature); 703 706 break; ··· 1118 1127 return ret; 1119 1128 } 1120 1129 1121 - static int 1122 - smu_v13_0_6_get_thermal_temperature_range(struct smu_context *smu, 1123 - struct smu_temperature_range *range) 1124 - { 1125 - uint8_t software_shutdown_temp; 1126 - uint8_t hotspotlimit; 1127 - uint8_t memlimit; 1128 - 1129 - if (!range) 1130 - return -EINVAL; 1131 - 1132 - /* TODO: Find a way to get temperature limits */ 1133 - memcpy(range, &smu_v13_0_6_thermal_policy[0], 1134 - sizeof(struct smu_temperature_range)); 1135 - 1136 - range->hotspot_crit_max = 1137 - hotspotlimit * SMU_TEMPERATURE_UNITS_PER_CENTIGRADES; 1138 - range->hotspot_emergency_max = (hotspotlimit + CTF_OFFSET_HOTSPOT) * 1139 - SMU_TEMPERATURE_UNITS_PER_CENTIGRADES; 1140 - range->mem_crit_max = memlimit * SMU_TEMPERATURE_UNITS_PER_CENTIGRADES; 1141 - range->mem_emergency_max = (memlimit + CTF_OFFSET_MEM) * 1142 - SMU_TEMPERATURE_UNITS_PER_CENTIGRADES; 1143 - range->software_shutdown_temp = software_shutdown_temp; 1144 - 1145 - return 0; 1146 - } 1147 - 1148 1130 static int smu_v13_0_6_get_current_activity_percent(struct smu_context *smu, 1149 1131 enum amd_pp_sensors sensor, 1150 1132 uint32_t *value) ··· 1168 1204 ret = smu_v13_0_6_get_smu_metrics_data( 1169 1205 smu, METRICS_TEMPERATURE_HOTSPOT, value); 1170 1206 break; 1171 - case AMDGPU_PP_SENSOR_EDGE_TEMP: 1172 - ret = smu_v13_0_6_get_smu_metrics_data( 1173 - smu, METRICS_TEMPERATURE_EDGE, value); 1174 - break; 1175 1207 case AMDGPU_PP_SENSOR_MEM_TEMP: 1176 1208 ret = smu_v13_0_6_get_smu_metrics_data( 1177 1209 smu, METRICS_TEMPERATURE_MEM, value); ··· 1204 1244 *size = 4; 1205 1245 break; 1206 1246 case AMDGPU_PP_SENSOR_HOTSPOT_TEMP: 1207 - case AMDGPU_PP_SENSOR_EDGE_TEMP: 1208 1247 case AMDGPU_PP_SENSOR_MEM_TEMP: 1209 1248 ret = smu_v13_0_6_thermal_get_temperature(smu, sensor, 1210 1249 (uint32_t *)data); ··· 2007 2048 /* dpm/clk tables */ 2008 2049 .set_default_dpm_table = smu_v13_0_6_set_default_dpm_table, 2009 2050 .populate_umd_state_clk = smu_v13_0_6_populate_umd_state_clk, 2010 - .get_thermal_temperature_range = 2011 - smu_v13_0_6_get_thermal_temperature_range, 2012 2051 .print_clk_levels = smu_v13_0_6_print_clk_levels, 2013 2052 .force_clk_levels = smu_v13_0_6_force_clk_levels, 2014 2053 .read_sensor = smu_v13_0_6_read_sensor,