drm/amd/powerplay: Unify dpm level defines

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/amdgpu/amdgpu_dpm.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.h
index 955d6f2..fa2b556 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.h
@@ -241,13 +241,6 @@ enum amdgpu_pcie_gen {
        AMDGPU_PCIE_GEN_INVALID = 0xffff
 };
 
-enum amdgpu_dpm_forced_level {
-       AMDGPU_DPM_FORCED_LEVEL_AUTO = 0,
-       AMDGPU_DPM_FORCED_LEVEL_LOW = 1,
-       AMDGPU_DPM_FORCED_LEVEL_HIGH = 2,
-       AMDGPU_DPM_FORCED_LEVEL_MANUAL = 3,
-};
-
 struct amdgpu_dpm_funcs {
        int (*get_temperature)(struct amdgpu_device *adev);
        int (*pre_set_power_state)(struct amdgpu_device *adev);
@@ -258,7 +251,7 @@ struct amdgpu_dpm_funcs {
        u32 (*get_mclk)(struct amdgpu_device *adev, bool low);
        void (*print_power_state)(struct amdgpu_device *adev, struct amdgpu_ps *ps);
        void (*debugfs_print_current_performance_level)(struct amdgpu_device *adev, struct seq_file *m);
-       int (*force_performance_level)(struct amdgpu_device *adev, enum amdgpu_dpm_forced_level level);
+       int (*force_performance_level)(struct amdgpu_device *adev, enum amd_dpm_forced_level level);
        bool (*vblank_too_short)(struct amdgpu_device *adev);
        void (*powergate_uvd)(struct amdgpu_device *adev, bool gate);
        void (*powergate_vce)(struct amdgpu_device *adev, bool gate);
@@ -353,9 +346,6 @@ struct amdgpu_dpm_funcs {
 #define amdgpu_dpm_get_current_power_state(adev) \
        (adev)->powerplay.pp_funcs->get_current_power_state((adev)->powerplay.pp_handle)
 
-#define amdgpu_dpm_get_performance_level(adev) \
-       (adev)->powerplay.pp_funcs->get_performance_level((adev)->powerplay.pp_handle)
-
 #define amdgpu_dpm_get_pp_num_states(adev, data) \
        (adev)->powerplay.pp_funcs->get_pp_num_states((adev)->powerplay.pp_handle, data)
 
@@ -393,6 +383,11 @@ struct amdgpu_dpm_funcs {
         (adev)->powerplay.pp_funcs->get_vce_clock_state((adev)->powerplay.pp_handle, (i)) : \
         (adev)->pm.funcs->get_vce_clock_state((adev), (i)))
 
+#define amdgpu_dpm_get_performance_level(adev) \
+       ((adev)->pp_enabled ?                                           \
+       (adev)->powerplay.pp_funcs->get_performance_level((adev)->powerplay.pp_handle) : \
+       (adev)->pm.dpm.forced_level)
+
 struct amdgpu_dpm {
        struct amdgpu_ps        *ps;
        /* number of valid power states */
@@ -440,7 +435,7 @@ struct amdgpu_dpm {
        /* thermal handling */
        struct amdgpu_dpm_thermal thermal;
        /* forced levels */
-       enum amdgpu_dpm_forced_level forced_level;
+       enum amd_dpm_forced_level forced_level;
 };
 
 struct amdgpu_pm {

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c
index 723ae68..ccf50b8 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c
@@ -112,28 +112,19 @@ static ssize_t amdgpu_get_dpm_forced_performance_level(struct device *dev,
 {
        struct drm_device *ddev = dev_get_drvdata(dev);
        struct amdgpu_device *adev = ddev->dev_private;
+       enum amd_dpm_forced_level level;
 
        if  ((adev->flags & AMD_IS_PX) &&
             (ddev->switch_power_state != DRM_SWITCH_POWER_ON))
                return snprintf(buf, PAGE_SIZE, "off\n");
 
-       if (adev->pp_enabled) {
-               enum amd_dpm_forced_level level;
-
-               level = amdgpu_dpm_get_performance_level(adev);
-               return snprintf(buf, PAGE_SIZE, "%s\n",
-                               (level == AMD_DPM_FORCED_LEVEL_AUTO) ? "auto" :
-                               (level == AMD_DPM_FORCED_LEVEL_LOW) ? "low" :
-                               (level == AMD_DPM_FORCED_LEVEL_HIGH) ? "high" :
-                               (level == AMD_DPM_FORCED_LEVEL_MANUAL) ? "manual" : "unknown");
-       } else {
-               enum amdgpu_dpm_forced_level level;
-
-               level = adev->pm.dpm.forced_level;
-               return snprintf(buf, PAGE_SIZE, "%s\n",
-                               (level == AMDGPU_DPM_FORCED_LEVEL_AUTO) ? "auto" :
-                               (level == AMDGPU_DPM_FORCED_LEVEL_LOW) ? "low" : "high");
-       }
+       level = amdgpu_dpm_get_performance_level(adev);
+       return snprintf(buf, PAGE_SIZE, "%s\n",
+                       (level & (AMD_DPM_FORCED_LEVEL_AUTO) ? "auto" :
+                       (level & AMD_DPM_FORCED_LEVEL_LOW) ? "low" :
+                       (level & AMD_DPM_FORCED_LEVEL_HIGH) ? "high" :
+                       (level & AMD_DPM_FORCED_LEVEL_MANUAL) ? "manual" :
+                       "unknown"));
 }
 
 static ssize_t amdgpu_set_dpm_forced_performance_level(struct device *dev,
@@ -143,7 +134,7 @@ static ssize_t amdgpu_set_dpm_forced_performance_level(struct device *dev,
 {
        struct drm_device *ddev = dev_get_drvdata(dev);
        struct amdgpu_device *adev = ddev->dev_private;
-       enum amdgpu_dpm_forced_level level;
+       enum amd_dpm_forced_level level;
        int ret = 0;
 
        /* Can't force performance level when the card is off */
@@ -152,13 +143,13 @@ static ssize_t amdgpu_set_dpm_forced_performance_level(struct device *dev,
                return -EINVAL;
 
        if (strncmp("low", buf, strlen("low")) == 0) {
-               level = AMDGPU_DPM_FORCED_LEVEL_LOW;
+               level = AMD_DPM_FORCED_LEVEL_LOW;
        } else if (strncmp("high", buf, strlen("high")) == 0) {
-               level = AMDGPU_DPM_FORCED_LEVEL_HIGH;
+               level = AMD_DPM_FORCED_LEVEL_HIGH;
        } else if (strncmp("auto", buf, strlen("auto")) == 0) {
-               level = AMDGPU_DPM_FORCED_LEVEL_AUTO;
+               level = AMD_DPM_FORCED_LEVEL_AUTO;
        } else if (strncmp("manual", buf, strlen("manual")) == 0) {
-               level = AMDGPU_DPM_FORCED_LEVEL_MANUAL;
+               level = AMD_DPM_FORCED_LEVEL_MANUAL;
        } else {
                count = -EINVAL;
                goto fail;
@@ -1060,9 +1051,9 @@ static void amdgpu_dpm_change_power_state_locked(struct amdgpu_device *adev)
 
        if (adev->pm.funcs->force_performance_level) {
                if (adev->pm.dpm.thermal_active) {
-                       enum amdgpu_dpm_forced_level level = adev->pm.dpm.forced_level;
+                       enum amd_dpm_forced_level level = adev->pm.dpm.forced_level;
                        /* force low perf level for thermal */
-                       amdgpu_dpm_force_performance_level(adev, AMDGPU_DPM_FORCED_LEVEL_LOW);
+                       amdgpu_dpm_force_performance_level(adev, AMD_DPM_FORCED_LEVEL_LOW);
                        /* save the user's level */
                        adev->pm.dpm.forced_level = level;
                } else {

diff --git a/drivers/gpu/drm/amd/amdgpu/ci_dpm.c b/drivers/gpu/drm/amd/amdgpu/ci_dpm.c
index bda9e3d..d8de7eb 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/ci_dpm.c
+++ b/drivers/gpu/drm/amd/amdgpu/ci_dpm.c
@@ -4336,13 +4336,13 @@ static u32 ci_get_lowest_enabled_level(struct amdgpu_device *adev,
 
 
 static int ci_dpm_force_performance_level(struct amdgpu_device *adev,
-                                         enum amdgpu_dpm_forced_level level)
+                                         enum amd_dpm_forced_level level)
 {
        struct ci_power_info *pi = ci_get_pi(adev);
        u32 tmp, levels, i;
        int ret;
 
-       if (level == AMDGPU_DPM_FORCED_LEVEL_HIGH) {
+       if (level == AMD_DPM_FORCED_LEVEL_HIGH) {
                if ((!pi->pcie_dpm_key_disabled) &&
                    pi->dpm_level_enable_mask.pcie_dpm_enable_mask) {
                        levels = 0;
@@ -4403,7 +4403,7 @@ static int ci_dpm_force_performance_level(struct amdgpu_device *adev,
                                }
                        }
                }
-       } else if (level == AMDGPU_DPM_FORCED_LEVEL_LOW) {
+       } else if (level == AMD_DPM_FORCED_LEVEL_LOW) {
                if ((!pi->sclk_dpm_key_disabled) &&
                    pi->dpm_level_enable_mask.sclk_dpm_enable_mask) {
                        levels = ci_get_lowest_enabled_level(adev,
@@ -4452,7 +4452,7 @@ static int ci_dpm_force_performance_level(struct amdgpu_device *adev,
                                udelay(1);
                        }
                }
-       } else if (level == AMDGPU_DPM_FORCED_LEVEL_AUTO) {
+       } else if (level == AMD_DPM_FORCED_LEVEL_AUTO) {
                if (!pi->pcie_dpm_key_disabled) {
                        PPSMC_Result smc_result;
 
@@ -6262,7 +6262,7 @@ static int ci_dpm_sw_init(void *handle)
        /* default to balanced state */
        adev->pm.dpm.state = POWER_STATE_TYPE_BALANCED;
        adev->pm.dpm.user_state = POWER_STATE_TYPE_BALANCED;
-       adev->pm.dpm.forced_level = AMDGPU_DPM_FORCED_LEVEL_AUTO;
+       adev->pm.dpm.forced_level = AMD_DPM_FORCED_LEVEL_AUTO;
        adev->pm.default_sclk = adev->clock.default_sclk;
        adev->pm.default_mclk = adev->clock.default_mclk;
        adev->pm.current_sclk = adev->clock.default_sclk;
@@ -6572,7 +6572,7 @@ static int ci_dpm_force_clock_level(struct amdgpu_device *adev,
        struct ci_power_info *pi = ci_get_pi(adev);
 
        if (adev->pm.dpm.forced_level
-                       != AMDGPU_DPM_FORCED_LEVEL_MANUAL)
+                       != AMD_DPM_FORCED_LEVEL_MANUAL)
                return -EINVAL;
 
        switch (type) {

diff --git a/drivers/gpu/drm/amd/amdgpu/kv_dpm.c b/drivers/gpu/drm/amd/amdgpu/kv_dpm.c
index 5a1bc35..91f885b 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/kv_dpm.c
+++ b/drivers/gpu/drm/amd/amdgpu/kv_dpm.c
@@ -1904,19 +1904,19 @@ static int kv_enable_nb_dpm(struct amdgpu_device *adev,
 }
 
 static int kv_dpm_force_performance_level(struct amdgpu_device *adev,
-                                         enum amdgpu_dpm_forced_level level)
+                                         enum amd_dpm_forced_level level)
 {
        int ret;
 
-       if (level == AMDGPU_DPM_FORCED_LEVEL_HIGH) {
+       if (level == AMD_DPM_FORCED_LEVEL_HIGH) {
                ret = kv_force_dpm_highest(adev);
                if (ret)
                        return ret;
-       } else if (level == AMDGPU_DPM_FORCED_LEVEL_LOW) {
+       } else if (level == AMD_DPM_FORCED_LEVEL_LOW) {
                ret = kv_force_dpm_lowest(adev);
                if (ret)
                        return ret;
-       } else if (level == AMDGPU_DPM_FORCED_LEVEL_AUTO) {
+       } else if (level == AMD_DPM_FORCED_LEVEL_AUTO) {
                ret = kv_unforce_levels(adev);
                if (ret)
                        return ret;
@@ -3029,7 +3029,7 @@ static int kv_dpm_sw_init(void *handle)
        /* default to balanced state */
        adev->pm.dpm.state = POWER_STATE_TYPE_BALANCED;
        adev->pm.dpm.user_state = POWER_STATE_TYPE_BALANCED;
-       adev->pm.dpm.forced_level = AMDGPU_DPM_FORCED_LEVEL_AUTO;
+       adev->pm.dpm.forced_level = AMD_DPM_FORCED_LEVEL_AUTO;
        adev->pm.default_sclk = adev->clock.default_sclk;
        adev->pm.default_mclk = adev->clock.default_mclk;
        adev->pm.current_sclk = adev->clock.default_sclk;

diff --git a/drivers/gpu/drm/amd/amdgpu/si_dpm.c b/drivers/gpu/drm/amd/amdgpu/si_dpm.c
index 6e150db..738ebc1 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/si_dpm.c
+++ b/drivers/gpu/drm/amd/amdgpu/si_dpm.c
@@ -3906,25 +3906,25 @@ static int si_restrict_performance_levels_before_switch(struct amdgpu_device *ad
 }
 
 static int si_dpm_force_performance_level(struct amdgpu_device *adev,
-                                  enum amdgpu_dpm_forced_level level)
+                                  enum amd_dpm_forced_level level)
 {
        struct amdgpu_ps *rps = adev->pm.dpm.current_ps;
        struct  si_ps *ps = si_get_ps(rps);
        u32 levels = ps->performance_level_count;
 
-       if (level == AMDGPU_DPM_FORCED_LEVEL_HIGH) {
+       if (level == AMD_DPM_FORCED_LEVEL_HIGH) {
                if (si_send_msg_to_smc_with_parameter(adev, PPSMC_MSG_SetEnabledLevels, levels) != PPSMC_Result_OK)
                        return -EINVAL;
 
                if (si_send_msg_to_smc_with_parameter(adev, PPSMC_MSG_SetForcedLevels, 1) != PPSMC_Result_OK)
                        return -EINVAL;
-       } else if (level == AMDGPU_DPM_FORCED_LEVEL_LOW) {
+       } else if (level == AMD_DPM_FORCED_LEVEL_LOW) {
                if (si_send_msg_to_smc_with_parameter(adev, PPSMC_MSG_SetForcedLevels, 0) != PPSMC_Result_OK)
                        return -EINVAL;
 
                if (si_send_msg_to_smc_with_parameter(adev, PPSMC_MSG_SetEnabledLevels, 1) != PPSMC_Result_OK)
                        return -EINVAL;
-       } else if (level == AMDGPU_DPM_FORCED_LEVEL_AUTO) {
+       } else if (level == AMD_DPM_FORCED_LEVEL_AUTO) {
                if (si_send_msg_to_smc_with_parameter(adev, PPSMC_MSG_SetForcedLevels, 0) != PPSMC_Result_OK)
                        return -EINVAL;
 
@@ -7746,7 +7746,7 @@ static int si_dpm_sw_init(void *handle)
        /* default to balanced state */
        adev->pm.dpm.state = POWER_STATE_TYPE_BALANCED;
        adev->pm.dpm.user_state = POWER_STATE_TYPE_BALANCED;
-       adev->pm.dpm.forced_level = AMDGPU_DPM_FORCED_LEVEL_AUTO;
+       adev->pm.dpm.forced_level = AMD_DPM_FORCED_LEVEL_AUTO;
        adev->pm.default_sclk = adev->clock.default_sclk;
        adev->pm.default_mclk = adev->clock.default_mclk;
        adev->pm.current_sclk = adev->clock.default_sclk;

diff --git a/drivers/gpu/drm/amd/include/amd_shared.h b/drivers/gpu/drm/amd/include/amd_shared.h
index 85f3587..c92532c 100644 (file)
--- a/drivers/gpu/drm/amd/include/amd_shared.h
+++ b/drivers/gpu/drm/amd/include/amd_shared.h
@@ -80,6 +80,13 @@ enum amd_clockgating_state {
        AMD_CG_STATE_UNGATE,
 };
 
+enum amd_dpm_forced_level {
+       AMD_DPM_FORCED_LEVEL_AUTO = 0x1,
+       AMD_DPM_FORCED_LEVEL_MANUAL = 0x2,
+       AMD_DPM_FORCED_LEVEL_LOW = 0x4,
+       AMD_DPM_FORCED_LEVEL_HIGH = 0x8,
+};
+
 enum amd_powergating_state {
        AMD_PG_STATE_GATE = 0,
        AMD_PG_STATE_UNGATE,

diff --git a/drivers/gpu/drm/amd/powerplay/inc/amd_powerplay.h b/drivers/gpu/drm/amd/powerplay/inc/amd_powerplay.h
index 3a883e6..6d52a39 100644 (file)
--- a/drivers/gpu/drm/amd/powerplay/inc/amd_powerplay.h
+++ b/drivers/gpu/drm/amd/powerplay/inc/amd_powerplay.h
@@ -135,13 +135,6 @@ enum amd_pp_event {
        AMD_PP_EVENT_MAX
 };
 
-enum amd_dpm_forced_level {
-       AMD_DPM_FORCED_LEVEL_AUTO = 0,
-       AMD_DPM_FORCED_LEVEL_LOW = 1,
-       AMD_DPM_FORCED_LEVEL_HIGH = 2,
-       AMD_DPM_FORCED_LEVEL_MANUAL = 3,
-};
-
 struct amd_pp_init {
        struct cgs_device *device;
        uint32_t chip_family;