drm/amdgpu: share struct amdgpu_pm_state_type with powerplay module

rename amdgpu_pm_state_type to amd_pm_state_type

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

1 files changed, 2 insertions, 26 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
index d4e9272b60e8..d454ad6ff798 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
@@ -1299,31 +1299,7 @@ struct amdgpu_wb {
 int amdgpu_wb_get(struct amdgpu_device *adev, u32 *wb);
 void amdgpu_wb_free(struct amdgpu_device *adev, u32 wb);
 
-/**
- * struct amdgpu_pm - power management datas
- * It keeps track of various data needed to take powermanagement decision.
- */
 
-enum amdgpu_pm_state_type {
-        /* not used for dpm */
-        POWER_STATE_TYPE_DEFAULT,
-        POWER_STATE_TYPE_POWERSAVE,
-        /* user selectable states */
-        POWER_STATE_TYPE_BATTERY,
-        POWER_STATE_TYPE_BALANCED,
-        POWER_STATE_TYPE_PERFORMANCE,
-        /* internal states */
-        POWER_STATE_TYPE_INTERNAL_UVD,
-        POWER_STATE_TYPE_INTERNAL_UVD_SD,
-        POWER_STATE_TYPE_INTERNAL_UVD_HD,
-        POWER_STATE_TYPE_INTERNAL_UVD_HD2,
-        POWER_STATE_TYPE_INTERNAL_UVD_MVC,
-        POWER_STATE_TYPE_INTERNAL_BOOT,
-        POWER_STATE_TYPE_INTERNAL_THERMAL,
-        POWER_STATE_TYPE_INTERNAL_ACPI,
-        POWER_STATE_TYPE_INTERNAL_ULV,
-        POWER_STATE_TYPE_INTERNAL_3DPERF,
-};
 
 enum amdgpu_int_thermal_type {
         THERMAL_TYPE_NONE,
@@ -1605,8 +1581,8 @@ struct amdgpu_dpm {
         /* vce requirements */
         struct amdgpu_vce_state vce_states[AMDGPU_MAX_VCE_LEVELS];
         enum amdgpu_vce_level vce_level;
-        enum amdgpu_pm_state_type state;
-        enum amdgpu_pm_state_type user_state;
+        enum amd_pm_state_type state;
+        enum amd_pm_state_type user_state;
         u32                     platform_caps;
         u32                     voltage_response_time;
         u32                     backbias_response_time;