OSDN Git Service

drm/amd/display: Remove duplicate dm_pp_power_level enum
authorHarry Wentland <harry.wentland@amd.com>
Fri, 9 Feb 2018 21:52:15 +0000 (16:52 -0500)
committerAlex Deucher <alexander.deucher@amd.com>
Mon, 5 Mar 2018 20:35:40 +0000 (15:35 -0500)
This is really just a copy of dm_pp_clocks_state, so just use that one.

Thanks to Matthias Kaehlke for spotting this.

Signed-off-by: Harry Wentland <harry.wentland@amd.com>
Reviewed-by: Roman Li <Roman.Li@amd.com>
Acked-by: Harry Wentland <harry.wentland@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/display/dc/dm_services_types.h

index fa26cf4..25ece53 100644 (file)
@@ -239,25 +239,8 @@ enum dm_acpi_display_type {
        AcpiDisplayType_DFP6 = 12
 };
 
-enum dm_pp_power_level {
-       DM_PP_POWER_LEVEL_INVALID,
-       DM_PP_POWER_LEVEL_ULTRA_LOW,
-       DM_PP_POWER_LEVEL_LOW,
-       DM_PP_POWER_LEVEL_NOMINAL,
-       DM_PP_POWER_LEVEL_PERFORMANCE,
-
-       DM_PP_POWER_LEVEL_0 = DM_PP_POWER_LEVEL_ULTRA_LOW,
-       DM_PP_POWER_LEVEL_1 = DM_PP_POWER_LEVEL_LOW,
-       DM_PP_POWER_LEVEL_2 = DM_PP_POWER_LEVEL_NOMINAL,
-       DM_PP_POWER_LEVEL_3 = DM_PP_POWER_LEVEL_PERFORMANCE,
-       DM_PP_POWER_LEVEL_4 = DM_PP_CLOCKS_DPM_STATE_LEVEL_3 + 1,
-       DM_PP_POWER_LEVEL_5 = DM_PP_CLOCKS_DPM_STATE_LEVEL_4 + 1,
-       DM_PP_POWER_LEVEL_6 = DM_PP_CLOCKS_DPM_STATE_LEVEL_5 + 1,
-       DM_PP_POWER_LEVEL_7 = DM_PP_CLOCKS_DPM_STATE_LEVEL_6 + 1,
-};
-
 struct dm_pp_power_level_change_request {
-       enum dm_pp_power_level power_level;
+       enum dm_pp_clocks_state power_level;
 };
 
 struct dm_pp_clock_for_voltage_req {