drm/amd/pm/smu7: move variables to where they are used

From Alex Deucher
5525c289dbcf2b1adecc5e727e7d544ade9c7be1 in linux-6.1.y/6.1.46
63a9ab264a8c030482ab9e7e20b6c4c162299531 in mainline linux

diff --git a/sys/dev/pci/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c b/sys/dev/pci/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c
index e782ea4..66eda8e 100644 (file)
--- a/sys/dev/pci/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c
+++ b/sys/dev/pci/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c
@@ -1505,12 +1505,6 @@ static void smu7_populate_umdpstate_clocks(struct pp_hwmgr *hwmgr)
 {
        struct smu7_hwmgr *data = (struct smu7_hwmgr *)(hwmgr->backend);
        struct smu7_dpm_table *golden_dpm_table = &data->golden_dpm_table;
-       struct phm_clock_voltage_dependency_table *vddc_dependency_on_sclk =
-                       hwmgr->dyn_state.vddc_dependency_on_sclk;
-       struct phm_ppt_v1_information *table_info =
-                       (struct phm_ppt_v1_information *)(hwmgr->pptable);
-       struct phm_ppt_v1_clock_voltage_dependency_table *vdd_dep_on_sclk =
-                       table_info->vdd_dep_on_sclk;
        int32_t tmp_sclk, count, percentage;
 
        if (golden_dpm_table->mclk_table.count == 1) {
@@ -1525,6 +1519,9 @@ static void smu7_populate_umdpstate_clocks(struct pp_hwmgr *hwmgr)
        tmp_sclk = hwmgr->pstate_mclk * percentage / 100;
 
        if (hwmgr->pp_table_version == PP_TABLE_V0) {
+               struct phm_clock_voltage_dependency_table *vddc_dependency_on_sclk =
+                       hwmgr->dyn_state.vddc_dependency_on_sclk;
+
                for (count = vddc_dependency_on_sclk->count - 1; count >= 0; count--) {
                        if (tmp_sclk >= vddc_dependency_on_sclk->entries[count].clk) {
                                hwmgr->pstate_sclk = vddc_dependency_on_sclk->entries[count].clk;
@@ -1537,6 +1534,11 @@ static void smu7_populate_umdpstate_clocks(struct pp_hwmgr *hwmgr)
                hwmgr->pstate_sclk_peak =
                        vddc_dependency_on_sclk->entries[vddc_dependency_on_sclk->count - 1].clk;
        } else if (hwmgr->pp_table_version == PP_TABLE_V1) {
+               struct phm_ppt_v1_information *table_info =
+                       (struct phm_ppt_v1_information *)(hwmgr->pptable);
+               struct phm_ppt_v1_clock_voltage_dependency_table *vdd_dep_on_sclk =
+                       table_info->vdd_dep_on_sclk;
+
                for (count = vdd_dep_on_sclk->count - 1; count >= 0; count--) {
                        if (tmp_sclk >= vdd_dep_on_sclk->entries[count].clk) {
                                hwmgr->pstate_sclk = vdd_dep_on_sclk->entries[count].clk;