drm/amd/pm: Add u64 throttler status field to gpu_metrics
Subsystems (3)
PATCH v5 1/9 drm/amd/pm: Add u64 throttler status field to gpu_metrics
This patch set adds support for a new ASIC independant u64 throttler status field (indep_throttle_status). Piggybacks off the gpu_metrics_v1_3 bump and similarly bumps gpu_metrics_v2 version (to v2_2) to add field.
--- .../gpu/drm/amd/include/kgd_pp_interface.h | 58 ++++++++++++++++++- drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c | 3 + 2 files changed, 60 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/include/kgd_pp_interface.h +57 -1
@@ -579,7 +579,7 @@ struct gpu_metrics_v1_3 {uint16_t current_vclk1;uint16_t current_dclk1; -/* Throttle status */ +/* Throttle status (ASIC dependent) */ uint32_t throttle_status;/* Fans */
@@ -605,6 +605,9 @@ struct gpu_metrics_v1_3 {uint16_t voltage_mem;uint16_t padding1; + +/* Throttle status (ASIC independent) */ +uint64_t indep_throttle_status; };/*
@@ -711,4 +714,57 @@ struct gpu_metrics_v2_1 { uint16_t padding[3]; }; +struct gpu_metrics_v2_2 { +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; +}; +#endif
drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c +3 -0
@@ -773,6 +773,9 @@ void smu_cmn_init_soft_gpu_metrics(void *table, uint8_t frev, uint8_t crev)case METRICS_VERSION (2 ,1 ): structure_size =sizeof (struct gpu_metrics_v2_1 );break ; +case METRICS_VERSION (2 ,2 ): + structure_size =sizeof (struct gpu_metrics_v2_2 ); +break ;default :return ; }
Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH v5 2/9 drm/amd/pm: Add ASIC independent throttle bits
Add new defines for thermal throttle status bits which are ASIC independent. This bit field will be visible to userspace via gpu_metrics alongside the previous ASIC dependent bit fields. Seperated into four 16-bit types: power throttlers, current throttlers, temperature, other.
--- drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h | 41 +++++++++++++++++++++++++ 1 file changed, 41 insertions(+)
drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h +41 -0
@@ -35,6 +35,47 @@#define SMU_DPM_USER_PROFILE_RESTORE (1 << 0) +// Power Throttlers +#define SMU_THROTTLER_PPT0_BIT 0 +#define SMU_THROTTLER_PPT1_BIT 1 +#define SMU_THROTTLER_PPT2_BIT 2 +#define SMU_THROTTLER_PPT3_BIT 3 +#define SMU_THROTTLER_SPL_BIT 4 +#define SMU_THROTTLER_FPPT_BIT 5 +#define SMU_THROTTLER_SPPT_BIT 6 +#define SMU_THROTTLER_SPPT_APU_BIT 7 + +// Current Throttlers +#define SMU_THROTTLER_TDC_GFX_BIT 16 +#define SMU_THROTTLER_TDC_SOC_BIT 17 +#define SMU_THROTTLER_TDC_MEM_BIT 18 +#define SMU_THROTTLER_TDC_VDD_BIT 19 +#define SMU_THROTTLER_TDC_CVIP_BIT 20 +#define SMU_THROTTLER_EDC_CPU_BIT 21 +#define SMU_THROTTLER_EDC_GFX_BIT 22 +#define SMU_THROTTLER_APCC_BIT 23 + +// Temperature +#define SMU_THROTTLER_TEMP_GPU_BIT 32 +#define SMU_THROTTLER_TEMP_CORE_BIT 33 +#define SMU_THROTTLER_TEMP_MEM_BIT 34 +#define SMU_THROTTLER_TEMP_EDGE_BIT 35 +#define SMU_THROTTLER_TEMP_HOTSPOT_BIT 36 +#define SMU_THROTTLER_TEMP_VR_GFX_BIT 37 +#define SMU_THROTTLER_TEMP_VR_SOC_BIT 38 +#define SMU_THROTTLER_TEMP_VR_MEM0_BIT 39 +#define SMU_THROTTLER_TEMP_VR_MEM1_BIT 40 +#define SMU_THROTTLER_TEMP_LIQUID0_BIT 41 +#define SMU_THROTTLER_TEMP_LIQUID1_BIT 42 +#define SMU_THROTTLER_VRHOT0_BIT 43 +#define SMU_THROTTLER_VRHOT1_BIT 44 +#define SMU_THROTTLER_PROCHOT_CPU_BIT 45 +#define SMU_THROTTLER_PROCHOT_GFX_BIT 46 + +// Other +#define SMU_THROTTLER_PPM_BIT 48 +#define SMU_THROTTLER_FIT_BIT 49 +struct smu_hw_power_state {unsigned int magic; };
Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH v5 3/9 drm/amd/pm: Add common throttler translation func
In reply to Graham SiderDefines smu_cmn_get_indep_throttler_status which performs ASIC independent translation given a corresponding lookup table.
--- drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c | 13 +++++++++++++ drivers/gpu/drm/amd/pm/swsmu/smu_cmn.h | 4 ++++ 2 files changed, 17 insertions(+)
drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c +13 -0
@@ -398,6 +398,19 @@ int smu_cmn_get_enabled_32_bits_mask(struct smu_context *smu, } +uint64_t smu_cmn_get_indep_throttler_status ( +const unsigned long dep_status, +const uint8_t *throttler_map) +{ +uint64_t indep_status =0 ; +uint8_t dep_bit =0 ; + +for_each_set_bit (dep_bit, &dep_status,32 ) + indep_status |=1ULL << throttler_map[dep_bit]; + +return indep_status; +} +int smu_cmn_feature_update_enable_state (struct smu_context *smu,uint64_t feature_mask,bool enabled)
drivers/gpu/drm/amd/pm/swsmu/smu_cmn.h +4 -0
@@ -60,6 +60,10 @@ int smu_cmn_get_enabled_32_bits_mask(struct smu_context *smu,uint32_t *feature_mask, uint32_t num); +uint64_t smu_cmn_get_indep_throttler_status ( +const unsigned long dep_status, +const uint8_t *throttler_map); +int smu_cmn_feature_update_enable_state (struct smu_context *smu,uint64_t feature_mask,bool enabled);
Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH v5 4/9 drm/amd/pm: Add arcturus throttler translation
In reply to Graham SiderPerform dependent to independent throttle status translation for arcturus.
--- .../gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c | 33 ++++++++++++++++--- 1 file changed, 28 insertions(+), 5 deletions(-)
drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c +28 -5
@@ -211,6 +211,26 @@ static const struct cmn2asic_mapping arcturus_workload_map[PP_SMC_POWER_PROFILE_ WORKLOAD_MAP(PP_SMC_POWER_PROFILE_CUSTOM, WORKLOAD_PPLIB_CUSTOM_BIT), }; +static const uint8_t arcturus_throttler_map[] = { + [THROTTLER_TEMP_EDGE_BIT ] = (SMU_THROTTLER_TEMP_EDGE_BIT ), + [THROTTLER_TEMP_HOTSPOT_BIT ] = (SMU_THROTTLER_TEMP_HOTSPOT_BIT ), + [THROTTLER_TEMP_MEM_BIT ] = (SMU_THROTTLER_TEMP_MEM_BIT ), + [THROTTLER_TEMP_VR_GFX_BIT ] = (SMU_THROTTLER_TEMP_VR_GFX_BIT ), + [THROTTLER_TEMP_VR_MEM_BIT ] = (SMU_THROTTLER_TEMP_VR_MEM0_BIT ), + [THROTTLER_TEMP_VR_SOC_BIT ] = (SMU_THROTTLER_TEMP_VR_SOC_BIT ), + [THROTTLER_TDC_GFX_BIT ] = (SMU_THROTTLER_TDC_GFX_BIT ), + [THROTTLER_TDC_SOC_BIT ] = (SMU_THROTTLER_TDC_SOC_BIT ), + [THROTTLER_PPT0_BIT ] = (SMU_THROTTLER_PPT0_BIT ), + [THROTTLER_PPT1_BIT ] = (SMU_THROTTLER_PPT1_BIT ), + [THROTTLER_PPT2_BIT ] = (SMU_THROTTLER_PPT2_BIT ), + [THROTTLER_PPT3_BIT ] = (SMU_THROTTLER_PPT3_BIT ), + [THROTTLER_PPM_BIT ] = (SMU_THROTTLER_PPM_BIT ), + [THROTTLER_FIT_BIT ] = (SMU_THROTTLER_FIT_BIT ), + [THROTTLER_APCC_BIT ] = (SMU_THROTTLER_APCC_BIT ), + [THROTTLER_VRHOT0_BIT ] = (SMU_THROTTLER_VRHOT0_BIT ), + [THROTTLER_VRHOT1_BIT ] = (SMU_THROTTLER_VRHOT1_BIT ), +}; +static int arcturus_tables_init (struct smu_context *smu) {struct smu_table_context *smu_table = &smu->smu_table;
@@ -237,7 +257,7 @@ static int arcturus_tables_init(struct smu_context *smu)return -ENOMEM ; smu_table->metrics_time =0 ; - smu_table->gpu_metrics_table_size =sizeof (struct gpu_metrics_v1_1 ); + smu_table->gpu_metrics_table_size =sizeof (struct gpu_metrics_v1_3 ); smu_table->gpu_metrics_table =kzalloc (smu_table->gpu_metrics_table_size,GFP_KERNEL );if (!smu_table->gpu_metrics_table) {kfree (smu_table->metrics_table);
@@ -2275,8 +2295,8 @@ static ssize_t arcturus_get_gpu_metrics(struct smu_context *smu, void **table) {struct smu_table_context *smu_table = &smu->smu_table; -struct gpu_metrics_v1_1 *gpu_metrics = - (struct gpu_metrics_v1_1 *)smu_table->gpu_metrics_table; +struct gpu_metrics_v1_3 *gpu_metrics = + (struct gpu_metrics_v1_3 *)smu_table->gpu_metrics_table;SmuMetrics_t metrics;int ret =0 ;
@@ -2286,7 +2306,7 @@ static ssize_t arcturus_get_gpu_metrics(struct smu_context *smu,if (ret)return ret; -smu_cmn_init_soft_gpu_metrics (gpu_metrics,1 ,1 ); +smu_cmn_init_soft_gpu_metrics (gpu_metrics,1 ,3 ); gpu_metrics->temperature_edge = metrics.TemperatureEdge; gpu_metrics->temperature_hotspot = metrics.TemperatureHotspot;
@@ -2315,6 +2335,9 @@ static ssize_t arcturus_get_gpu_metrics(struct smu_context *smu, gpu_metrics->current_dclk0 = metrics.CurrClock[PPCLK_DCLK ]; gpu_metrics->throttle_status = metrics.ThrottlerStatus; + gpu_metrics->indep_throttle_status = +smu_cmn_get_indep_throttler_status (metrics.ThrottlerStatus, + arcturus_throttler_map); gpu_metrics->current_fan_speed = metrics.CurrFanSpeed;
@@ -2327,7 +2350,7 @@ static ssize_t arcturus_get_gpu_metrics(struct smu_context *smu, *table = (void *)gpu_metrics; -return sizeof (struct gpu_metrics_v1_1 ); +return sizeof (struct gpu_metrics_v1_3 ); }static const struct pptable_funcs arcturus_ppt_funcs = {
Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH v5 5/9 drm/amd/pm: Add navi1x throttler translation
In reply to Graham SiderPerform dependent to independent throttle status translation for navi1x.
--- .../gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+)
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +34 -0
@@ -238,6 +238,28 @@ static struct cmn2asic_mapping navi10_workload_map[PP_SMC_POWER_PROFILE_COUNT] = WORKLOAD_MAP(PP_SMC_POWER_PROFILE_CUSTOM, WORKLOAD_PPLIB_CUSTOM_BIT), }; +static const uint8_t navi1x_throttler_map[] = { + [THROTTLER_TEMP_EDGE_BIT ] = (SMU_THROTTLER_TEMP_EDGE_BIT ), + [THROTTLER_TEMP_HOTSPOT_BIT ] = (SMU_THROTTLER_TEMP_HOTSPOT_BIT ), + [THROTTLER_TEMP_MEM_BIT ] = (SMU_THROTTLER_TEMP_MEM_BIT ), + [THROTTLER_TEMP_VR_GFX_BIT ] = (SMU_THROTTLER_TEMP_VR_GFX_BIT ), + [THROTTLER_TEMP_VR_MEM0_BIT ] = (SMU_THROTTLER_TEMP_VR_MEM0_BIT ), + [THROTTLER_TEMP_VR_MEM1_BIT ] = (SMU_THROTTLER_TEMP_VR_MEM1_BIT ), + [THROTTLER_TEMP_VR_SOC_BIT ] = (SMU_THROTTLER_TEMP_VR_SOC_BIT ), + [THROTTLER_TEMP_LIQUID0_BIT ] = (SMU_THROTTLER_TEMP_LIQUID0_BIT ), + [THROTTLER_TEMP_LIQUID1_BIT ] = (SMU_THROTTLER_TEMP_LIQUID1_BIT ), + [THROTTLER_TDC_GFX_BIT ] = (SMU_THROTTLER_TDC_GFX_BIT ), + [THROTTLER_TDC_SOC_BIT ] = (SMU_THROTTLER_TDC_SOC_BIT ), + [THROTTLER_PPT0_BIT ] = (SMU_THROTTLER_PPT0_BIT ), + [THROTTLER_PPT1_BIT ] = (SMU_THROTTLER_PPT1_BIT ), + [THROTTLER_PPT2_BIT ] = (SMU_THROTTLER_PPT2_BIT ), + [THROTTLER_PPT3_BIT ] = (SMU_THROTTLER_PPT3_BIT ), + [THROTTLER_FIT_BIT ] = (SMU_THROTTLER_FIT_BIT ), + [THROTTLER_PPM_BIT ] = (SMU_THROTTLER_PPM_BIT ), + [THROTTLER_APCC_BIT ] = (SMU_THROTTLER_APCC_BIT ), +}; + +static bool is_asic_secure (struct smu_context *smu) {struct amdgpu_device *adev = smu->adev;
@@ -2673,6 +2695,9 @@ static ssize_t navi10_get_legacy_gpu_metrics(struct smu_context *smu, gpu_metrics->current_dclk0 = metrics.CurrClock[PPCLK_DCLK ]; gpu_metrics->throttle_status = metrics.ThrottlerStatus; + gpu_metrics->indep_throttle_status = +smu_cmn_get_indep_throttler_status (metrics.ThrottlerStatus, + navi1x_throttler_map); gpu_metrics->current_fan_speed = metrics.CurrFanSpeed;
@@ -2750,6 +2775,9 @@ static ssize_t navi10_get_gpu_metrics(struct smu_context *smu, gpu_metrics->current_dclk0 = metrics.CurrClock[PPCLK_DCLK ]; gpu_metrics->throttle_status = metrics.ThrottlerStatus; + gpu_metrics->indep_throttle_status = +smu_cmn_get_indep_throttler_status (metrics.ThrottlerStatus, + navi1x_throttler_map); gpu_metrics->current_fan_speed = metrics.CurrFanSpeed;
@@ -2826,6 +2854,9 @@ static ssize_t navi12_get_legacy_gpu_metrics(struct smu_context *smu, gpu_metrics->current_dclk0 = metrics.CurrClock[PPCLK_DCLK ]; gpu_metrics->throttle_status = metrics.ThrottlerStatus; + gpu_metrics->indep_throttle_status = +smu_cmn_get_indep_throttler_status (metrics.ThrottlerStatus, + navi1x_throttler_map); gpu_metrics->current_fan_speed = metrics.CurrFanSpeed;
@@ -2908,6 +2939,9 @@ static ssize_t navi12_get_gpu_metrics(struct smu_context *smu, gpu_metrics->current_dclk0 = metrics.CurrClock[PPCLK_DCLK ]; gpu_metrics->throttle_status = metrics.ThrottlerStatus; + gpu_metrics->indep_throttle_status = +smu_cmn_get_indep_throttler_status (metrics.ThrottlerStatus, + navi1x_throttler_map); gpu_metrics->current_fan_speed = metrics.CurrFanSpeed;
Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH v5 6/9 drm/amd/pm: Add sienna cichlid throttler translation
In reply to Graham SiderPerform dependent to independent throttle status translation for sienna cichlid.
--- .../amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 34 ++++++++++++++++--- 1 file changed, 29 insertions(+), 5 deletions(-)
drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c +29 -5
@@ -239,6 +239,27 @@ static struct cmn2asic_mapping sienna_cichlid_workload_map[PP_SMC_POWER_PROFILE_ WORKLOAD_MAP(PP_SMC_POWER_PROFILE_CUSTOM, WORKLOAD_PPLIB_CUSTOM_BIT), }; +static const uint8_t sienna_cichlid_throttler_map[] = { + [THROTTLER_TEMP_EDGE_BIT ] = (SMU_THROTTLER_TEMP_EDGE_BIT ), + [THROTTLER_TEMP_HOTSPOT_BIT ] = (SMU_THROTTLER_TEMP_HOTSPOT_BIT ), + [THROTTLER_TEMP_MEM_BIT ] = (SMU_THROTTLER_TEMP_MEM_BIT ), + [THROTTLER_TEMP_VR_GFX_BIT ] = (SMU_THROTTLER_TEMP_VR_GFX_BIT ), + [THROTTLER_TEMP_VR_MEM0_BIT ] = (SMU_THROTTLER_TEMP_VR_MEM0_BIT ), + [THROTTLER_TEMP_VR_MEM1_BIT ] = (SMU_THROTTLER_TEMP_VR_MEM1_BIT ), + [THROTTLER_TEMP_VR_SOC_BIT ] = (SMU_THROTTLER_TEMP_VR_SOC_BIT ), + [THROTTLER_TEMP_LIQUID0_BIT ] = (SMU_THROTTLER_TEMP_LIQUID0_BIT ), + [THROTTLER_TEMP_LIQUID1_BIT ] = (SMU_THROTTLER_TEMP_LIQUID1_BIT ), + [THROTTLER_TDC_GFX_BIT ] = (SMU_THROTTLER_TDC_GFX_BIT ), + [THROTTLER_TDC_SOC_BIT ] = (SMU_THROTTLER_TDC_SOC_BIT ), + [THROTTLER_PPT0_BIT ] = (SMU_THROTTLER_PPT0_BIT ), + [THROTTLER_PPT1_BIT ] = (SMU_THROTTLER_PPT1_BIT ), + [THROTTLER_PPT2_BIT ] = (SMU_THROTTLER_PPT2_BIT ), + [THROTTLER_PPT3_BIT ] = (SMU_THROTTLER_PPT3_BIT ), + [THROTTLER_FIT_BIT ] = (SMU_THROTTLER_FIT_BIT ), + [THROTTLER_PPM_BIT ] = (SMU_THROTTLER_PPM_BIT ), + [THROTTLER_APCC_BIT ] = (SMU_THROTTLER_APCC_BIT ), +}; +static int sienna_cichlid_get_allowed_feature_mask (struct smu_context *smu,uint32_t *feature_mask,uint32_t num)
@@ -434,7 +455,7 @@ static int sienna_cichlid_tables_init(struct smu_context *smu) goto err0_out; smu_table->metrics_time =0 ; - smu_table->gpu_metrics_table_size =sizeof (struct gpu_metrics_v1_1 ); + smu_table->gpu_metrics_table_size =sizeof (struct gpu_metrics_v1_3 ); smu_table->gpu_metrics_table =kzalloc (smu_table->gpu_metrics_table_size,GFP_KERNEL );if (!smu_table->gpu_metrics_table) goto err1_out;
@@ -3617,8 +3638,8 @@ static ssize_t sienna_cichlid_get_gpu_metrics(struct smu_context *smu, void **table) {struct smu_table_context *smu_table = &smu->smu_table; -struct gpu_metrics_v1_1 *gpu_metrics = - (struct gpu_metrics_v1_1 *)smu_table->gpu_metrics_table; +struct gpu_metrics_v1_3 *gpu_metrics = + (struct gpu_metrics_v1_3 *)smu_table->gpu_metrics_table;SmuMetricsExternal_t metrics_external;SmuMetrics_t *metrics = &(metrics_external.SmuMetrics);
@@ -3632,7 +3653,7 @@ static ssize_t sienna_cichlid_get_gpu_metrics(struct smu_context *smu,if (ret)return ret; -smu_cmn_init_soft_gpu_metrics (gpu_metrics,1 ,1 ); +smu_cmn_init_soft_gpu_metrics (gpu_metrics,1 ,3 ); gpu_metrics->temperature_edge = metrics->TemperatureEdge; gpu_metrics->temperature_hotspot = metrics->TemperatureHotspot;
@@ -3667,6 +3688,9 @@ static ssize_t sienna_cichlid_get_gpu_metrics(struct smu_context *smu, gpu_metrics->current_dclk1 = metrics->CurrClock[PPCLK_DCLK_1 ]; gpu_metrics->throttle_status = metrics->ThrottlerStatus; + gpu_metrics->indep_throttle_status = +smu_cmn_get_indep_throttler_status (metrics->ThrottlerStatus, + sienna_cichlid_throttler_map); gpu_metrics->current_fan_speed = metrics->CurrFanSpeed;
@@ -3689,7 +3713,7 @@ static ssize_t sienna_cichlid_get_gpu_metrics(struct smu_context *smu, *table = (void *)gpu_metrics; -return sizeof (struct gpu_metrics_v1_1 ); +return sizeof (struct gpu_metrics_v1_3 ); }static int sienna_cichlid_enable_mgpu_fan_boost (struct smu_context *smu)
Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH v5 7/9 drm/amd/pm: Add vangogh throttler translation
In reply to Graham SiderPerform dependent to independent throttle status translation for vangogh.
--- .../gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c | 38 ++++++++++++++----- 1 file changed, 29 insertions(+), 9 deletions(-)
drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c +29 -9
@@ -190,6 +190,20 @@ static struct cmn2asic_mapping vangogh_workload_map[PP_SMC_POWER_PROFILE_COUNT] WORKLOAD_MAP(PP_SMC_POWER_PROFILE_CUSTOM, WORKLOAD_PPLIB_CUSTOM_BIT), }; +static const uint8_t vangogh_throttler_map[] = { + [THROTTLER_STATUS_BIT_SPL ] = (SMU_THROTTLER_SPL_BIT ), + [THROTTLER_STATUS_BIT_FPPT ] = (SMU_THROTTLER_FPPT_BIT ), + [THROTTLER_STATUS_BIT_SPPT ] = (SMU_THROTTLER_SPPT_BIT ), + [THROTTLER_STATUS_BIT_SPPT_APU ] = (SMU_THROTTLER_SPPT_APU_BIT ), + [THROTTLER_STATUS_BIT_THM_CORE ] = (SMU_THROTTLER_TEMP_CORE_BIT ), + [THROTTLER_STATUS_BIT_THM_GFX ] = (SMU_THROTTLER_TEMP_VR_GFX_BIT ), + [THROTTLER_STATUS_BIT_THM_SOC ] = (SMU_THROTTLER_TEMP_VR_SOC_BIT ), + [THROTTLER_STATUS_BIT_TDC_VDD ] = (SMU_THROTTLER_TDC_VDD_BIT ), + [THROTTLER_STATUS_BIT_TDC_SOC ] = (SMU_THROTTLER_TDC_SOC_BIT ), + [THROTTLER_STATUS_BIT_TDC_GFX ] = (SMU_THROTTLER_TDC_GFX_BIT ), + [THROTTLER_STATUS_BIT_TDC_CVIP ] = (SMU_THROTTLER_TDC_CVIP_BIT ), +}; +static int vangogh_tables_init (struct smu_context *smu) {struct smu_table_context *smu_table = &smu->smu_table;
@@ -226,7 +240,7 @@ static int vangogh_tables_init(struct smu_context *smu) goto err0_out; smu_table->metrics_time =0 ; - smu_table->gpu_metrics_table_size =sizeof (struct gpu_metrics_v2_1 ); + smu_table->gpu_metrics_table_size =sizeof (struct gpu_metrics_v2_2 ); smu_table->gpu_metrics_table =kzalloc (smu_table->gpu_metrics_table_size,GFP_KERNEL );if (!smu_table->gpu_metrics_table) goto err1_out;
@@ -1632,8 +1646,8 @@ static ssize_t vangogh_get_legacy_gpu_metrics(struct smu_context *smu, void **table) {struct smu_table_context *smu_table = &smu->smu_table; -struct gpu_metrics_v2_1 *gpu_metrics = - (struct gpu_metrics_v2_1 *)smu_table->gpu_metrics_table; +struct gpu_metrics_v2_2 *gpu_metrics = + (struct gpu_metrics_v2_2 *)smu_table->gpu_metrics_table;SmuMetrics_legacy_t metrics;int ret =0 ;
@@ -1641,7 +1655,7 @@ static ssize_t vangogh_get_legacy_gpu_metrics(struct smu_context *smu,if (ret)return ret; -smu_cmn_init_soft_gpu_metrics (gpu_metrics,2 ,1 ); +smu_cmn_init_soft_gpu_metrics (gpu_metrics,2 ,2 ); gpu_metrics->temperature_gfx = metrics.GfxTemperature; gpu_metrics->temperature_soc = metrics.SocTemperature;
@@ -1674,20 +1688,23 @@ static ssize_t vangogh_get_legacy_gpu_metrics(struct smu_context *smu, gpu_metrics->current_l3clk[0 ] = metrics.L3Frequency[0 ]; gpu_metrics->throttle_status = metrics.ThrottlerStatus; + gpu_metrics->indep_throttle_status = +smu_cmn_get_indep_throttler_status (metrics.ThrottlerStatus, + vangogh_throttler_map); gpu_metrics->system_clock_counter =ktime_get_boottime_ns (); *table = (void *)gpu_metrics; -return sizeof (struct gpu_metrics_v2_1 ); +return sizeof (struct gpu_metrics_v2_2 ); }static ssize_t vangogh_get_gpu_metrics (struct smu_context *smu,void **table) {struct smu_table_context *smu_table = &smu->smu_table; -struct gpu_metrics_v2_1 *gpu_metrics = - (struct gpu_metrics_v2_1 *)smu_table->gpu_metrics_table; +struct gpu_metrics_v2_2 *gpu_metrics = + (struct gpu_metrics_v2_2 *)smu_table->gpu_metrics_table;SmuMetrics_t metrics;int ret =0 ;
@@ -1695,7 +1712,7 @@ static ssize_t vangogh_get_gpu_metrics(struct smu_context *smu,if (ret)return ret; -smu_cmn_init_soft_gpu_metrics (gpu_metrics,2 ,1 ); +smu_cmn_init_soft_gpu_metrics (gpu_metrics,2 ,2 ); gpu_metrics->temperature_gfx = metrics.Current.GfxTemperature; gpu_metrics->temperature_soc = metrics.Current.SocTemperature;
@@ -1735,12 +1752,15 @@ static ssize_t vangogh_get_gpu_metrics(struct smu_context *smu, 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); gpu_metrics->system_clock_counter =ktime_get_boottime_ns (); *table = (void *)gpu_metrics; -return sizeof (struct gpu_metrics_v2_1 ); +return sizeof (struct gpu_metrics_v2_2 ); } static ssize_t vangogh_common_get_gpu_metrics(struct smu_context *smu,
Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Re: [PATCH v5 7/9] drm/amd/pm: Add vangogh throttler translation
Quoted 14 lines · Graham Sider
Perform dependent to independent throttle status translation for vangogh.
Signed-off-by Graham Sider <[email protected]>--- .../gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c | 38 ++++++++++++++----- 1 file changed, 29 insertions(+), 9 deletions(-)drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c +0
-0@@ -190,6 +190,20 @@ static struct cmn2asic_mapping vangogh_workload_map[PP_SMC_POWER_PROFILE_COUNT] WORKLOAD_MAP(PP_SMC_POWER_PROFILE_CUSTOM, WORKLOAD_PPLIB_CUSTOM_BIT),
drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c static struct cmn2asic_mapping vangogh_workload_map[PP_SMC_POWER_PROFILE_COUNT] · line 200
Quoted 10 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c +8
-0}; +static const uint8_t vangogh_throttler_map[] = { + [THROTTLER_STATUS_BIT_SPL ] = (SMU_THROTTLER_SPL_BIT ), + [THROTTLER_STATUS_BIT_FPPT ] = (SMU_THROTTLER_FPPT_BIT ), + [THROTTLER_STATUS_BIT_SPPT ] = (SMU_THROTTLER_SPPT_BIT ), + [THROTTLER_STATUS_BIT_SPPT_APU ] = (SMU_THROTTLER_SPPT_APU_BIT ), + [THROTTLER_STATUS_BIT_THM_CORE ] = (SMU_THROTTLER_TEMP_CORE_BIT ), + [THROTTLER_STATUS_BIT_THM_GFX ] = (SMU_THROTTLER_TEMP_VR_GFX_BIT ), + [THROTTLER_STATUS_BIT_THM_SOC ] = (SMU_THROTTLER_TEMP_VR_SOC_BIT ),
Above two mappings don't look correct. They essentially mean throttling due to GFX/SOC domain temperatures in APU exceeding their limits, not the VR temperatures. Except those mappings, rest of the patch series looks good to me.
Thanks,
Lijo
Quoted 82 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c +20
-8+ [THROTTLER_STATUS_BIT_TDC_VDD] = (SMU_THROTTLER_TDC_VDD_BIT), + [THROTTLER_STATUS_BIT_TDC_SOC] = (SMU_THROTTLER_TDC_SOC_BIT), + [THROTTLER_STATUS_BIT_TDC_GFX] = (SMU_THROTTLER_TDC_GFX_BIT), + [THROTTLER_STATUS_BIT_TDC_CVIP] = (SMU_THROTTLER_TDC_CVIP_BIT), +}; +static int vangogh_tables_init (struct smu_context *smu) {struct smu_table_context *smu_table = &smu->smu_table;@@ -226,7 +240,7 @@ static int vangogh_tables_init(struct smu_context *smu) goto err0_out; smu_table->metrics_time =0 ; - smu_table->gpu_metrics_table_size =sizeof (struct gpu_metrics_v2_1 ); + smu_table->gpu_metrics_table_size =sizeof (struct gpu_metrics_v2_2 ); smu_table->gpu_metrics_table =kzalloc (smu_table->gpu_metrics_table_size,GFP_KERNEL );if (!smu_table->gpu_metrics_table) goto err1_out;@@ -1632,8 +1646,8 @@ static ssize_t vangogh_get_legacy_gpu_metrics(struct smu_context *smu, void **table) {struct smu_table_context *smu_table = &smu->smu_table; -struct gpu_metrics_v2_1 *gpu_metrics = - (struct gpu_metrics_v2_1 *)smu_table->gpu_metrics_table; +struct gpu_metrics_v2_2 *gpu_metrics = + (struct gpu_metrics_v2_2 *)smu_table->gpu_metrics_table;SmuMetrics_legacy_t metrics;int ret =0 ;@@ -1641,7 +1655,7 @@ static ssize_t vangogh_get_legacy_gpu_metrics(struct smu_context *smu,if (ret)return ret; -smu_cmn_init_soft_gpu_metrics (gpu_metrics,2 ,1 ); +smu_cmn_init_soft_gpu_metrics (gpu_metrics,2 ,2 ); gpu_metrics->temperature_gfx = metrics.GfxTemperature; gpu_metrics->temperature_soc = metrics.SocTemperature;@@ -1674,20 +1688,23 @@ static ssize_t vangogh_get_legacy_gpu_metrics(struct smu_context *smu, gpu_metrics->current_l3clk[0 ] = metrics.L3Frequency[0 ]; gpu_metrics->throttle_status = metrics.ThrottlerStatus; + gpu_metrics->indep_throttle_status = +smu_cmn_get_indep_throttler_status (metrics.ThrottlerStatus, + vangogh_throttler_map); gpu_metrics->system_clock_counter =ktime_get_boottime_ns (); *table = (void *)gpu_metrics; -return sizeof (struct gpu_metrics_v2_1 ); +return sizeof (struct gpu_metrics_v2_2 ); }static ssize_t vangogh_get_gpu_metrics (struct smu_context *smu,void **table) {struct smu_table_context *smu_table = &smu->smu_table; -struct gpu_metrics_v2_1 *gpu_metrics = - (struct gpu_metrics_v2_1 *)smu_table->gpu_metrics_table; +struct gpu_metrics_v2_2 *gpu_metrics = + (struct gpu_metrics_v2_2 *)smu_table->gpu_metrics_table;SmuMetrics_t metrics;int ret =0 ;@@ -1695,7 +1712,7 @@ static ssize_t vangogh_get_gpu_metrics(struct smu_context *smu,if (ret)return ret; -smu_cmn_init_soft_gpu_metrics (gpu_metrics,2 ,1 ); +smu_cmn_init_soft_gpu_metrics (gpu_metrics,2 ,2 ); gpu_metrics->temperature_gfx = metrics.Current.GfxTemperature; gpu_metrics->temperature_soc = metrics.Current.SocTemperature;@@ -1735,12 +1752,15 @@ static ssize_t vangogh_get_gpu_metrics(struct smu_context *smu, 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 static ssize_t vangogh_get_gpu_metrics(struct smu_context *smu, · line 1766
Quoted 10 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c +1
-1gpu_metrics->system_clock_counter =ktime_get_boottime_ns (); *table = (void *)gpu_metrics; -return sizeof (struct gpu_metrics_v2_1 ); +return sizeof (struct gpu_metrics_v2_2 ); } static ssize_t vangogh_common_get_gpu_metrics(struct smu_context *smu,
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
RE: [PATCH v5 7/9] drm/amd/pm: Add vangogh throttler translation
Great, thanks for all the feedback Lijo. Out of the new bit definitions in amdgpu_smu.h are there any that currently exist that are more applicable for these mappings? *_THM_GFX and *_THM_SOC only exist in VanGogh and Renoir. With the expansion of the MEM and LIQUID bits there is not enough room in the temperature field to add two new definitions.
Best,
Graham
-----Original Message-----
From: Lazar, Lijo <[email protected]>
Sent: Monday, June 7, 2021 10:35 AM
To: Sider, Graham <[email protected]>; [email protected]
Cc: Kasiviswanathan, Harish <[email protected]>; Sakhnovitch, Elena (Elen) <[email protected]>
Subject: Re: [PATCH v5 7/9] drm/amd/pm: Add vangogh throttler translation
Quoted 15 lines · Graham Sider
Perform dependent to independent throttle status translation for vangogh.
Signed-off-by Graham Sider <[email protected]>--- .../gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c | 38 ++++++++++++++----- 1 file changed, 29 insertions(+), 9 deletions(-)drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c +0
-0@@ -190,6 +190,20 @@ static struct cmn2asic_mapping vangogh_workload_map[PP_SMC_POWER_PROFILE_COUNT] WORKLOAD_MAP(PP_SMC_POWER_PROFILE_CUSTOM, WORKLOAD_PPLIB_CUSTOM_BIT),
drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c static struct cmn2asic_mapping vangogh_workload_map[PP_SMC_POWER_PROFILE_COUNT] · line 200
Quoted 10 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c +8
-0}; +static const uint8_t vangogh_throttler_map[] = { + [THROTTLER_STATUS_BIT_SPL ] = (SMU_THROTTLER_SPL_BIT ), + [THROTTLER_STATUS_BIT_FPPT ] = (SMU_THROTTLER_FPPT_BIT ), + [THROTTLER_STATUS_BIT_SPPT ] = (SMU_THROTTLER_SPPT_BIT ), + [THROTTLER_STATUS_BIT_SPPT_APU ] = (SMU_THROTTLER_SPPT_APU_BIT ), + [THROTTLER_STATUS_BIT_THM_CORE ] = (SMU_THROTTLER_TEMP_CORE_BIT ), + [THROTTLER_STATUS_BIT_THM_GFX ] = (SMU_THROTTLER_TEMP_VR_GFX_BIT ), + [THROTTLER_STATUS_BIT_THM_SOC ] = (SMU_THROTTLER_TEMP_VR_SOC_BIT ),
Above two mappings don't look correct. They essentially mean throttling due to GFX/SOC domain temperatures in APU exceeding their limits, not the VR temperatures. Except those mappings, rest of the patch series looks good to me.
Thanks,
Lijo
Quoted 91 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c +23
-10+ [THROTTLER_STATUS_BIT_TDC_VDD] = (SMU_THROTTLER_TDC_VDD_BIT), + [THROTTLER_STATUS_BIT_TDC_SOC] = (SMU_THROTTLER_TDC_SOC_BIT), + [THROTTLER_STATUS_BIT_TDC_GFX] = (SMU_THROTTLER_TDC_GFX_BIT), + [THROTTLER_STATUS_BIT_TDC_CVIP] = (SMU_THROTTLER_TDC_CVIP_BIT), +}; +static int vangogh_tables_init (struct smu_context *smu) { struct smu_table_context *smu_table = &smu->smu_table; @@ -226,7 +240,7 @@ static int vangogh_tables_init(struct smu_context *smu) goto err0_out; smu_table->metrics_time =0 ; - smu_table->gpu_metrics_table_size =sizeof (struct gpu_metrics_v2_1 ); + smu_table->gpu_metrics_table_size =sizeof (struct gpu_metrics_v2_2 ); smu_table->gpu_metrics_table =kzalloc (smu_table->gpu_metrics_table_size,GFP_KERNEL );if (!smu_table->gpu_metrics_table) goto err1_out;@@ -1632,8 +1646,8 @@ static ssize_t vangogh_get_legacy_gpu_metrics(struct smu_context *smu, void **table) {struct smu_table_context *smu_table = &smu->smu_table; -struct gpu_metrics_v2_1 *gpu_metrics = - (struct gpu_metrics_v2_1 *)smu_table->gpu_metrics_table; +struct gpu_metrics_v2_2 *gpu_metrics = + (struct gpu_metrics_v2_2 *)smu_table->gpu_metrics_table;SmuMetrics_legacy_t metrics;int ret =0 ;@@ -1641,7 +1655,7 @@ static ssize_t vangogh_get_legacy_gpu_metrics(struct smu_context *smu,if (ret)return ret; -smu_cmn_init_soft_gpu_metrics (gpu_metrics,2 ,1 ); +smu_cmn_init_soft_gpu_metrics (gpu_metrics,2 ,2 ); gpu_metrics->temperature_gfx = metrics.GfxTemperature; gpu_metrics->temperature_soc = metrics.SocTemperature; @@ -1674,20 +1688,23 @@ static ssize_t vangogh_get_legacy_gpu_metrics(struct smu_context *smu, gpu_metrics->current_l3clk[0] = metrics.L3Frequency[0]; gpu_metrics->throttle_status = metrics.ThrottlerStatus; + gpu_metrics->indep_throttle_status = +smu_cmn_get_indep_throttler_status (metrics.ThrottlerStatus, + vangogh_throttler_map); gpu_metrics->system_clock_counter =ktime_get_boottime_ns (); *table = (void *)gpu_metrics; -return sizeof (struct gpu_metrics_v2_1 ); +return sizeof (struct gpu_metrics_v2_2 ); }static ssize_t vangogh_get_gpu_metrics (struct smu_context *smu,void **table) {struct smu_table_context *smu_table = &smu->smu_table; -struct gpu_metrics_v2_1 *gpu_metrics = - (struct gpu_metrics_v2_1 *)smu_table->gpu_metrics_table; +struct gpu_metrics_v2_2 *gpu_metrics = + (struct gpu_metrics_v2_2 *)smu_table->gpu_metrics_table;SmuMetrics_t metrics;int ret =0 ;@@ -1695,7 +1712,7 @@ static ssize_t vangogh_get_gpu_metrics(struct smu_context *smu,if (ret)return ret; -smu_cmn_init_soft_gpu_metrics (gpu_metrics,2 ,1 ); +smu_cmn_init_soft_gpu_metrics (gpu_metrics,2 ,2 ); gpu_metrics->temperature_gfx = metrics.Current.GfxTemperature; gpu_metrics->temperature_soc = metrics.Current.SocTemperature; @@ -1735,12 +1752,15 @@ static ssize_t vangogh_get_gpu_metrics(struct smu_context *smu, 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); gpu_metrics->system_clock_counter =ktime_get_boottime_ns (); *table = (void *)gpu_metrics; -return sizeof (struct gpu_metrics_v2_1 ); +return sizeof (struct gpu_metrics_v2_2 ); } static ssize_t vangogh_common_get_gpu_metrics(struct smu_context
Quoted 2 lines
*smu,
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
RE: [PATCH v5 7/9] drm/amd/pm: Add vangogh throttler translation
[Public]
Didn't realize 16-bits will max out so fast. For THM_GFX - "SMU_THROTTLER_TEMP_GPU_BIT" looks appropriate. SOC domain will need a new one. As temp throttling reasons are more, you may shift the "OTHERS" by 8-bits if required.
Thanks,
Lijo
-----Original Message-----
From: Sider, Graham <[email protected]>
Sent: Monday, June 7, 2021 8:23 PM
To: Lazar, Lijo <[email protected]>; [email protected]
Cc: Kasiviswanathan, Harish <[email protected]>; Sakhnovitch, Elena (Elen) <[email protected]>
Subject: RE: [PATCH v5 7/9] drm/amd/pm: Add vangogh throttler translation
Great, thanks for all the feedback Lijo. Out of the new bit definitions in amdgpu_smu.h are there any that currently exist that are more applicable for these mappings? *_THM_GFX and *_THM_SOC only exist in VanGogh and Renoir. With the expansion of the MEM and LIQUID bits there is not enough room in the temperature field to add two new definitions.
Best,
Graham
-----Original Message-----
From: Lazar, Lijo <[email protected]>
Sent: Monday, June 7, 2021 10:35 AM
To: Sider, Graham <[email protected]>; [email protected]
Cc: Kasiviswanathan, Harish <[email protected]>; Sakhnovitch, Elena (Elen) <[email protected]>
Subject: Re: [PATCH v5 7/9] drm/amd/pm: Add vangogh throttler translation
Quoted 15 lines · Graham Sider
Perform dependent to independent throttle status translation for vangogh.
Signed-off-by Graham Sider <[email protected]>--- .../gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c | 38 ++++++++++++++----- 1 file changed, 29 insertions(+), 9 deletions(-)drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c +0
-0@@ -190,6 +190,20 @@ static struct cmn2asic_mapping vangogh_workload_map[PP_SMC_POWER_PROFILE_COUNT] WORKLOAD_MAP(PP_SMC_POWER_PROFILE_CUSTOM, WORKLOAD_PPLIB_CUSTOM_BIT),
drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c static struct cmn2asic_mapping vangogh_workload_map[PP_SMC_POWER_PROFILE_COUNT] · line 200
Quoted 10 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c +8
-0}; +static const uint8_t vangogh_throttler_map[] = { + [THROTTLER_STATUS_BIT_SPL ] = (SMU_THROTTLER_SPL_BIT ), + [THROTTLER_STATUS_BIT_FPPT ] = (SMU_THROTTLER_FPPT_BIT ), + [THROTTLER_STATUS_BIT_SPPT ] = (SMU_THROTTLER_SPPT_BIT ), + [THROTTLER_STATUS_BIT_SPPT_APU ] = (SMU_THROTTLER_SPPT_APU_BIT ), + [THROTTLER_STATUS_BIT_THM_CORE ] = (SMU_THROTTLER_TEMP_CORE_BIT ), + [THROTTLER_STATUS_BIT_THM_GFX ] = (SMU_THROTTLER_TEMP_VR_GFX_BIT ), + [THROTTLER_STATUS_BIT_THM_SOC ] = (SMU_THROTTLER_TEMP_VR_SOC_BIT ),
Above two mappings don't look correct. They essentially mean throttling due to GFX/SOC domain temperatures in APU exceeding their limits, not the VR temperatures. Except those mappings, rest of the patch series looks good to me.
Thanks,
Lijo
Quoted 91 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c +23
-10+ [THROTTLER_STATUS_BIT_TDC_VDD] = (SMU_THROTTLER_TDC_VDD_BIT), + [THROTTLER_STATUS_BIT_TDC_SOC] = (SMU_THROTTLER_TDC_SOC_BIT), + [THROTTLER_STATUS_BIT_TDC_GFX] = (SMU_THROTTLER_TDC_GFX_BIT), + [THROTTLER_STATUS_BIT_TDC_CVIP] = (SMU_THROTTLER_TDC_CVIP_BIT), +}; +static int vangogh_tables_init (struct smu_context *smu) { struct smu_table_context *smu_table = &smu->smu_table; @@ -226,7 +240,7 @@ static int vangogh_tables_init(struct smu_context *smu) goto err0_out; smu_table->metrics_time =0 ; - smu_table->gpu_metrics_table_size =sizeof (struct gpu_metrics_v2_1 ); + smu_table->gpu_metrics_table_size =sizeof (struct gpu_metrics_v2_2 ); smu_table->gpu_metrics_table =kzalloc (smu_table->gpu_metrics_table_size,GFP_KERNEL );if (!smu_table->gpu_metrics_table) goto err1_out;@@ -1632,8 +1646,8 @@ static ssize_t vangogh_get_legacy_gpu_metrics(struct smu_context *smu, void **table) {struct smu_table_context *smu_table = &smu->smu_table; -struct gpu_metrics_v2_1 *gpu_metrics = - (struct gpu_metrics_v2_1 *)smu_table->gpu_metrics_table; +struct gpu_metrics_v2_2 *gpu_metrics = + (struct gpu_metrics_v2_2 *)smu_table->gpu_metrics_table;SmuMetrics_legacy_t metrics;int ret =0 ;@@ -1641,7 +1655,7 @@ static ssize_t vangogh_get_legacy_gpu_metrics(struct smu_context *smu,if (ret)return ret; -smu_cmn_init_soft_gpu_metrics (gpu_metrics,2 ,1 ); +smu_cmn_init_soft_gpu_metrics (gpu_metrics,2 ,2 ); gpu_metrics->temperature_gfx = metrics.GfxTemperature; gpu_metrics->temperature_soc = metrics.SocTemperature; @@ -1674,20 +1688,23 @@ static ssize_t vangogh_get_legacy_gpu_metrics(struct smu_context *smu, gpu_metrics->current_l3clk[0] = metrics.L3Frequency[0]; gpu_metrics->throttle_status = metrics.ThrottlerStatus; + gpu_metrics->indep_throttle_status = +smu_cmn_get_indep_throttler_status (metrics.ThrottlerStatus, + vangogh_throttler_map); gpu_metrics->system_clock_counter =ktime_get_boottime_ns (); *table = (void *)gpu_metrics; -return sizeof (struct gpu_metrics_v2_1 ); +return sizeof (struct gpu_metrics_v2_2 ); }static ssize_t vangogh_get_gpu_metrics (struct smu_context *smu,void **table) {struct smu_table_context *smu_table = &smu->smu_table; -struct gpu_metrics_v2_1 *gpu_metrics = - (struct gpu_metrics_v2_1 *)smu_table->gpu_metrics_table; +struct gpu_metrics_v2_2 *gpu_metrics = + (struct gpu_metrics_v2_2 *)smu_table->gpu_metrics_table;SmuMetrics_t metrics;int ret =0 ;@@ -1695,7 +1712,7 @@ static ssize_t vangogh_get_gpu_metrics(struct smu_context *smu,if (ret)return ret; -smu_cmn_init_soft_gpu_metrics (gpu_metrics,2 ,1 ); +smu_cmn_init_soft_gpu_metrics (gpu_metrics,2 ,2 ); gpu_metrics->temperature_gfx = metrics.Current.GfxTemperature; gpu_metrics->temperature_soc = metrics.Current.SocTemperature; @@ -1735,12 +1752,15 @@ static ssize_t vangogh_get_gpu_metrics(struct smu_context *smu, 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); gpu_metrics->system_clock_counter =ktime_get_boottime_ns (); *table = (void *)gpu_metrics; -return sizeof (struct gpu_metrics_v2_1 ); +return sizeof (struct gpu_metrics_v2_2 ); } static ssize_t vangogh_common_get_gpu_metrics(struct smu_context
Quoted 2 lines
*smu,
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH v5 8/9 drm/amd/pm: Add renoir throttler translation
In reply to Graham SiderPerform dependent to independent throttle status translation for renoir.
--- .../gpu/drm/amd/pm/swsmu/smu12/renoir_ppt.c | 29 +++++++++++++++---- 1 file changed, 24 insertions(+), 5 deletions(-)
drivers/gpu/drm/amd/pm/swsmu/smu12/renoir_ppt.c +24 -5
@@ -128,6 +128,22 @@ static struct cmn2asic_mapping renoir_workload_map[PP_SMC_POWER_PROFILE_COUNT] = WORKLOAD_MAP(PP_SMC_POWER_PROFILE_CUSTOM, WORKLOAD_PPLIB_CUSTOM_BIT), }; +static const uint8_t renoir_throttler_map[] = { + [THROTTLER_STATUS_BIT_SPL ] = (SMU_THROTTLER_SPL_BIT ), + [THROTTLER_STATUS_BIT_FPPT ] = (SMU_THROTTLER_FPPT_BIT ), + [THROTTLER_STATUS_BIT_SPPT ] = (SMU_THROTTLER_SPPT_BIT ), + [THROTTLER_STATUS_BIT_SPPT_APU ] = (SMU_THROTTLER_SPPT_APU_BIT ), + [THROTTLER_STATUS_BIT_THM_CORE ] = (SMU_THROTTLER_TEMP_CORE_BIT ), + [THROTTLER_STATUS_BIT_THM_GFX ] = (SMU_THROTTLER_TEMP_VR_GFX_BIT ), + [THROTTLER_STATUS_BIT_THM_SOC ] = (SMU_THROTTLER_TEMP_VR_SOC_BIT ), + [THROTTLER_STATUS_BIT_TDC_VDD ] = (SMU_THROTTLER_TDC_VDD_BIT ), + [THROTTLER_STATUS_BIT_TDC_SOC ] = (SMU_THROTTLER_TDC_SOC_BIT ), + [THROTTLER_STATUS_BIT_PROCHOT_CPU ] = (SMU_THROTTLER_PROCHOT_CPU_BIT ), + [THROTTLER_STATUS_BIT_PROCHOT_GFX ] = (SMU_THROTTLER_PROCHOT_GFX_BIT ), + [THROTTLER_STATUS_BIT_EDC_CPU ] = (SMU_THROTTLER_EDC_CPU_BIT ), + [THROTTLER_STATUS_BIT_EDC_GFX ] = (SMU_THROTTLER_EDC_GFX_BIT ), +}; +static int renoir_init_smc_tables (struct smu_context *smu) {struct smu_table_context *smu_table = &smu->smu_table;
@@ -153,7 +169,7 @@ static int renoir_init_smc_tables(struct smu_context *smu)if (!smu_table->watermarks_table) goto err2_out; - smu_table->gpu_metrics_table_size =sizeof (struct gpu_metrics_v2_1 ); + smu_table->gpu_metrics_table_size =sizeof (struct gpu_metrics_v2_2 ); smu_table->gpu_metrics_table =kzalloc (smu_table->gpu_metrics_table_size,GFP_KERNEL );if (!smu_table->gpu_metrics_table) goto err3_out;
@@ -1264,8 +1280,8 @@ static ssize_t renoir_get_gpu_metrics(struct smu_context *smu, void **table) {struct smu_table_context *smu_table = &smu->smu_table; -struct gpu_metrics_v2_1 *gpu_metrics = - (struct gpu_metrics_v2_1 *)smu_table->gpu_metrics_table; +struct gpu_metrics_v2_2 *gpu_metrics = + (struct gpu_metrics_v2_2 *)smu_table->gpu_metrics_table;SmuMetrics_t metrics;int ret =0 ;
@@ -1273,7 +1289,7 @@ static ssize_t renoir_get_gpu_metrics(struct smu_context *smu,if (ret)return ret; -smu_cmn_init_soft_gpu_metrics (gpu_metrics,2 ,1 ); +smu_cmn_init_soft_gpu_metrics (gpu_metrics,2 ,2 ); gpu_metrics->temperature_gfx = metrics.GfxTemperature; gpu_metrics->temperature_soc = metrics.SocTemperature;
@@ -1311,6 +1327,9 @@ static ssize_t renoir_get_gpu_metrics(struct smu_context *smu, gpu_metrics->current_l3clk[1 ] = metrics.L3Frequency[1 ]; gpu_metrics->throttle_status = metrics.ThrottlerStatus; + gpu_metrics->indep_throttle_status = +smu_cmn_get_indep_throttler_status (metrics.ThrottlerStatus, + renoir_throttler_map); gpu_metrics->fan_pwm = metrics.FanPwm;
@@ -1318,7 +1337,7 @@ static ssize_t renoir_get_gpu_metrics(struct smu_context *smu, *table = (void *)gpu_metrics; -return sizeof (struct gpu_metrics_v2_1 ); +return sizeof (struct gpu_metrics_v2_2 ); }static int renoir_gfx_state_change_set (struct smu_context *smu,uint32_t state)
Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH v5 9/9 drm/amd/pm: Add aldebaran throttler translation
In reply to Graham SiderPerform dependent to independent throttle status translation for aldebaran.
--- .../drm/amd/pm/swsmu/smu13/aldebaran_ppt.c | 27 +++++++++++++++---- 1 file changed, 22 insertions(+), 5 deletions(-)
drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c +22 -5
@@ -191,6 +191,20 @@ static const struct cmn2asic_mapping aldebaran_table_map[SMU_TABLE_COUNT] = { TAB_MAP(I2C_COMMANDS), }; +static const uint8_t aldebaran_throttler_map[] = { + [THROTTLER_PPT0_BIT ] = (SMU_THROTTLER_PPT0_BIT ), + [THROTTLER_PPT1_BIT ] = (SMU_THROTTLER_PPT1_BIT ), + [THROTTLER_TDC_GFX_BIT ] = (SMU_THROTTLER_TDC_GFX_BIT ), + [THROTTLER_TDC_SOC_BIT ] = (SMU_THROTTLER_TDC_SOC_BIT ), + [THROTTLER_TDC_HBM_BIT ] = (SMU_THROTTLER_TDC_MEM_BIT ), + [THROTTLER_TEMP_GPU_BIT ] = (SMU_THROTTLER_TEMP_GPU_BIT ), + [THROTTLER_TEMP_MEM_BIT ] = (SMU_THROTTLER_TEMP_MEM_BIT ), + [THROTTLER_TEMP_VR_GFX_BIT ] = (SMU_THROTTLER_TEMP_VR_GFX_BIT ), + [THROTTLER_TEMP_VR_SOC_BIT ] = (SMU_THROTTLER_TEMP_VR_SOC_BIT ), + [THROTTLER_TEMP_VR_MEM_BIT ] = (SMU_THROTTLER_TEMP_VR_MEM0_BIT ), + [THROTTLER_APCC_BIT ] = (SMU_THROTTLER_APCC_BIT ), +}; +static int aldebaran_tables_init (struct smu_context *smu) {struct smu_table_context *smu_table = &smu->smu_table;
@@ -213,7 +227,7 @@ static int aldebaran_tables_init(struct smu_context *smu)return -ENOMEM ; smu_table->metrics_time =0 ; - smu_table->gpu_metrics_table_size =sizeof (struct gpu_metrics_v1_2 ); + smu_table->gpu_metrics_table_size =sizeof (struct gpu_metrics_v1_3 ); smu_table->gpu_metrics_table =kzalloc (smu_table->gpu_metrics_table_size,GFP_KERNEL );if (!smu_table->gpu_metrics_table) {kfree (smu_table->metrics_table);
@@ -1713,8 +1727,8 @@ static ssize_t aldebaran_get_gpu_metrics(struct smu_context *smu, void **table) {struct smu_table_context *smu_table = &smu->smu_table; -struct gpu_metrics_v1_2 *gpu_metrics = - (struct gpu_metrics_v1_2 *)smu_table->gpu_metrics_table; +struct gpu_metrics_v1_3 *gpu_metrics = + (struct gpu_metrics_v1_3 *)smu_table->gpu_metrics_table;SmuMetrics_t metrics;int i, ret =0 ;
@@ -1724,7 +1738,7 @@ static ssize_t aldebaran_get_gpu_metrics(struct smu_context *smu,if (ret)return ret; -smu_cmn_init_soft_gpu_metrics (gpu_metrics,1 ,2 ); +smu_cmn_init_soft_gpu_metrics (gpu_metrics,1 ,3 ); gpu_metrics->temperature_edge = metrics.TemperatureEdge; gpu_metrics->temperature_hotspot = metrics.TemperatureHotspot;
@@ -1755,6 +1769,9 @@ static ssize_t aldebaran_get_gpu_metrics(struct smu_context *smu, gpu_metrics->current_dclk0 = metrics.CurrClock[PPCLK_DCLK ]; gpu_metrics->throttle_status = metrics.ThrottlerStatus; + gpu_metrics->indep_throttle_status = +smu_cmn_get_indep_throttler_status (metrics.ThrottlerStatus, + aldebaran_throttler_map); gpu_metrics->current_fan_speed =0 ;
@@ -1776,7 +1793,7 @@ static ssize_t aldebaran_get_gpu_metrics(struct smu_context *smu, *table = (void *)gpu_metrics; -return sizeof (struct gpu_metrics_v1_2 ); +return sizeof (struct gpu_metrics_v1_3 ); }static int aldebaran_mode2_reset (struct smu_context *smu)
Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
RE: [PATCH v5 9/9] drm/amd/pm: Add aldebaran throttler translation
[AMD Official Use Only]
Series seems fine to me.
BR
Evan
Quoted 115 lines
-----Original Message-----
From: amd-gfx <[email protected]> On Behalf Of Graham Sider
Sent: Monday, June 7, 2021 9:45 PM
To: [email protected]
Cc: Kasiviswanathan, Harish <[email protected]>; Sider, Graham <[email protected]>; Sakhnovitch, Elena (Elen) <[email protected]>
Subject: [PATCH v5 9/9] drm/amd/pm: Add aldebaran throttler translationPerform dependent to independent throttle status translation for aldebaran.
Signed-off-by Graham Sider <[email protected]>--- .../drm/amd/pm/swsmu/smu13/aldebaran_ppt.c | 27 +++++++++++++++- --- 1 file changed, 22 insertions(+), 5 deletions(-)drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c +4
-0@@ -191,6 +191,20 @@ static const struct cmn2asic_mapping aldebaran_table_map[SMU_TABLE_COUNT] = { TAB_MAP(I2C_COMMANDS), }; +static const uint8_t aldebaran_throttler_map[] = { + [THROTTLER_PPT0_BIT ] = (SMU_THROTTLER_PPT0_BIT ), + [THROTTLER_PPT1_BIT ] = (SMU_THROTTLER_PPT1_BIT ), + [THROTTLER_TDC_GFX_BIT] =(
SMU_THROTTLER_TDC_GFX_BIT),drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c +1
-0+ [THROTTLER_TDC_SOC_BIT] =(
SMU_THROTTLER_TDC_SOC_BIT),drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c +1
-0+ [THROTTLER_TDC_HBM_BIT] =(
SMU_THROTTLER_TDC_MEM_BIT),drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c +1
-0+ [THROTTLER_TEMP_GPU_BIT] =(
SMU_THROTTLER_TEMP_GPU_BIT),drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c +1
-0+ [THROTTLER_TEMP_MEM_BIT] =(
SMU_THROTTLER_TEMP_MEM_BIT),drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c +1
-0+ [THROTTLER_TEMP_VR_GFX_BIT] =(
SMU_THROTTLER_TEMP_VR_GFX_BIT),drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c +1
-0+ [THROTTLER_TEMP_VR_SOC_BIT] =(
SMU_THROTTLER_TEMP_VR_SOC_BIT),drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c +1
-0+ [THROTTLER_TEMP_VR_MEM_BIT] =(
SMU_THROTTLER_TEMP_VR_MEM0_BIT),drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c +1
-0+ [THROTTLER_APCC_BIT] =(
SMU_THROTTLER_APCC_BIT),drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c +2
-0+}; +static int aldebaran_tables_init (struct smu_context *smu) { struct smu_table_context *smu_table = &smu->smu_table; @@ -213,7 +227,7 @@ static int
aldebaran_tables_init(struct smu_context *smu)drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c +0
-1return -ENOMEM ; smu_table->metrics_time =0 ; - smu_table->gpu_metrics_table_size = sizeof(struct
gpu_metrics_v1_2);drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c +1
-0+ smu_table->gpu_metrics_table_size = sizeof(struct
gpu_metrics_v1_3);
smu_table->gpu_metrics_table= kzalloc(smu_table-Quoted 1 line
gpu_metrics_table_size,GFP_KERNEL);drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c +3
-3if (!smu_table->gpu_metrics_table) {kfree (smu_table->metrics_table);@@ -1713,8 +1727,8 @@ static ssize_t aldebaran_get_gpu_metrics(struct smu_context *smu, void **table) {struct smu_table_context *smu_table = &smu->smu_table; -struct gpu_metrics_v1_2 *gpu_metrics = - (struct gpu_metrics_v1_2 *)smu_table->gpu_metrics_table; +struct gpu_metrics_v1_3 *gpu_metrics = + (struct gpu_metrics_v1_3 *)smu_table->gpu_metrics_table;SmuMetrics_t metrics;int i, ret =0 ;@@ -1724,7 +1738,7 @@ static ssize_t aldebaran_get_gpu_metrics(struct smu_context *smu, if (ret) return ret; -smu_cmn_init_soft_gpu_metrics (gpu_metrics,1 ,2 ); +smu_cmn_init_soft_gpu_metrics (gpu_metrics,1 ,3 ); gpu_metrics->temperature_edge = metrics.TemperatureEdge;drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c +3
-0gpu_metrics->temperature_hotspot = metrics.TemperatureHotspot;@@ -1755,6 +1769,9 @@ static ssize_t aldebaran_get_gpu_metrics(struct smu_context *smu, gpu_metrics->current_dclk0 = metrics.CurrClock[PPCLK_DCLK ]; gpu_metrics->throttle_status = metrics.ThrottlerStatus; + gpu_metrics->indep_throttle_status = +smu_cmn_get_indep_throttler_status (metrics.ThrottlerStatus, + aldebaran_throttler_map);drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c +1
-1gpu_metrics->current_fan_speed =0 ;@@ -1776,7 +1793,7 @@ static ssize_t aldebaran_get_gpu_metrics(structsmu_context *smu, *table = (void *)gpu_metrics; -return sizeof (struct gpu_metrics_v1_2 ); +return sizeof (struct gpu_metrics_v1_3 ); }static int
aldebaran_mode2_reset(struct smu_context *smu)
--
2.17.1
Quoted 11 lines
_______________________________________________
amd-gfx mailing list
[email protected]
https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.
freedesktop.org%2Fmailman%2Flistinfo%2Famd- gfx&data=04%7C01%7Cevan.quan%40amd.com%7C1360514bfba14bf2f 7b608d929ba82be%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C6 37586703300653696%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMD AiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata= xCJ5F1UI3MGbeMuKd0pXzQljcYncretn%2BcUFMGDi6yg%3D&reserved =0
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx