drm/amd/powerplay: add new pp_psm infrastructure for vega12 (v2)
authorEvan Quan <evan.quan@amd.com>
Mon, 19 Mar 2018 19:16:14 +0000 (14:16 -0500)
committerAlex Deucher <alexander.deucher@amd.com>
Wed, 21 Mar 2018 19:36:55 +0000 (14:36 -0500)
New psm infrastructure for vega12.

v2: rebase (Alex)

Acked-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Evan Quan <evan.quan@amd.com>
Acked-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/powerplay/hwmgr/Makefile
drivers/gpu/drm/amd/powerplay/hwmgr/pp_psm.c
drivers/gpu/drm/amd/powerplay/hwmgr/pp_psm_legacy.c [new file with mode: 0644]
drivers/gpu/drm/amd/powerplay/hwmgr/pp_psm_legacy.h [new file with mode: 0644]
drivers/gpu/drm/amd/powerplay/hwmgr/pp_psm_new.c [new file with mode: 0644]
drivers/gpu/drm/amd/powerplay/hwmgr/pp_psm_new.h [new file with mode: 0644]

index f868b95..c1249e0 100644 (file)
@@ -31,7 +31,7 @@ HARDWARE_MGR = hwmgr.o processpptables.o \
                smu7_clockpowergating.o \
                vega10_processpptables.o vega10_hwmgr.o vega10_powertune.o \
                vega10_thermal.o smu10_hwmgr.o pp_psm.o\
-               pp_overdriver.o smu_helper.o
+               pp_overdriver.o smu_helper.o pp_psm_legacy.o pp_psm_new.o
 
 AMD_PP_HWMGR = $(addprefix $(AMD_PP_PATH)/hwmgr/,$(HARDWARE_MGR))
 
index d0ef8f9..295ab9f 100644 (file)
  *
  */
 
-#include <linux/types.h>
-#include <linux/kernel.h>
-#include <linux/slab.h>
 #include "pp_psm.h"
+#include "pp_psm_legacy.h"
+#include "pp_psm_new.h"
 
 int psm_init_power_state_table(struct pp_hwmgr *hwmgr)
 {
-       int result;
-       unsigned int i;
-       unsigned int table_entries;
-       struct pp_power_state *state;
-       int size;
-
-       if (hwmgr->hwmgr_func->get_num_of_pp_table_entries == NULL)
-               return -EINVAL;
-
-       if (hwmgr->hwmgr_func->get_power_state_size == NULL)
-               return -EINVAL;
-
-       hwmgr->num_ps = table_entries = hwmgr->hwmgr_func->get_num_of_pp_table_entries(hwmgr);
-
-       hwmgr->ps_size = size = hwmgr->hwmgr_func->get_power_state_size(hwmgr) +
-                                         sizeof(struct pp_power_state);
-
-       hwmgr->ps = kzalloc(size * table_entries, GFP_KERNEL);
-       if (hwmgr->ps == NULL)
-               return -ENOMEM;
-
-       hwmgr->request_ps = kzalloc(size, GFP_KERNEL);
-       if (hwmgr->request_ps == NULL) {
-               kfree(hwmgr->ps);
-               hwmgr->ps = NULL;
-               return -ENOMEM;
-       }
-
-       hwmgr->current_ps = kzalloc(size, GFP_KERNEL);
-       if (hwmgr->current_ps == NULL) {
-               kfree(hwmgr->request_ps);
-               kfree(hwmgr->ps);
-               hwmgr->request_ps = NULL;
-               hwmgr->ps = NULL;
-               return -ENOMEM;
-       }
-
-       state = hwmgr->ps;
-
-       for (i = 0; i < table_entries; i++) {
-               result = hwmgr->hwmgr_func->get_pp_table_entry(hwmgr, i, state);
-
-               if (state->classification.flags & PP_StateClassificationFlag_Boot) {
-                       hwmgr->boot_ps = state;
-                       memcpy(hwmgr->current_ps, state, size);
-                       memcpy(hwmgr->request_ps, state, size);
-               }
-
-               state->id = i + 1; /* assigned unique num for every power state id */
-
-               if (state->classification.flags & PP_StateClassificationFlag_Uvd)
-                       hwmgr->uvd_ps = state;
-               state = (struct pp_power_state *)((unsigned long)state + size);
-       }
-
-       return 0;
+       if (hwmgr->chip_id != CHIP_VEGA12)
+               return psm_legacy_init_power_state_table(hwmgr);
+       else
+               return psm_new_init_power_state_table(hwmgr);
 }
 
 int psm_fini_power_state_table(struct pp_hwmgr *hwmgr)
 {
-       if (hwmgr == NULL)
-               return -EINVAL;
-
-       kfree(hwmgr->current_ps);
-       kfree(hwmgr->request_ps);
-       kfree(hwmgr->ps);
-       hwmgr->request_ps = NULL;
-       hwmgr->ps = NULL;
-       hwmgr->current_ps = NULL;
-       return 0;
-}
-
-static int psm_get_ui_state(struct pp_hwmgr *hwmgr,
-                               enum PP_StateUILabel ui_label,
-                               unsigned long *state_id)
-{
-       struct pp_power_state *state;
-       int table_entries;
-       int i;
-
-       table_entries = hwmgr->num_ps;
-       state = hwmgr->ps;
-
-       for (i = 0; i < table_entries; i++) {
-               if (state->classification.ui_label & ui_label) {
-                       *state_id = state->id;
-                       return 0;
-               }
-               state = (struct pp_power_state *)((unsigned long)state + hwmgr->ps_size);
-       }
-       return -EINVAL;
-}
-
-static int psm_get_state_by_classification(struct pp_hwmgr *hwmgr,
-                                       enum PP_StateClassificationFlag flag,
-                                       unsigned long *state_id)
-{
-       struct pp_power_state *state;
-       int table_entries;
-       int i;
-
-       table_entries = hwmgr->num_ps;
-       state = hwmgr->ps;
-
-       for (i = 0; i < table_entries; i++) {
-               if (state->classification.flags & flag) {
-                       *state_id = state->id;
-                       return 0;
-               }
-               state = (struct pp_power_state *)((unsigned long)state + hwmgr->ps_size);
-       }
-       return -EINVAL;
-}
-
-static int psm_set_states(struct pp_hwmgr *hwmgr, unsigned long state_id)
-{
-       struct pp_power_state *state;
-       int table_entries;
-       int i;
-
-       table_entries = hwmgr->num_ps;
-
-       state = hwmgr->ps;
-
-       for (i = 0; i < table_entries; i++) {
-               if (state->id == state_id) {
-                       memcpy(hwmgr->request_ps, state, hwmgr->ps_size);
-                       return 0;
-               }
-               state = (struct pp_power_state *)((unsigned long)state + hwmgr->ps_size);
-       }
-       return -EINVAL;
+       if (hwmgr->chip_id != CHIP_VEGA12)
+               return psm_legacy_fini_power_state_table(hwmgr);
+       else
+               return psm_new_fini_power_state_table(hwmgr);
 }
 
 int psm_set_boot_states(struct pp_hwmgr *hwmgr)
 {
-       unsigned long state_id;
-       int ret = -EINVAL;
-
-       if (!psm_get_state_by_classification(hwmgr, PP_StateClassificationFlag_Boot,
-                                       &state_id))
-               ret = psm_set_states(hwmgr, state_id);
-
-       return ret;
+       if (hwmgr->chip_id != CHIP_VEGA12)
+               return psm_legacy_set_boot_states(hwmgr);
+       else
+               return psm_new_set_boot_states(hwmgr);
 }
 
 int psm_set_performance_states(struct pp_hwmgr *hwmgr)
 {
-       unsigned long state_id;
-       int ret = -EINVAL;
-
-       if (!psm_get_ui_state(hwmgr, PP_StateUILabel_Performance,
-                                       &state_id))
-               ret = psm_set_states(hwmgr, state_id);
-
-       return ret;
+       if (hwmgr->chip_id != CHIP_VEGA12)
+               return psm_legacy_set_performance_states(hwmgr);
+       else
+               return psm_new_set_performance_states(hwmgr);
 }
 
 int psm_set_user_performance_state(struct pp_hwmgr *hwmgr,
                                        enum PP_StateUILabel label_id,
                                        struct pp_power_state **state)
 {
-       int table_entries;
-       int i;
-
-       table_entries = hwmgr->num_ps;
-       *state = hwmgr->ps;
-
-restart_search:
-       for (i = 0; i < table_entries; i++) {
-               if ((*state)->classification.ui_label & label_id)
-                       return 0;
-               *state = (struct pp_power_state *)((uintptr_t)*state + hwmgr->ps_size);
-       }
-
-       switch (label_id) {
-       case PP_StateUILabel_Battery:
-       case PP_StateUILabel_Balanced:
-               label_id = PP_StateUILabel_Performance;
-               goto restart_search;
-       default:
-               break;
-       }
-       return -EINVAL;
+       if (hwmgr->chip_id != CHIP_VEGA12)
+               return psm_legacy_set_user_performance_state(hwmgr,
+                               label_id,
+                               state);
+       else
+               return psm_new_set_user_performance_state(hwmgr,
+                               label_id,
+                               state);
 }
 
 int psm_adjust_power_state_dynamic(struct pp_hwmgr *hwmgr, bool skip,
                                                struct pp_power_state *new_ps)
 {
-       struct pp_power_state *pcurrent;
-       struct pp_power_state *requested;
-       bool equal;
-       uint32_t index;
-       long workload;
-
-       if (skip)
-               return 0;
-
-       phm_display_configuration_changed(hwmgr);
-
-       if (new_ps != NULL)
-               requested = new_ps;
+       if (hwmgr->chip_id != CHIP_VEGA12)
+               return psm_legacy_adjust_power_state_dynamic(hwmgr,
+                               skip,
+                               new_ps);
        else
-               requested = hwmgr->request_ps;
-
-       pcurrent = hwmgr->current_ps;
-
-       phm_apply_state_adjust_rules(hwmgr, requested, pcurrent);
-       if (pcurrent == NULL || (0 != phm_check_states_equal(hwmgr,
-                       &pcurrent->hardware, &requested->hardware, &equal)))
-               equal = false;
-
-       if (!equal || phm_check_smc_update_required_for_display_configuration(hwmgr)) {
-               phm_set_power_state(hwmgr, &pcurrent->hardware, &requested->hardware);
-               memcpy(hwmgr->current_ps, hwmgr->request_ps, hwmgr->ps_size);
-       }
-
-       phm_notify_smc_display_config_after_ps_adjustment(hwmgr);
-       if (!phm_force_dpm_levels(hwmgr, hwmgr->request_dpm_level))
-               hwmgr->dpm_level = hwmgr->request_dpm_level;
-
-       if (hwmgr->dpm_level != AMD_DPM_FORCED_LEVEL_MANUAL) {
-               index = fls(hwmgr->workload_mask);
-               index = index > 0 && index <= Workload_Policy_Max ? index - 1 : 0;
-               workload = hwmgr->workload_setting[index];
-
-               if (hwmgr->power_profile_mode != workload && hwmgr->hwmgr_func->set_power_profile_mode)
-                       hwmgr->hwmgr_func->set_power_profile_mode(hwmgr, &workload, 0);
-       }
-
-       return 0;
+               return psm_new_adjust_power_state_dynamic(hwmgr,
+                               skip,
+                               new_ps);
 }
-
diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/pp_psm_legacy.c b/drivers/gpu/drm/amd/powerplay/hwmgr/pp_psm_legacy.c
new file mode 100644 (file)
index 0000000..e3ac528
--- /dev/null
@@ -0,0 +1,262 @@
+/*
+ * Copyright 2017 Advanced Micro Devices, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ */
+
+#include <linux/types.h>
+#include <linux/kernel.h>
+#include <linux/slab.h>
+#include "pp_psm_legacy.h"
+
+int psm_legacy_init_power_state_table(struct pp_hwmgr *hwmgr)
+{
+       int result;
+       unsigned int i;
+       unsigned int table_entries;
+       struct pp_power_state *state;
+       int size;
+
+       if (hwmgr->hwmgr_func->get_num_of_pp_table_entries == NULL)
+               return -EINVAL;
+
+       if (hwmgr->hwmgr_func->get_power_state_size == NULL)
+               return -EINVAL;
+
+       hwmgr->num_ps = table_entries = hwmgr->hwmgr_func->get_num_of_pp_table_entries(hwmgr);
+
+       hwmgr->ps_size = size = hwmgr->hwmgr_func->get_power_state_size(hwmgr) +
+                                         sizeof(struct pp_power_state);
+
+       hwmgr->ps = kzalloc(size * table_entries, GFP_KERNEL);
+       if (hwmgr->ps == NULL)
+               return -ENOMEM;
+
+       hwmgr->request_ps = kzalloc(size, GFP_KERNEL);
+       if (hwmgr->request_ps == NULL) {
+               kfree(hwmgr->ps);
+               hwmgr->ps = NULL;
+               return -ENOMEM;
+       }
+
+       hwmgr->current_ps = kzalloc(size, GFP_KERNEL);
+       if (hwmgr->current_ps == NULL) {
+               kfree(hwmgr->request_ps);
+               kfree(hwmgr->ps);
+               hwmgr->request_ps = NULL;
+               hwmgr->ps = NULL;
+               return -ENOMEM;
+       }
+
+       state = hwmgr->ps;
+
+       for (i = 0; i < table_entries; i++) {
+               result = hwmgr->hwmgr_func->get_pp_table_entry(hwmgr, i, state);
+
+               if (state->classification.flags & PP_StateClassificationFlag_Boot) {
+                       hwmgr->boot_ps = state;
+                       memcpy(hwmgr->current_ps, state, size);
+                       memcpy(hwmgr->request_ps, state, size);
+               }
+
+               state->id = i + 1; /* assigned unique num for every power state id */
+
+               if (state->classification.flags & PP_StateClassificationFlag_Uvd)
+                       hwmgr->uvd_ps = state;
+               state = (struct pp_power_state *)((unsigned long)state + size);
+       }
+
+       return 0;
+}
+
+int psm_legacy_fini_power_state_table(struct pp_hwmgr *hwmgr)
+{
+       if (hwmgr == NULL)
+               return -EINVAL;
+
+       kfree(hwmgr->current_ps);
+       kfree(hwmgr->request_ps);
+       kfree(hwmgr->ps);
+       hwmgr->request_ps = NULL;
+       hwmgr->ps = NULL;
+       hwmgr->current_ps = NULL;
+       return 0;
+}
+
+static int get_ui_state(struct pp_hwmgr *hwmgr,
+                               enum PP_StateUILabel ui_label,
+                               unsigned long *state_id)
+{
+       struct pp_power_state *state;
+       int table_entries;
+       int i;
+
+       table_entries = hwmgr->num_ps;
+       state = hwmgr->ps;
+
+       for (i = 0; i < table_entries; i++) {
+               if (state->classification.ui_label & ui_label) {
+                       *state_id = state->id;
+                       return 0;
+               }
+               state = (struct pp_power_state *)((unsigned long)state + hwmgr->ps_size);
+       }
+       return -EINVAL;
+}
+
+static int get_state_by_classification(struct pp_hwmgr *hwmgr,
+                                       enum PP_StateClassificationFlag flag,
+                                       unsigned long *state_id)
+{
+       struct pp_power_state *state;
+       int table_entries;
+       int i;
+
+       table_entries = hwmgr->num_ps;
+       state = hwmgr->ps;
+
+       for (i = 0; i < table_entries; i++) {
+               if (state->classification.flags & flag) {
+                       *state_id = state->id;
+                       return 0;
+               }
+               state = (struct pp_power_state *)((unsigned long)state + hwmgr->ps_size);
+       }
+       return -EINVAL;
+}
+
+static int set_states(struct pp_hwmgr *hwmgr, unsigned long state_id)
+{
+       struct pp_power_state *state;
+       int table_entries;
+       int i;
+
+       table_entries = hwmgr->num_ps;
+
+       state = hwmgr->ps;
+
+       for (i = 0; i < table_entries; i++) {
+               if (state->id == state_id) {
+                       memcpy(hwmgr->request_ps, state, hwmgr->ps_size);
+                       return 0;
+               }
+               state = (struct pp_power_state *)((unsigned long)state + hwmgr->ps_size);
+       }
+       return -EINVAL;
+}
+
+int psm_legacy_set_boot_states(struct pp_hwmgr *hwmgr)
+{
+       unsigned long state_id;
+       int ret = -EINVAL;
+
+       if (!get_state_by_classification(hwmgr, PP_StateClassificationFlag_Boot,
+                                       &state_id))
+               ret = set_states(hwmgr, state_id);
+
+       return ret;
+}
+
+int psm_legacy_set_performance_states(struct pp_hwmgr *hwmgr)
+{
+       unsigned long state_id;
+       int ret = -EINVAL;
+
+       if (!get_ui_state(hwmgr, PP_StateUILabel_Performance,
+                                       &state_id))
+               ret = set_states(hwmgr, state_id);
+
+       return ret;
+}
+
+int psm_legacy_set_user_performance_state(struct pp_hwmgr *hwmgr,
+                                       enum PP_StateUILabel label_id,
+                                       struct pp_power_state **state)
+{
+       int table_entries;
+       int i;
+
+       table_entries = hwmgr->num_ps;
+       *state = hwmgr->ps;
+
+restart_search:
+       for (i = 0; i < table_entries; i++) {
+               if ((*state)->classification.ui_label & label_id)
+                       return 0;
+               *state = (struct pp_power_state *)((uintptr_t)*state + hwmgr->ps_size);
+       }
+
+       switch (label_id) {
+       case PP_StateUILabel_Battery:
+       case PP_StateUILabel_Balanced:
+               label_id = PP_StateUILabel_Performance;
+               goto restart_search;
+       default:
+               break;
+       }
+       return -EINVAL;
+}
+
+int psm_legacy_adjust_power_state_dynamic(struct pp_hwmgr *hwmgr, bool skip,
+                                               struct pp_power_state *new_ps)
+{
+       struct pp_power_state *pcurrent;
+       struct pp_power_state *requested;
+       bool equal;
+       uint32_t index;
+       long workload;
+
+       if (skip)
+               return 0;
+
+       phm_display_configuration_changed(hwmgr);
+
+       if (new_ps != NULL)
+               requested = new_ps;
+       else
+               requested = hwmgr->request_ps;
+
+       pcurrent = hwmgr->current_ps;
+
+       phm_apply_state_adjust_rules(hwmgr, requested, pcurrent);
+       if (pcurrent == NULL || (0 != phm_check_states_equal(hwmgr,
+                       &pcurrent->hardware, &requested->hardware, &equal)))
+               equal = false;
+
+       if (!equal || phm_check_smc_update_required_for_display_configuration(hwmgr)) {
+               phm_set_power_state(hwmgr, &pcurrent->hardware, &requested->hardware);
+               memcpy(hwmgr->current_ps, hwmgr->request_ps, hwmgr->ps_size);
+       }
+
+       phm_notify_smc_display_config_after_ps_adjustment(hwmgr);
+       if (!phm_force_dpm_levels(hwmgr, hwmgr->request_dpm_level))
+               hwmgr->dpm_level = hwmgr->request_dpm_level;
+
+       if (hwmgr->dpm_level != AMD_DPM_FORCED_LEVEL_MANUAL) {
+               index = fls(hwmgr->workload_mask);
+               index = index > 0 && index <= Workload_Policy_Max ? index - 1 : 0;
+               workload = hwmgr->workload_setting[index];
+
+               if (hwmgr->power_profile_mode != workload && hwmgr->hwmgr_func->set_power_profile_mode)
+                       hwmgr->hwmgr_func->set_power_profile_mode(hwmgr, &workload, 0);
+       }
+
+       return 0;
+}
diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/pp_psm_legacy.h b/drivers/gpu/drm/amd/powerplay/hwmgr/pp_psm_legacy.h
new file mode 100644 (file)
index 0000000..bc99411
--- /dev/null
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2017 Advanced Micro Devices, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ */
+
+#ifndef PP_PSM_LEGACY_H
+#define PP_PSM_LEGACY_H
+
+#include "hwmgr.h"
+
+int psm_legacy_init_power_state_table(struct pp_hwmgr *hwmgr);
+int psm_legacy_fini_power_state_table(struct pp_hwmgr *hwmgr);
+int psm_legacy_set_boot_states(struct pp_hwmgr *hwmgr);
+int psm_legacy_set_performance_states(struct pp_hwmgr *hwmgr);
+int psm_legacy_set_user_performance_state(struct pp_hwmgr *hwmgr,
+                                       enum PP_StateUILabel label_id,
+                                       struct pp_power_state **state);
+int psm_legacy_adjust_power_state_dynamic(struct pp_hwmgr *hwmgr,
+                               bool skip,
+                               struct pp_power_state *new_ps);
+
+#endif
diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/pp_psm_new.c b/drivers/gpu/drm/amd/powerplay/hwmgr/pp_psm_new.c
new file mode 100644 (file)
index 0000000..9eba8a1
--- /dev/null
@@ -0,0 +1,76 @@
+/*
+ * Copyright 2017 Advanced Micro Devices, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ */
+
+#include <linux/types.h>
+#include <linux/kernel.h>
+#include <linux/slab.h>
+#include "pp_psm_new.h"
+
+int psm_new_init_power_state_table(struct pp_hwmgr *hwmgr)
+{
+       hwmgr->ps_size = 0;
+       hwmgr->num_ps = 0;
+       hwmgr->ps = NULL;
+       hwmgr->request_ps = NULL;
+       hwmgr->current_ps = NULL;
+       hwmgr->boot_ps = NULL;
+       hwmgr->uvd_ps = NULL;
+
+       return 0;
+}
+
+int psm_new_fini_power_state_table(struct pp_hwmgr *hwmgr)
+{
+       return 0;
+}
+
+int psm_new_set_boot_states(struct pp_hwmgr *hwmgr)
+{
+       return 0;
+}
+
+int psm_new_set_performance_states(struct pp_hwmgr *hwmgr)
+{
+       return 0;
+}
+
+int psm_new_set_user_performance_state(struct pp_hwmgr *hwmgr,
+                                       enum PP_StateUILabel label_id,
+                                       struct pp_power_state **state)
+{
+       return 0;
+}
+
+int psm_new_adjust_power_state_dynamic(struct pp_hwmgr *hwmgr,
+                                       bool skip,
+                                       struct pp_power_state *new_ps)
+{
+       if (skip)
+               return 0;
+
+       phm_display_configuration_changed(hwmgr);
+
+       phm_notify_smc_display_config_after_ps_adjustment(hwmgr);
+
+       return 0;
+}
diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/pp_psm_new.h b/drivers/gpu/drm/amd/powerplay/hwmgr/pp_psm_new.h
new file mode 100644 (file)
index 0000000..5c4fabc
--- /dev/null
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2017 Advanced Micro Devices, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ */
+
+#ifndef PP_PSM_NEW_H
+#define PP_PSM_NEW_H
+
+#include "hwmgr.h"
+
+int psm_new_init_power_state_table(struct pp_hwmgr *hwmgr);
+int psm_new_fini_power_state_table(struct pp_hwmgr *hwmgr);
+int psm_new_set_boot_states(struct pp_hwmgr *hwmgr);
+int psm_new_set_performance_states(struct pp_hwmgr *hwmgr);
+int psm_new_set_user_performance_state(struct pp_hwmgr *hwmgr,
+                                       enum PP_StateUILabel label_id,
+                                       struct pp_power_state **state);
+int psm_new_adjust_power_state_dynamic(struct pp_hwmgr *hwmgr,
+                               bool skip,
+                               struct pp_power_state *new_ps);
+
+#endif