Revert "drm/amd/pp: Send khz clock values to DC for smu7/8"

This reverts commit 93b100ddda3be284be160e9ccba28c7f8f21ab73 which was
commit c3cb424a086921f6bb0449b10d998352a756d6d5 upstream.

It was not needed for 4.18.y and caused problems there.

Reported-by: Alexander Deucher <Alexander.Deucher@amd.com>
Cc: Harry Wentland <harry.wentland@amd.com>
Cc: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c
index 77779adeef287ad88638c8440718d4ce5d264f1f..f8e866ceda02222a7c59e92a2d63cec1c4ea9dde 100644 (file)
--- a/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c
+++ b/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c
@@ -4555,12 +4555,12 @@ static int smu7_get_sclks(struct pp_hwmgr *hwmgr, struct amd_pp_clocks *clocks)
                        return -EINVAL;
                dep_sclk_table = table_info->vdd_dep_on_sclk;
                for (i = 0; i < dep_sclk_table->count; i++)
-                       clocks->clock[i] = dep_sclk_table->entries[i].clk * 10;
+                       clocks->clock[i] = dep_sclk_table->entries[i].clk;
                clocks->count = dep_sclk_table->count;
        } else if (hwmgr->pp_table_version == PP_TABLE_V0) {
                sclk_table = hwmgr->dyn_state.vddc_dependency_on_sclk;
                for (i = 0; i < sclk_table->count; i++)
-                       clocks->clock[i] = sclk_table->entries[i].clk * 10;
+                       clocks->clock[i] = sclk_table->entries[i].clk;
                clocks->count = sclk_table->count;
        }
 
@@ -4592,7 +4592,7 @@ static int smu7_get_mclks(struct pp_hwmgr *hwmgr, struct amd_pp_clocks *clocks)
                        return -EINVAL;
                dep_mclk_table = table_info->vdd_dep_on_mclk;
                for (i = 0; i < dep_mclk_table->count; i++) {
-                       clocks->clock[i] = dep_mclk_table->entries[i].clk * 10;
+                       clocks->clock[i] = dep_mclk_table->entries[i].clk;
                        clocks->latency[i] = smu7_get_mem_latency(hwmgr,
                                                dep_mclk_table->entries[i].clk);
                }
@@ -4600,7 +4600,7 @@ static int smu7_get_mclks(struct pp_hwmgr *hwmgr, struct amd_pp_clocks *clocks)
        } else if (hwmgr->pp_table_version == PP_TABLE_V0) {
                mclk_table = hwmgr->dyn_state.vddc_dependency_on_mclk;
                for (i = 0; i < mclk_table->count; i++)
-                       clocks->clock[i] = mclk_table->entries[i].clk * 10;
+                       clocks->clock[i] = mclk_table->entries[i].clk;
                clocks->count = mclk_table->count;
        }
        return 0;

diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/smu8_hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/smu8_hwmgr.c
index 0adfc5392cd375f425da25ffd49767518c927c23..617557bd8c24e488f7eddd909279f497e1728c59 100644 (file)
--- a/drivers/gpu/drm/amd/powerplay/hwmgr/smu8_hwmgr.c
+++ b/drivers/gpu/drm/amd/powerplay/hwmgr/smu8_hwmgr.c
@@ -1605,17 +1605,17 @@ static int smu8_get_clock_by_type(struct pp_hwmgr *hwmgr, enum amd_pp_clock_type
        switch (type) {
        case amd_pp_disp_clock:
                for (i = 0; i < clocks->count; i++)
-                       clocks->clock[i] = data->sys_info.display_clock[i] * 10;
+                       clocks->clock[i] = data->sys_info.display_clock[i];
                break;
        case amd_pp_sys_clock:
                table = hwmgr->dyn_state.vddc_dependency_on_sclk;
                for (i = 0; i < clocks->count; i++)
-                       clocks->clock[i] = table->entries[i].clk * 10;
+                       clocks->clock[i] = table->entries[i].clk;
                break;
        case amd_pp_mem_clock:
                clocks->count = SMU8_NUM_NBPMEMORYCLOCK;
                for (i = 0; i < clocks->count; i++)
-                       clocks->clock[i] = data->sys_info.nbp_memory_clock[clocks->count - 1 - i] * 10;
+                       clocks->clock[i] = data->sys_info.nbp_memory_clock[clocks->count - 1 - i];
                break;
        default:
                return -1;