Report VDDC and MVDD over pp_dpm{sclk,mclk}
Subsystems (2)
cover Report VDDC and MVDD over pp_dpm{sclk,mclk}
Tested on a RX480.
I'm not sure whether to report VDDCI or MVDD for memory. MVDD felt "more" correct, so that's what I've done.
Donny Yang (2):
drm/amdgpu: Populate DPMv1 voltage tables drm/amdgpu: Report VDDC and MVDD over pp_dpm{sclk,mclk}
drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 54 +++++++++++++++++------- 1 file changed, 39 insertions(+), 15 deletions(-)
Signature · 6 lines
2.11.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH 1/2 drm/amdgpu: Populate DPMv1 voltage tables
--- drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 46 +++++++++++++++++------- 1 file changed, 33 insertions(+), 13 deletions(-)
drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c +33 -13
@@ -705,7 +705,7 @@ static int smu7_setup_dpm_tables_v0(struct pp_hwmgr *hwmgr)/* Initialize Vddc DPM table based on allow Vddc values. And populate corresponding std values. */ for (i =0 ; i < allowed_vdd_sclk_table->count; i++) { - data->dpm_table.vddc_table.dpm_levels[i].value = allowed_vdd_mclk_table->entries[i].v; + data->dpm_table.vddc_table.dpm_levels[i].value = allowed_vdd_sclk_table->entries[i].v; data->dpm_table.vddc_table.dpm_levels[i].param1 = std_voltage_table->entries[i].Leakage;/* param1 is for corresponding std voltage */ data->dpm_table.vddc_table.dpm_levels[i].enabled =1 ;
@@ -749,12 +749,19 @@ static int smu7_setup_dpm_tables_v1(struct pp_hwmgr *hwmgr)struct phm_ppt_v1_clock_voltage_dependency_table *dep_sclk_table;struct phm_ppt_v1_clock_voltage_dependency_table *dep_mclk_table; +struct smu7_single_dpm_table *sclk_table, *mclk_table, + *vddc_table, *mvdd_table, *vddci_table;if (table_info ==NULL )return -EINVAL ; dep_sclk_table = table_info->vdd_dep_on_sclk; dep_mclk_table = table_info->vdd_dep_on_mclk; + sclk_table = &data->dpm_table.sclk_table; + mclk_table = &data->dpm_table.mclk_table; + vddc_table = &data->dpm_table.vddc_table; + mvdd_table = &data->dpm_table.mvdd_table; + vddci_table = &data->dpm_table.vddci_table; PP_ASSERT_WITH_CODE(dep_sclk_table != NULL, "SCLK dependency table is missing.",
@@ -770,32 +777,45 @@ static int smu7_setup_dpm_tables_v1(struct pp_hwmgr *hwmgr)"MCLK dependency table count is 0" , return -EINVAL); -/* Initialize Sclk DPM table based on allow Sclk values */ +/* Initialize Sclk and VDDC DPM table based on allow Sclk values */ data->dpm_table.sclk_table.count =0 ; + data->dpm_table.vddc_table.count =0 ;for (i =0 ; i < dep_sclk_table->count; i++) {if (i ==0 || data->dpm_table.sclk_table.dpm_levels[data->dpm_table.sclk_table.count -1 ].value != dep_sclk_table->entries[i].clk) { +phm_ppt_v1_clock_voltage_dependency_record *entry = &dep_sclk_table->entries[i]; - data->dpm_table.sclk_table.dpm_levels[data->dpm_table.sclk_table.count].value = - dep_sclk_table->entries[i].clk; + sclk_table->dpm_levels[sclk_table->count].value = entry->clk; + sclk_table->dpm_levels[sclk_table->count].enabled = i ==0 ; + sclk_table->count++; - data->dpm_table.sclk_table.dpm_levels[data->dpm_table.sclk_table.count].enabled = - (i ==0 ) ? true : false; - data->dpm_table.sclk_table.count++; + vddc_table->dpm_levels[vddc_table->count].value = entry->vddc; + vddc_table->dpm_levels[vddc_table->count].enabled = i ==0 ; + vddc_table->count++; } } -/* Initialize Mclk DPM table based on allow Mclk values */ +/* Initialize Mclk, VDDCI and MVDD DPM table based on allow Mclk values */ data->dpm_table.mclk_table.count =0 ; + data->dpm_table.mvdd_table.count =0 ; + data->dpm_table.vddci_table.count =0 ;for (i =0 ; i < dep_mclk_table->count; i++) {if (i ==0 || data->dpm_table.mclk_table.dpm_levels [data->dpm_table.mclk_table.count -1 ].value != dep_mclk_table->entries[i].clk) { - data->dpm_table.mclk_table.dpm_levels[data->dpm_table.mclk_table.count].value = - dep_mclk_table->entries[i].clk; - data->dpm_table.mclk_table.dpm_levels[data->dpm_table.mclk_table.count].enabled = - (i ==0 ) ? true : false; - data->dpm_table.mclk_table.count++; +phm_ppt_v1_clock_voltage_dependency_record *entry = &dep_mclk_table->entries[i]; + + mclk_table->dpm_levels[mclk_table->count].value = entry->clk; + mclk_table->dpm_levels[mclk_table->count].enabled = i ==0 ; + mclk_table->count++; + + mvdd_table->dpm_levels[mvdd_table->count].value = entry->vddc; + mvdd_table->dpm_levels[mvdd_table->count].enabled = i ==0 ; + mvdd_table->count++; + + vddci_table->dpm_levels[vddci_table->count].value = entry->vddci; + vddci_table->dpm_levels[vddci_table->count].enabled = i ==0 ; + vddci_table->count++; } }
Signature · 6 lines
2.11.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 2/2 drm/amdgpu: Report VDDC and MVDD over pp_dpm{sclk,mclk}
In reply to a message not in the archive--- drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c +6 -2
@@ -4065,6 +4065,8 @@ static int smu7_print_clock_levels(struct pp_hwmgr *hwmgr,struct smu7_single_dpm_table *sclk_table = &(data->dpm_table.sclk_table);struct smu7_single_dpm_table *mclk_table = &(data->dpm_table.mclk_table);struct smu7_single_dpm_table *pcie_table = &(data->dpm_table.pcie_speed_table); +struct smu7_single_dpm_table *vddc_table = &(data->dpm_table.vddc_table); +struct smu7_single_dpm_table *mvdd_table = &(data->dpm_table.mvdd_table);int i, now, size =0 ;uint32_t clock, pcie_speed;
@@ -4081,8 +4083,9 @@ static int smu7_print_clock_levels(struct pp_hwmgr *hwmgr, now = i;for (i =0 ; i < sclk_table->count; i++) - size +=sprintf (buf + size,"%d: %uMhz %s\n" , + size +=sprintf (buf + size,"%d: %uMhz %umV %s\n" , i, sclk_table->dpm_levels[i].value /100 , + vddc_table->dpm_levels[i].value, (i == now) ?"*" :"" );break ;case PP_MCLK :
@@ -4097,8 +4100,9 @@ static int smu7_print_clock_levels(struct pp_hwmgr *hwmgr, now = i;for (i =0 ; i < mclk_table->count; i++) - size +=sprintf (buf + size,"%d: %uMhz %s\n" , + size +=sprintf (buf + size,"%d: %uMhz %umV %s\n" , i, mclk_table->dpm_levels[i].value /100 , + mvdd_table->dpm_levels[i].value, (i == now) ?"*" :"" );break ;case PP_PCIE :
Signature · 6 lines
2.11.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): [email protected]
Re: [PATCH 2/2] drm/amdgpu: Report VDDC and MVDD over pp_dpm{sclk,mclk}
It'd be nicer to move these into the PP_SENSORS framework and then print them from pm_info.
But other than that I don't have any strong objections to these patches.
Tom
________________________________
From: amd-gfx <amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org> on behalf of Donny Yang <[email protected]>
Sent: Friday, January 13, 2017 03:58
To: [email protected]
Cc: Donny Yang
Subject: [PATCH 2/2] drm/amdgpu: Report VDDC and MVDD over pp_dpm{sclk,mclk}
--- drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c +6 -2
@@ -4065,6 +4065,8 @@ static int smu7_print_clock_levels(struct pp_hwmgr *hwmgr,struct smu7_single_dpm_table *sclk_table = &(data->dpm_table.sclk_table);struct smu7_single_dpm_table *mclk_table = &(data->dpm_table.mclk_table);struct smu7_single_dpm_table *pcie_table = &(data->dpm_table.pcie_speed_table); +struct smu7_single_dpm_table *vddc_table = &(data->dpm_table.vddc_table); +struct smu7_single_dpm_table *mvdd_table = &(data->dpm_table.mvdd_table);int i, now, size =0 ;uint32_t clock, pcie_speed;
@@ -4081,8 +4083,9 @@ static int smu7_print_clock_levels(struct pp_hwmgr *hwmgr, now = i;for (i =0 ; i < sclk_table->count; i++) - size +=sprintf (buf + size,"%d: %uMhz %s\n" , + size +=sprintf (buf + size,"%d: %uMhz %umV %s\n" , i, sclk_table->dpm_levels[i].value /100 , + vddc_table->dpm_levels[i].value, (i == now) ?"*" :"" );break ;case PP_MCLK :
@@ -4097,8 +4100,9 @@ static int smu7_print_clock_levels(struct pp_hwmgr *hwmgr, now = i;for (i =0 ; i < mclk_table->count; i++) - size +=sprintf (buf + size,"%d: %uMhz %s\n" , + size +=sprintf (buf + size,"%d: %uMhz %umV %s\n" , i, mclk_table->dpm_levels[i].value /100 , + mvdd_table->dpm_levels[i].value, (i == now) ?"*" :"" );break ;case PP_PCIE :
--
2.11.0
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
amd-gfx Info Page - lists.freedesktop.org<https://lists.freedesktop.org/mailman/listinfo/amd-gfx>
lists.freedesktop.org
To see the collection of prior postings to the list, visit the amd-gfx Archives. Using amd-gfx: To post a message to all the list members, send email ...
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx