mirror of
https://github.com/torvalds/linux.git
synced 2026-04-27 19:12:29 -04:00
drm/amd/pm:add new gpu_metrics_v2_3 to acquire average temperature info
Add new gpu_metrics_v2_3 to acquire average temperature info from SMU metrics. To acquire average temp info from gpu_metrics interface, but gpu_metrics_v2_2 only has members to show current temp info. --- v1: Only add average_temperature_gfx in gpu_metrics_v2_3. v2: Add average temp members for soc, core and l3 in gpu_metrics_v2_3 and put these new members at the end of gpu_metrics_v2_3. Add operation to read average temp info from metrics table. v3: Merge v1 and v2 and rename the patch. v4: Merge v3. Add firmware version judgment in vangogh_common_get_gpu_metrics to maintain backward compatibility and rename the patch. "return ret" on error scenario in smu_cmn_get_smc_version. Signed-off-by: Li Ma <li.ma@amd.com> Reviewed-by: Evan Quan <evan.quan@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
@@ -824,4 +824,62 @@ struct gpu_metrics_v2_2 {
|
||||
uint64_t indep_throttle_status;
|
||||
};
|
||||
|
||||
struct gpu_metrics_v2_3 {
|
||||
struct metrics_table_header common_header;
|
||||
|
||||
/* Temperature */
|
||||
uint16_t temperature_gfx; // gfx temperature on APUs
|
||||
uint16_t temperature_soc; // soc temperature on APUs
|
||||
uint16_t temperature_core[8]; // CPU core temperature on APUs
|
||||
uint16_t temperature_l3[2];
|
||||
|
||||
/* Utilization */
|
||||
uint16_t average_gfx_activity;
|
||||
uint16_t average_mm_activity; // UVD or VCN
|
||||
|
||||
/* Driver attached timestamp (in ns) */
|
||||
uint64_t system_clock_counter;
|
||||
|
||||
/* Power/Energy */
|
||||
uint16_t average_socket_power; // dGPU + APU power on A + A platform
|
||||
uint16_t average_cpu_power;
|
||||
uint16_t average_soc_power;
|
||||
uint16_t average_gfx_power;
|
||||
uint16_t average_core_power[8]; // CPU core power on APUs
|
||||
|
||||
/* Average clocks */
|
||||
uint16_t average_gfxclk_frequency;
|
||||
uint16_t average_socclk_frequency;
|
||||
uint16_t average_uclk_frequency;
|
||||
uint16_t average_fclk_frequency;
|
||||
uint16_t average_vclk_frequency;
|
||||
uint16_t average_dclk_frequency;
|
||||
|
||||
/* Current clocks */
|
||||
uint16_t current_gfxclk;
|
||||
uint16_t current_socclk;
|
||||
uint16_t current_uclk;
|
||||
uint16_t current_fclk;
|
||||
uint16_t current_vclk;
|
||||
uint16_t current_dclk;
|
||||
uint16_t current_coreclk[8]; // CPU core clocks
|
||||
uint16_t current_l3clk[2];
|
||||
|
||||
/* Throttle status (ASIC dependent) */
|
||||
uint32_t throttle_status;
|
||||
|
||||
/* Fans */
|
||||
uint16_t fan_pwm;
|
||||
|
||||
uint16_t padding[3];
|
||||
|
||||
/* Throttle status (ASIC independent) */
|
||||
uint64_t indep_throttle_status;
|
||||
|
||||
/* Average Temperature */
|
||||
uint16_t average_temperature_gfx; // average gfx temperature on APUs
|
||||
uint16_t average_temperature_soc; // average soc temperature on APUs
|
||||
uint16_t average_temperature_core[8]; // average CPU core temperature on APUs
|
||||
uint16_t average_temperature_l3[2];
|
||||
};
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user