drm/amd/powerplay: fix PSI not enabled by kmd

cherry-pick from windows driver.

Signed-off-by: Rex Zhu <Rex.Zhu@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/ppatomfwctrl.c b/drivers/gpu/drm/amd/powerplay/hwmgr/ppatomfwctrl.c
index cd33eb179db27259ed8e6ee3ae8e10961c2714a5..c062844b15f3c076f3490e1f4a017340e91bc3b3 100644 (file)
--- a/drivers/gpu/drm/amd/powerplay/hwmgr/ppatomfwctrl.c
+++ b/drivers/gpu/drm/amd/powerplay/hwmgr/ppatomfwctrl.c
@@ -142,7 +142,7 @@ int pp_atomfwctrl_get_voltage_table_v4(struct pp_hwmgr *hwmgr,
                }
        } else if (voltage_mode == VOLTAGE_OBJ_SVID2) {
                voltage_table->psi1_enable =
-                       voltage_object->svid2_voltage_obj.loadline_psi1 & 0x1;
+                       (voltage_object->svid2_voltage_obj.loadline_psi1 & 0x20) >> 5;
                voltage_table->psi0_enable =
                        voltage_object->svid2_voltage_obj.psi0_enable & 0x1;
                voltage_table->max_vid_step =

diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c
index 979cc5cc62914efdaa398e8218c89745bdf14cfa..4aa0a767fc16d4798c6b307ce5984d31b7b18580 100644 (file)
--- a/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c
+++ b/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c
@@ -2522,6 +2522,9 @@ static int vega10_init_smc_table(struct pp_hwmgr *hwmgr)
        pp_table->DisplayDpmVoltageMode =
                        (uint8_t)(table_info->uc_dcef_dpm_voltage_mode);
 
+       data->vddc_voltage_table.psi0_enable = voltage_table.psi0_enable;
+       data->vddc_voltage_table.psi1_enable = voltage_table.psi1_enable;
+
        if (data->registry_data.ulv_support &&
                        table_info->us_ulv_voltage_offset) {
                result = vega10_populate_ulv_state(hwmgr);