drm/amd/pm: Vangogh: Add new gpu_metrics_v2_4 to acquire gpu_metrics
Subsystems (3)
PATCH v2 1/1 drm/amd/pm: Vangogh: Add new gpu_metrics_v2_4 to acquire gpu_metrics
To acquire the voltage and current info from gpu_metrics interface, but gpu_metrics_v2_3 doesn't contain them, and to be backward compatible, add new gpu_metrics_v2_4 structure.
--- .../gpu/drm/amd/include/kgd_pp_interface.h | 69 +++++++++++ .../gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c | 109 ++++++++++++++++-- drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c | 3 + 3 files changed, 172 insertions(+), 9 deletions(-)
drivers/gpu/drm/amd/include/kgd_pp_interface.h +69 -0
@@ -892,4 +892,73 @@ struct gpu_metrics_v2_3 {uint16_t average_temperature_core[8 ];// average CPU core temperature on APUs uint16_t average_temperature_l3[2 ]; }; + +struct gpu_metrics_v2_4 { +struct metrics_table_header common_header; + +/* Temperature (unit: centi-Celsius) */ +uint16_t temperature_gfx; +uint16_t temperature_soc; +uint16_t temperature_core[8 ]; +uint16_t temperature_l3[2 ]; + +/* Utilization (unit: centi) */ +uint16_t average_gfx_activity; +uint16_t average_mm_activity; + +/* Driver attached timestamp (in ns) */ +uint64_t system_clock_counter; + +/* Power/Energy (unit: mW) */ +uint16_t average_socket_power; +uint16_t average_cpu_power; +uint16_t average_soc_power; +uint16_t average_gfx_power; +uint16_t average_core_power[8 ]; + +/* Average clocks (unit: MHz) */ +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 (unit: MHz) */ +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 ]; +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 (unit: centi-Celsius) */ +uint16_t average_temperature_gfx; +uint16_t average_temperature_soc; +uint16_t average_temperature_core[8 ]; +uint16_t average_temperature_l3[2 ]; + +/* Power/Voltage (unit: mV) */ +uint16_t average_cpu_voltage; +uint16_t average_soc_voltage; +uint16_t average_gfx_voltage; + +/* Power/Current (unit: mA) */ +uint16_t average_cpu_current; +uint16_t average_soc_current; +uint16_t average_gfx_current; +};#endif
drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c +100 -9
129 lines not on this page · raw message
drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c +3 -0
@@ -996,6 +996,9 @@ void smu_cmn_init_soft_gpu_metrics(void *table, uint8_t frev, uint8_t crev)case METRICS_VERSION (2 ,3 ): structure_size =sizeof (struct gpu_metrics_v2_3 );break ; +case METRICS_VERSION (2 ,4 ): + structure_size =sizeof (struct gpu_metrics_v2_4 ); +break ;default :return ; }
Signature · 1 line
2.39.2
[AMD Official Use Only - General]
Any comments? Any advice?
Best Regards,
Wenyou
Quoted 276 lines
-----Original Message-----
From: Wenyou Yang <[email protected]>
Sent: Wednesday, June 21, 2023 2:32 PM
To: Deucher, Alexander <[email protected]>; Limonciello, Mario <[email protected]>; Koenig, Christian <[email protected]>; Pan, Xinhui <[email protected]>; Quan, Evan <[email protected]>
Cc: Yuan, Perry <[email protected]>; Liang, Richard qi <[email protected]>; [email protected]; dri- [email protected]; [email protected]; Yang, WenYou <[email protected]>
Subject: [PATCH v2] drm/amd/pm: Vangogh: Add newgpu_metrics_v2_4to acquiregpu_metricsTo acquire the voltage and current info from
gpu_metricsinterface, butgpu_metrics_v2_3doesn't contain them, and to be backward compatible, add newgpu_metrics_v2_4structure.Reviewed-by Mario Limonciello <[email protected]>Acked-by Evan Quan <[email protected]>Signed-off-by Wenyou Yang <[email protected]>--- .../gpu/drm/amd/include/kgd_pp_interface.h | 69 +++++++++++ .../gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c | 109 ++++++++++++++++-(quoted diff) +0
-1- drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c | 3 + 3 files changed, 172 insertions(+), 9 deletions(-)drivers/gpu/drm/amd/include/kgd_pp_interface.h +0
-0@@ -892,4 +892,73 @@ struct gpu_metrics_v2_3 {uint16_t average_temperature_core[8 ];// average CPU core temperature on APUs
uint16_t average_temperature_l3[2];};
drivers/gpu/drm/amd/include/kgd_pp_interface.h +69
-0+ +struct gpu_metrics_v2_4 { +struct metrics_table_header common_header; + +/* Temperature (unit: centi-Celsius) */ +uint16_t temperature_gfx; +uint16_t temperature_soc; +uint16_t temperature_core[8 ]; +uint16_t temperature_l3[2 ]; + +/* Utilization (unit: centi) */ +uint16_t average_gfx_activity; +uint16_t average_mm_activity; + +/* Driver attached timestamp (in ns) */ +uint64_t system_clock_counter; + +/* Power/Energy (unit: mW) */ +uint16_t average_socket_power; +uint16_t average_cpu_power; +uint16_t average_soc_power; +uint16_t average_gfx_power; +uint16_t average_core_power[8 ]; + +/* Average clocks (unit: MHz) */ +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 (unit: MHz) */ +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 ]; +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 (unit: centi-Celsius) */ +uint16_t average_temperature_gfx; +uint16_t average_temperature_soc; +uint16_t average_temperature_core[8 ]; +uint16_t average_temperature_l3[2 ]; + +/* Power/Voltage (unit: mV) */ +uint16_t average_cpu_voltage; +uint16_t average_soc_voltage; +uint16_t average_gfx_voltage; + +/* Power/Current (unit: mA) */ +uint16_t average_cpu_current; +uint16_t average_soc_current; +uint16_t average_gfx_current; +};#endif drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c +34
-0@@ -1854,6 +1854,86 @@ static ssize_t vangogh_get_gpu_metrics_v2_3(structsmu_context *smu, return sizeof(struct gpu_metrics_v2_3); } +static ssize_t vangogh_get_gpu_metrics_v2_4 (struct smu_context *smu, +void **table) +{ +SmuMetrics_t metrics; +struct smu_table_context *smu_table = &smu->smu_table; +struct gpu_metrics_v2_4 *gpu_metrics = + (struct gpu_metrics_v2_4 *)smu_table- >gpu_metrics_table; +int ret =0 ; + + ret =smu_cmn_get_metrics_table (smu, &metrics, true); +if (ret) +return ret; + +smu_cmn_init_soft_gpu_metrics (gpu_metrics,2 ,4 ); + + gpu_metrics->temperature_gfx = metrics.Current.GfxTemperature; + gpu_metrics->temperature_soc = metrics.Current.SocTemperature; +memcpy (&gpu_metrics->temperature_core[0 ], + &metrics.Current.CoreTemperature[0 ], +sizeof (uint16_t ) *4 ); + gpu_metrics->temperature_l3[0 ] = metrics.Current.L3Temperature[0 ]; + + gpu_metrics->average_temperature_gfx = metrics.Average.GfxTemperature; + gpu_metrics->average_temperature_soc = metrics.Average.SocTemperature; +memcpy (&gpu_metrics->average_temperature_core[0 ], + &metrics.Average.CoreTemperature[0 ], +sizeof (uint16_t ) *4 ); + gpu_metrics->average_temperature_l3[0 ] = +metrics.Average.L3Temperature[0 ]; + + gpu_metrics->average_gfx_activity = metrics.Current.GfxActivity; + gpu_metrics->average_mm_activity = metrics.Current.UvdActivity; + + gpu_metrics->average_socket_power =metrics.Current.CurrentSocketPower;
drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c +17
-0+ gpu_metrics->average_cpu_power = metrics.Current.Power[0 ]; + gpu_metrics->average_soc_power = metrics.Current.Power[1 ]; + gpu_metrics->average_gfx_power = metrics.Current.Power[2 ]; + + gpu_metrics->average_cpu_voltage = metrics.Current.Voltage[0 ]; + gpu_metrics->average_soc_voltage = metrics.Current.Voltage[1 ]; + gpu_metrics->average_gfx_voltage = metrics.Current.Voltage[2 ]; + + gpu_metrics->average_cpu_current = metrics.Current.Current[0 ]; + gpu_metrics->average_soc_current = metrics.Current.Current[1 ]; + gpu_metrics->average_gfx_current = metrics.Current.Current[2 ]; + +memcpy (&gpu_metrics->average_core_power[0 ], + &metrics.Average.CorePower[0 ], +sizeof (uint16_t ) *4 ); + + gpu_metrics->average_gfxclk_frequency =metrics.Average.GfxclkFrequency;
+gpu_metrics->average_socclk_frequency=
metrics.Average.SocclkFrequency;
+gpu_metrics->average_uclk_frequency=
metrics.Average.MemclkFrequency;
+gpu_metrics->average_fclk_frequency=
metrics.Average.MemclkFrequency;drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c +2
-0+ gpu_metrics->average_vclk_frequency = metrics.Average.VclkFrequency; + gpu_metrics->average_dclk_frequency =metrics.Average.DclkFrequency;
drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c +17
-0+ + gpu_metrics->current_gfxclk = metrics.Current.GfxclkFrequency; + gpu_metrics->current_socclk = metrics.Current.SocclkFrequency; + gpu_metrics->current_uclk = metrics.Current.MemclkFrequency; + gpu_metrics->current_fclk = metrics.Current.MemclkFrequency; + gpu_metrics->current_vclk = metrics.Current.VclkFrequency; + gpu_metrics->current_dclk = metrics.Current.DclkFrequency; + +memcpy (&gpu_metrics->current_coreclk[0 ], + &metrics.Current.CoreFrequency[0 ], +sizeof (uint16_t ) *4 ); + gpu_metrics->current_l3clk[0 ] = metrics.Current.L3Frequency[0 ]; + + gpu_metrics->throttle_status = metrics.Current.ThrottlerStatus; + gpu_metrics->indep_throttle_status = + smu_cmn_get_indep_throttler_status(metrics.Current.ThrottlerStatus, +
vangogh_throttler_map);drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c +24
-9+ + gpu_metrics->system_clock_counter =ktime_get_boottime_ns (); + + *table = (void *)gpu_metrics; + +return sizeof (struct gpu_metrics_v2_4 ); } +static ssize_t vangogh_get_gpu_metrics (struct smu_context *smu,void **table) {@@ -1923,23 +2003,34 @@ static ssize_t vangogh_common_get_gpu_metrics(struct smu_context *smu, { uint32_t if_version;uint32_t smu_version; +uint32_t smu_program; +uint32_t fw_version;int ret =0 ; ret =smu_cmn_get_smc_version (smu, &if_version, &smu_version); -if (ret) { +if (ret)return ret; - } -if (smu_version >=0x043F3E00 ) { -if (if_version <0x3 ) - ret =vangogh_get_legacy_gpu_metrics_v2_3 (smu, table); + smu_program = (smu_version >>24 ) &0xff ; + fw_version = smu_version &0xffffff ; +if (smu_program ==6 ) { +if (fw_version >=0x3F0800 ) + ret =vangogh_get_gpu_metrics_v2_4 (smu, table);else ret =vangogh_get_gpu_metrics_v2_3 (smu, table); + }else { -if (if_version <0x3 ) - ret =vangogh_get_legacy_gpu_metrics (smu, table); -else - ret =vangogh_get_gpu_metrics (smu, table); +if (smu_version >=0x043F3E00 ) { +if (if_version <0x3 ) + ret =vangogh_get_legacy_gpu_metrics_v2_3 (smu, table); +else + ret =vangogh_get_gpu_metrics_v2_3 (smu, table); + }else { +if (if_version <0x3 ) + ret = vangogh_get_legacy_gpu_metrics(smu,table);
drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c +3
-0+else + ret =vangogh_get_gpu_metrics (smu, table); + } }return ret;drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c +3
-0@@ -996,6 +996,9 @@ void smu_cmn_init_soft_gpu_metrics(void *table, uint8_t frev, uint8_t crev)case METRICS_VERSION (2 ,3 ): structure_size =sizeof (struct gpu_metrics_v2_3 );break ; +case METRICS_VERSION (2 ,4 ): + structure_size =sizeof (struct gpu_metrics_v2_4 ); +break ;default :return ;}--
2.39.2
[AMD Official Use Only - General]
Hi Wenyou,
I think you already got the greenlight(RB from Mario and ACK from me) to land the change. Go ahead please.
Evan
Quoted 303 lines
-----Original Message-----
From: Yang, WenYou <[email protected]>
Sent: Thursday, July 13, 2023 8:56 AM
To: Yang, WenYou <[email protected]>; Deucher, Alexander <[email protected]>; Limonciello, Mario <[email protected]>; Koenig, Christian <[email protected]>; Pan, Xinhui <[email protected]>; Quan, Evan <[email protected]>
Cc: Yuan, Perry <[email protected]>; Liang, Richard qi <[email protected]>; [email protected]; dri- [email protected]; [email protected]
Subject: RE: [PATCH v2] drm/amd/pm: Vangogh: Add newgpu_metrics_v2_4to acquiregpu_metrics[AMD Official Use Only - General]
Any comments? Any advice?
Best Regards,
WenyouQuoted 19 lines
-----Original Message-----
From: Wenyou Yang <[email protected]>
Sent: Wednesday, June 21, 2023 2:32 PM
To: Deucher, Alexander <[email protected]>; Limonciello, Mario <[email protected]>; Koenig, Christian <[email protected]>; Pan, Xinhui <[email protected]>; Quan, Evan <[email protected]>
Cc: Yuan, Perry <[email protected]>; Liang, Richard qi <[email protected]>; [email protected]; dri- [email protected]; [email protected]; Yang, WenYou <[email protected]>
Subject: [PATCH v2] drm/amd/pm: Vangogh: Add newgpu_metrics_v2_4to acquiregpu_metricsTo acquire the voltage and current info from
gpu_metricsinterface, butgpu_metrics_v2_3doesn't contain them, and to be backward compatible, add newgpu_metrics_v2_4structure.Quoted 6 lines
Reviewed-by Mario Limonciello <[email protected]>Acked-by Evan Quan <[email protected]>Signed-off-by Wenyou Yang <[email protected]>--- .../gpu/drm/amd/include/kgd_pp_interface.h | 69 +++++++++++ .../gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c | 109++++++++++++++++-
Quoted 255 lines
(quoted diff) +0
-1- drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c | 3 + 3 files changed, 172 insertions(+), 9 deletions(-)drivers/gpu/drm/amd/include/kgd_pp_interface.h +0
-0@@ -892,4 +892,73 @@ struct gpu_metrics_v2_3 {uint16_t average_temperature_core[8 ];// average CPU core temperature on APUs
uint16_t average_temperature_l3[2];};
drivers/gpu/drm/amd/include/kgd_pp_interface.h +69
-0+ +struct gpu_metrics_v2_4 { +struct metrics_table_header common_header; + +/* Temperature (unit: centi-Celsius) */ +uint16_t temperature_gfx; +uint16_t temperature_soc; +uint16_t temperature_core[8 ]; +uint16_t temperature_l3[2 ]; + +/* Utilization (unit: centi) */ +uint16_t average_gfx_activity; +uint16_t average_mm_activity; + +/* Driver attached timestamp (in ns) */ +uint64_t system_clock_counter; + +/* Power/Energy (unit: mW) */ +uint16_t average_socket_power; +uint16_t average_cpu_power; +uint16_t average_soc_power; +uint16_t average_gfx_power; +uint16_t average_core_power[8 ]; + +/* Average clocks (unit: MHz) */ +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 (unit: MHz) */ +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 ]; +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 (unit: centi-Celsius) */ +uint16_t average_temperature_gfx; +uint16_t average_temperature_soc; +uint16_t average_temperature_core[8 ]; +uint16_t average_temperature_l3[2 ]; + +/* Power/Voltage (unit: mV) */ +uint16_t average_cpu_voltage; +uint16_t average_soc_voltage; +uint16_t average_gfx_voltage; + +/* Power/Current (unit: mA) */ +uint16_t average_cpu_current; +uint16_t average_soc_current; +uint16_t average_gfx_current; +};#endif drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c +0
-0@@ -1854,6 +1854,86 @@ static ssize_tvangogh_get_gpu_metrics_v2_3(struct
smu_context*smu,return sizeof(struct gpu_metrics_v2_3); }drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c +6
-0+static ssize_t vangogh_get_gpu_metrics_v2_4 (struct smu_context *smu, +void **table) { +SmuMetrics_t metrics; +struct smu_table_context *smu_table = &smu->smu_table; +struct gpu_metrics_v2_4 *gpu_metrics = + (struct gpu_metrics_v2_4 *)smu_table-Quoted 1 line
gpu_metrics_table;drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c +17
-0+int ret =0 ; + + ret =smu_cmn_get_metrics_table (smu, &metrics, true); +if (ret) +return ret; + +smu_cmn_init_soft_gpu_metrics (gpu_metrics,2 ,4 ); + + gpu_metrics->temperature_gfx = metrics.Current.GfxTemperature; + gpu_metrics->temperature_soc = metrics.Current.SocTemperature; +memcpy (&gpu_metrics->temperature_core[0 ], + &metrics.Current.CoreTemperature[0 ], +sizeof (uint16_t ) *4 ); + gpu_metrics->temperature_l3[0 ] = + metrics.Current.L3Temperature[0 ]; + + gpu_metrics->average_temperature_gfx =metrics.Average.GfxTemperature;
+gpu_metrics->average_temperature_soc=
metrics.Average.SocTemperature;drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c +10
-0+memcpy (&gpu_metrics->average_temperature_core[0 ], + &metrics.Average.CoreTemperature[0 ], +sizeof (uint16_t ) *4 ); + gpu_metrics->average_temperature_l3[0 ] = +metrics.Average.L3Temperature[0 ]; + + gpu_metrics->average_gfx_activity = metrics.Current.GfxActivity; + gpu_metrics->average_mm_activity = metrics.Current.UvdActivity; + + gpu_metrics->average_socket_power =metrics.Current.CurrentSocketPower;
drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c +17
-0+ gpu_metrics->average_cpu_power = metrics.Current.Power[0 ]; + gpu_metrics->average_soc_power = metrics.Current.Power[1 ]; + gpu_metrics->average_gfx_power = metrics.Current.Power[2 ]; + + gpu_metrics->average_cpu_voltage = metrics.Current.Voltage[0 ]; + gpu_metrics->average_soc_voltage = metrics.Current.Voltage[1 ]; + gpu_metrics->average_gfx_voltage = metrics.Current.Voltage[2 ]; + + gpu_metrics->average_cpu_current = metrics.Current.Current[0 ]; + gpu_metrics->average_soc_current = metrics.Current.Current[1 ]; + gpu_metrics->average_gfx_current = metrics.Current.Current[2 ]; + +memcpy (&gpu_metrics->average_core_power[0 ], + &metrics.Average.CorePower[0 ], +sizeof (uint16_t ) *4 ); + + gpu_metrics->average_gfxclk_frequency =metrics.Average.GfxclkFrequency;
+gpu_metrics->average_socclk_frequency=
metrics.Average.SocclkFrequency;
+gpu_metrics->average_uclk_frequency=
metrics.Average.MemclkFrequency;
+gpu_metrics->average_fclk_frequency=
metrics.Average.MemclkFrequency;drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c +2
-0+ gpu_metrics->average_vclk_frequency = metrics.Average.VclkFrequency; + gpu_metrics->average_dclk_frequency =metrics.Average.DclkFrequency;
drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c +16
-0+ + gpu_metrics->current_gfxclk = metrics.Current.GfxclkFrequency; + gpu_metrics->current_socclk = metrics.Current.SocclkFrequency; + gpu_metrics->current_uclk = metrics.Current.MemclkFrequency; + gpu_metrics->current_fclk = metrics.Current.MemclkFrequency; + gpu_metrics->current_vclk = metrics.Current.VclkFrequency; + gpu_metrics->current_dclk = metrics.Current.DclkFrequency; + +memcpy (&gpu_metrics->current_coreclk[0 ], + &metrics.Current.CoreFrequency[0 ], +sizeof (uint16_t ) *4 ); + gpu_metrics->current_l3clk[0 ] = metrics.Current.L3Frequency[0 ]; + + gpu_metrics->throttle_status = metrics.Current.ThrottlerStatus; + gpu_metrics->indep_throttle_status = +smu_cmn_get_indep_throttler_status(metrics.Current.ThrottlerStatus, +
vangogh_throttler_map);drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c +8
-0+ + gpu_metrics->system_clock_counter =ktime_get_boottime_ns (); + + *table = (void *)gpu_metrics; + +return sizeof (struct gpu_metrics_v2_4 ); } +static ssize_t vangogh_get_gpu_metrics (struct smu_context *smu, void **table) { @@ -1923,23 +2003,34 @@ static ssize_t vangogh_common_get_gpu_metrics(structsmu_context *smu, { uint32_t if_version; uint32_t smu_version;drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c +3
-5+uint32_t smu_program; +uint32_t fw_version;int ret =0 ; ret =smu_cmn_get_smc_version (smu, &if_version, &smu_version); -if (ret) { +if (ret)return ret; - } -if (smu_version >=0x043F3E00 ) { -if (if_version <0x3 ) - ret = vangogh_get_legacy_gpu_metrics_v2_3(smu,table);
drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c +9
-4+ smu_program = (smu_version >>24 ) &0xff ; + fw_version = smu_version &0xffffff ; +if (smu_program ==6 ) { +if (fw_version >=0x3F0800 ) + ret =vangogh_get_gpu_metrics_v2_4 (smu, table);else ret =vangogh_get_gpu_metrics_v2_3 (smu, table); + }else { -if (if_version <0x3 ) - ret =vangogh_get_legacy_gpu_metrics (smu, table); -else - ret =vangogh_get_gpu_metrics (smu, table); +if (smu_version >=0x043F3E00 ) { +if (if_version <0x3 ) + ret =
vangogh_get_legacy_gpu_metrics_v2_3(smu, table);drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c +2
-0+else + ret = vangogh_get_gpu_metrics_v2_3(smu,table);
drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c +4
-0+ }else { +if (if_version <0x3 ) + ret = + vangogh_get_legacy_gpu_metrics(smu,table);
drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c +3
-0+else + ret =vangogh_get_gpu_metrics (smu, table); + } }return ret;drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c +3
-0@@ -996,6 +996,9 @@ void smu_cmn_init_soft_gpu_metrics(void *table, uint8_t frev, uint8_t crev)case METRICS_VERSION (2 ,3 ): structure_size =sizeof (struct gpu_metrics_v2_3 );break ; +case METRICS_VERSION (2 ,4 ): + structure_size =sizeof (struct gpu_metrics_v2_4 ); +break ;default :return ;}--
2.39.2
[AMD Official Use Only - General]
Hi Wenyou,
Could you merge the patch?
Thanks,
Richard
-----Original Message-----
From: Quan, Evan <[email protected]>
Sent: Tuesday, July 18, 2023 12:03 AM
To: Yang, WenYou <[email protected]>; Deucher, Alexander <[email protected]>; Limonciello, Mario <[email protected]>; Koenig, Christian <[email protected]>; Pan, Xinhui <[email protected]>
Cc: Yuan, Perry <[email protected]>; Liang, Richard qi <[email protected]>; [email protected]; [email protected]; [email protected]
Subject: RE: [PATCH v2] drm/amd/pm: Vangogh: Add new gpu_metrics_v2_4 to acquire gpu_metrics
[AMD Official Use Only - General]
Hi Wenyou,
I think you already got the greenlight(RB from Mario and ACK from me) to land the change. Go ahead please.
Evan
Quoted 308 lines
-----Original Message-----
From: Yang, WenYou <[email protected]>
Sent: Thursday, July 13, 2023 8:56 AM
To: Yang, WenYou <[email protected]>; Deucher, Alexander <[email protected]>; Limonciello, Mario <[email protected]>; Koenig, Christian <[email protected]>; Pan, Xinhui <[email protected]>; Quan, Evan <[email protected]>
Cc: Yuan, Perry <[email protected]>; Liang, Richard qi <[email protected]>; [email protected]; dri- [email protected]; [email protected]
Subject: RE: [PATCH v2] drm/amd/pm: Vangogh: Add newgpu_metrics_v2_4to acquiregpu_metrics[AMD Official Use Only - General]
Any comments? Any advice?
Best Regards,
WenyouQuoted 19 lines
-----Original Message-----
From: Wenyou Yang <[email protected]>
Sent: Wednesday, June 21, 2023 2:32 PM
To: Deucher, Alexander <[email protected]>; Limonciello, Mario <[email protected]>; Koenig, Christian <[email protected]>; Pan, Xinhui <[email protected]>; Quan, Evan <[email protected]>
Cc: Yuan, Perry <[email protected]>; Liang, Richard qi <[email protected]>; [email protected]; dri- [email protected]; [email protected]; Yang, WenYou <[email protected]>
Subject: [PATCH v2] drm/amd/pm: Vangogh: Add newgpu_metrics_v2_4to acquiregpu_metricsTo acquire the voltage and current info from
gpu_metricsinterface, butgpu_metrics_v2_3doesn't contain them, and to be backward compatible, add newgpu_metrics_v2_4structure.Quoted 6 lines
Reviewed-by Mario Limonciello <[email protected]>Acked-by Evan Quan <[email protected]>Signed-off-by Wenyou Yang <[email protected]>--- .../gpu/drm/amd/include/kgd_pp_interface.h | 69 +++++++++++ .../gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c | 109++++++++++++++++-
Quoted 260 lines
(quoted diff) +0
-1- drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c | 3 + 3 files changed, 172 insertions(+), 9 deletions(-)drivers/gpu/drm/amd/include/kgd_pp_interface.h +0
-0@@ -892,4 +892,73 @@ struct gpu_metrics_v2_3 {uint16_t average_temperature_core[8 ];// average CPU core temperature on APUs
uint16_t average_temperature_l3[2];};
drivers/gpu/drm/amd/include/kgd_pp_interface.h +69
-0+ +struct gpu_metrics_v2_4 { +struct metrics_table_header common_header; + +/* Temperature (unit: centi-Celsius) */ +uint16_t temperature_gfx; +uint16_t temperature_soc; +uint16_t temperature_core[8 ]; +uint16_t temperature_l3[2 ]; + +/* Utilization (unit: centi) */ +uint16_t average_gfx_activity; +uint16_t average_mm_activity; + +/* Driver attached timestamp (in ns) */ +uint64_t system_clock_counter; + +/* Power/Energy (unit: mW) */ +uint16_t average_socket_power; +uint16_t average_cpu_power; +uint16_t average_soc_power; +uint16_t average_gfx_power; +uint16_t average_core_power[8 ]; + +/* Average clocks (unit: MHz) */ +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 (unit: MHz) */ +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 ]; +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 (unit: centi-Celsius) */ +uint16_t average_temperature_gfx; +uint16_t average_temperature_soc; +uint16_t average_temperature_core[8 ]; +uint16_t average_temperature_l3[2 ]; + +/* Power/Voltage (unit: mV) */ +uint16_t average_cpu_voltage; +uint16_t average_soc_voltage; +uint16_t average_gfx_voltage; + +/* Power/Current (unit: mA) */ +uint16_t average_cpu_current; +uint16_t average_soc_current; +uint16_t average_gfx_current; +};#endif drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c +0
-0@@ -1854,6 +1854,86 @@ static ssize_tvangogh_get_gpu_metrics_v2_3(struct
smu_context*smu,return sizeof(struct gpu_metrics_v2_3); }drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c +6
-0+static ssize_t vangogh_get_gpu_metrics_v2_4 (struct smu_context *smu, +void **table) { +SmuMetrics_t metrics; +struct smu_table_context *smu_table = &smu->smu_table; +struct gpu_metrics_v2_4 *gpu_metrics = + (struct gpu_metrics_v2_4 *)smu_table-Quoted 1 line
gpu_metrics_table;drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c +17
-0+int ret =0 ; + + ret =smu_cmn_get_metrics_table (smu, &metrics, true); +if (ret) +return ret; + +smu_cmn_init_soft_gpu_metrics (gpu_metrics,2 ,4 ); + + gpu_metrics->temperature_gfx = metrics.Current.GfxTemperature; + gpu_metrics->temperature_soc = metrics.Current.SocTemperature; +memcpy (&gpu_metrics->temperature_core[0 ], + &metrics.Current.CoreTemperature[0 ], +sizeof (uint16_t ) *4 ); + gpu_metrics->temperature_l3[0 ] = + metrics.Current.L3Temperature[0 ]; + + gpu_metrics->average_temperature_gfx =metrics.Average.GfxTemperature;
+gpu_metrics->average_temperature_soc=
metrics.Average.SocTemperature;drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c +11
-0+memcpy (&gpu_metrics->average_temperature_core[0 ], + &metrics.Average.CoreTemperature[0 ], +sizeof (uint16_t ) *4 ); + gpu_metrics->average_temperature_l3[0 ] = +metrics.Average.L3Temperature[0 ]; + + gpu_metrics->average_gfx_activity = metrics.Current.GfxActivity; + gpu_metrics->average_mm_activity = + metrics.Current.UvdActivity; + + gpu_metrics->average_socket_power =metrics.Current.CurrentSocketPower;
drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c +17
-0+ gpu_metrics->average_cpu_power = metrics.Current.Power[0 ]; + gpu_metrics->average_soc_power = metrics.Current.Power[1 ]; + gpu_metrics->average_gfx_power = metrics.Current.Power[2 ]; + + gpu_metrics->average_cpu_voltage = metrics.Current.Voltage[0 ]; + gpu_metrics->average_soc_voltage = metrics.Current.Voltage[1 ]; + gpu_metrics->average_gfx_voltage = metrics.Current.Voltage[2 ]; + + gpu_metrics->average_cpu_current = metrics.Current.Current[0 ]; + gpu_metrics->average_soc_current = metrics.Current.Current[1 ]; + gpu_metrics->average_gfx_current = metrics.Current.Current[2 ]; + +memcpy (&gpu_metrics->average_core_power[0 ], + &metrics.Average.CorePower[0 ], +sizeof (uint16_t ) *4 ); + + gpu_metrics->average_gfxclk_frequency =metrics.Average.GfxclkFrequency;
+gpu_metrics->average_socclk_frequency=
metrics.Average.SocclkFrequency;
+gpu_metrics->average_uclk_frequency=
metrics.Average.MemclkFrequency;
+gpu_metrics->average_fclk_frequency=
metrics.Average.MemclkFrequency;drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c +2
-0+ gpu_metrics->average_vclk_frequency = metrics.Average.VclkFrequency; + gpu_metrics->average_dclk_frequency =metrics.Average.DclkFrequency;
drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c +17
-0+ + gpu_metrics->current_gfxclk = metrics.Current.GfxclkFrequency; + gpu_metrics->current_socclk = metrics.Current.SocclkFrequency; + gpu_metrics->current_uclk = metrics.Current.MemclkFrequency; + gpu_metrics->current_fclk = metrics.Current.MemclkFrequency; + gpu_metrics->current_vclk = metrics.Current.VclkFrequency; + gpu_metrics->current_dclk = metrics.Current.DclkFrequency; + +memcpy (&gpu_metrics->current_coreclk[0 ], + &metrics.Current.CoreFrequency[0 ], +sizeof (uint16_t ) *4 ); + gpu_metrics->current_l3clk[0 ] = + metrics.Current.L3Frequency[0 ]; + + gpu_metrics->throttle_status = metrics.Current.ThrottlerStatus; + gpu_metrics->indep_throttle_status = +smu_cmn_get_indep_throttler_status(metrics.Current.ThrottlerStatus, +
vangogh_throttler_map);drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c +8
-0+ + gpu_metrics->system_clock_counter =ktime_get_boottime_ns (); + + *table = (void *)gpu_metrics; + +return sizeof (struct gpu_metrics_v2_4 ); } +static ssize_t vangogh_get_gpu_metrics (struct smu_context *smu, void **table) { @@ -1923,23 +2003,34 @@ static ssize_t vangogh_common_get_gpu_metrics(structsmu_context *smu, { uint32_t if_version; uint32_t smu_version;drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c +3
-5+uint32_t smu_program; +uint32_t fw_version;int ret =0 ; ret =smu_cmn_get_smc_version (smu, &if_version, &smu_version); -if (ret) { +if (ret)return ret; - } -if (smu_version >=0x043F3E00 ) { -if (if_version <0x3 ) - ret = vangogh_get_legacy_gpu_metrics_v2_3(smu,table);
drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c +6
-0+ smu_program = (smu_version >>24 ) &0xff ; + fw_version = smu_version &0xffffff ; +if (smu_program ==6 ) { +if (fw_version >=0x3F0800 ) + ret =vangogh_get_gpu_metrics_v2_4 (smu, + table);else ret = vangogh_get_gpu_metrics_v2_3(smu,table);
drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c +4
-4+ }else { -if (if_version <0x3 ) - ret =vangogh_get_legacy_gpu_metrics (smu, table); -else - ret =vangogh_get_gpu_metrics (smu, table); +if (smu_version >=0x043F3E00 ) { +if (if_version <0x3 ) + ret =
vangogh_get_legacy_gpu_metrics_v2_3(smu, table);drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c +3
-0+else + ret = + vangogh_get_gpu_metrics_v2_3(smu,table);
drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c +4
-0+ }else { +if (if_version <0x3 ) + ret = + vangogh_get_legacy_gpu_metrics(smu,table);
drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c +3
-0+else + ret =vangogh_get_gpu_metrics (smu, table); + } }return ret;drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c +3
-0@@ -996,6 +996,9 @@ void smu_cmn_init_soft_gpu_metrics(void *table, uint8_t frev, uint8_t crev)case METRICS_VERSION (2 ,3 ): structure_size =sizeof (struct gpu_metrics_v2_3 );break ; +case METRICS_VERSION (2 ,4 ): + structure_size =sizeof (struct gpu_metrics_v2_4 ); +break ;default :return ;}--
2.39.2