drm/amd/powerplay: set uvd/vce/nb/mclk level as UMD P-state required

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

diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/cz_hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/cz_hwmgr.c
index a301003f6e2a1198d18305be96d6d8ba680f2a76..7f3b24f42e30a36620f776dd4f3ca8c35e1de04c 100644 (file)
--- a/drivers/gpu/drm/amd/powerplay/hwmgr/cz_hwmgr.c
+++ b/drivers/gpu/drm/amd/powerplay/hwmgr/cz_hwmgr.c
@@ -1138,7 +1138,11 @@ static int cz_apply_state_adjust_rules(struct pp_hwmgr *hwmgr,
 
        cz_ps->action = cz_current_ps->action;
 
-       if (!force_high && (cz_ps->action == FORCE_HIGH))
+       if (hwmgr->request_dpm_level == AMD_DPM_FORCED_LEVEL_PROFILE_PEAK)
+               cz_nbdpm_pstate_enable_disable(hwmgr, false, false);
+       else if (hwmgr->request_dpm_level == AMD_DPM_FORCED_LEVEL_PROFILE_STANDARD)
+               cz_nbdpm_pstate_enable_disable(hwmgr, false, true);
+       else if (!force_high && (cz_ps->action == FORCE_HIGH))
                cz_ps->action = CANCEL_FORCE_HIGH;
        else if (force_high && (cz_ps->action != FORCE_HIGH))
                cz_ps->action = FORCE_HIGH;
@@ -1374,7 +1378,8 @@ int cz_dpm_update_uvd_dpm(struct pp_hwmgr *hwmgr, bool bgate)
        if (!bgate) {
                /* Stable Pstate is enabled and we need to set the UVD DPM to highest level */
                if (phm_cap_enabled(hwmgr->platform_descriptor.platformCaps,
-                                        PHM_PlatformCaps_StablePState)) {
+                                        PHM_PlatformCaps_StablePState)
+                       || hwmgr->en_umd_pstate) {
                        cz_hwmgr->uvd_dpm.hard_min_clk =
                                   ptable->entries[ptable->count - 1].vclk;
 
@@ -1403,7 +1408,8 @@ int  cz_dpm_update_vce_dpm(struct pp_hwmgr *hwmgr)
 
        /* Stable Pstate is enabled and we need to set the VCE DPM to highest level */
        if (phm_cap_enabled(hwmgr->platform_descriptor.platformCaps,
-                                        PHM_PlatformCaps_StablePState)) {
+                                       PHM_PlatformCaps_StablePState)
+                                       || hwmgr->en_umd_pstate) {
                cz_hwmgr->vce_dpm.hard_min_clk =
                                  ptable->entries[ptable->count - 1].ecclk;