[PATCH 5/7] drm/amd/powerplay: Tidy up cz_dpm_update_vce_dpm()

[Tom St Denis]

Signed-off-by: Tom St Denis <tom.stde...@amd.com>
---
 drivers/gpu/drm/amd/powerplay/hwmgr/cz_hwmgr.c | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/cz_hwmgr.c 
b/drivers/gpu/drm/amd/powerplay/hwmgr/cz_hwmgr.c
index 3abd6b2988e5..36d975dde65f 100644
--- a/drivers/gpu/drm/amd/powerplay/hwmgr/cz_hwmgr.c
+++ b/drivers/gpu/drm/amd/powerplay/hwmgr/cz_hwmgr.c
@@ -1329,17 +1329,16 @@ int  cz_dpm_update_vce_dpm(struct pp_hwmgr *hwmgr)
                hwmgr->dyn_state.vce_clock_voltage_dependency_table;
 
        /* 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)
-                                       || hwmgr->en_umd_pstate) {
+       if (PP_CAP(PHM_PlatformCaps_StablePState) ||
+           hwmgr->en_umd_pstate) {
                cz_hwmgr->vce_dpm.hard_min_clk =
                                  ptable->entries[ptable->count - 1].ecclk;
 
                smum_send_msg_to_smc_with_parameter(hwmgr,
-                                       PPSMC_MSG_SetEclkHardMin,
-                                       cz_get_eclk_level(hwmgr,
-                                            cz_hwmgr->vce_dpm.hard_min_clk,
-                                               PPSMC_MSG_SetEclkHardMin));
+                       PPSMC_MSG_SetEclkHardMin,
+                       cz_get_eclk_level(hwmgr,
+                               cz_hwmgr->vce_dpm.hard_min_clk,
+                               PPSMC_MSG_SetEclkHardMin));
        } else {
                /*Program HardMin based on the vce_arbiter.ecclk */
                if (hwmgr->vce_arbiter.ecclk == 0) {
@@ -1352,10 +1351,10 @@ int  cz_dpm_update_vce_dpm(struct pp_hwmgr *hwmgr)
                } else {
                        cz_hwmgr->vce_dpm.hard_min_clk = 
hwmgr->vce_arbiter.ecclk;
                        smum_send_msg_to_smc_with_parameter(hwmgr,
-                                               PPSMC_MSG_SetEclkHardMin,
-                                               cz_get_eclk_level(hwmgr,
-                                               cz_hwmgr->vce_dpm.hard_min_clk,
-                                               PPSMC_MSG_SetEclkHardMin));
+                               PPSMC_MSG_SetEclkHardMin,
+                               cz_get_eclk_level(hwmgr,
+                                       cz_hwmgr->vce_dpm.hard_min_clk,
+                                       PPSMC_MSG_SetEclkHardMin));
                }
        }
        return 0;
-- 
2.12.0

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx