[PATCH] drm/amd/pp: Add new asic(vega12) support in pp_psm.c

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Acked-by: Alex Deucher <alexander.deucher at amd.com>

________________________________
From: amd-gfx <amd-gfx-bounces@xxxxxxxxxxxxxxxxxxxxx> on behalf of Rex Zhu <Rex.Zhu at amd.com>
Sent: Wednesday, March 21, 2018 7:34:34 AM
To: amd-gfx at lists.freedesktop.org
Cc: Zhu, Rex
Subject: [PATCH] drm/amd/pp: Add new asic(vega12) support in pp_psm.c

In new asics, no power state management in driver,
no need to implement related callback functions.
add some ps checks in pp_psm.c

Revert "drm/amd/powerplay: add new pp_psm infrastructure for vega12 (v2)"
This reverts commit 7d1a63f3aa331b853e41f92d0e7890ed31de8c13.

Change-Id: Ic31d3f475f94399d3136bff8be454f290e3c1e50
Signed-off-by: Rex Zhu <Rex.Zhu at amd.com>
---
 drivers/gpu/drm/amd/powerplay/hwmgr/Makefile       |   4 +-
 drivers/gpu/drm/amd/powerplay/hwmgr/pp_psm.c       | 270 ++++++++++++++++++---
 .../gpu/drm/amd/powerplay/hwmgr/pp_psm_legacy.c    | 262 --------------------
 .../gpu/drm/amd/powerplay/hwmgr/pp_psm_legacy.h    |  40 ---
 drivers/gpu/drm/amd/powerplay/hwmgr/pp_psm_new.c   |  76 ------
 drivers/gpu/drm/amd/powerplay/hwmgr/pp_psm_new.h   |  40 ---
 6 files changed, 239 insertions(+), 453 deletions(-)
 delete mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/pp_psm_legacy.c
 delete mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/pp_psm_legacy.h
 delete mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/pp_psm_new.c
 delete mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/pp_psm_new.h

diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/Makefile b/drivers/gpu/drm/amd/powerplay/hwmgr/Makefile
index 9446dbc475..faf9c88 100644
--- a/drivers/gpu/drm/amd/powerplay/hwmgr/Makefile
+++ b/drivers/gpu/drm/amd/powerplay/hwmgr/Makefile
@@ -31,9 +31,9 @@ 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_psm_legacy.o pp_psm_new.o \
                 vega12_processpptables.o vega12_hwmgr.o \
-               vega12_powertune.o vega12_thermal.o
+               vega12_powertune.o vega12_thermal.o \
+               pp_overdriver.o smu_helper.o

 AMD_PP_HWMGR = $(addprefix $(AMD_PP_PATH)/hwmgr/,$(HARDWARE_MGR))

diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/pp_psm.c b/drivers/gpu/drm/amd/powerplay/hwmgr/pp_psm.c
index 295ab9f..0f2851b 100644
--- a/drivers/gpu/drm/amd/powerplay/hwmgr/pp_psm.c
+++ b/drivers/gpu/drm/amd/powerplay/hwmgr/pp_psm.c
@@ -21,65 +21,269 @@
  *
  */

+#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)
 {
-       if (hwmgr->chip_id != CHIP_VEGA12)
-               return psm_legacy_init_power_state_table(hwmgr);
-       else
-               return psm_new_init_power_state_table(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 0;
+
+       if (hwmgr->hwmgr_func->get_power_state_size == NULL)
+               return 0;
+
+       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);
+
+       if (table_entries == 0 || size == 0) {
+               pr_warn("Please check whether power state management is suppported on this asic\n");
+               return 0;
+       }
+
+       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_fini_power_state_table(struct pp_hwmgr *hwmgr)
 {
-       if (hwmgr->chip_id != CHIP_VEGA12)
-               return psm_legacy_fini_power_state_table(hwmgr);
-       else
-               return psm_new_fini_power_state_table(hwmgr);
+       if (hwmgr == NULL)
+               return -EINVAL;
+
+       if (!hwmgr->ps)
+               return 0;
+
+       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;
 }

 int psm_set_boot_states(struct pp_hwmgr *hwmgr)
 {
-       if (hwmgr->chip_id != CHIP_VEGA12)
-               return psm_legacy_set_boot_states(hwmgr);
-       else
-               return psm_new_set_boot_states(hwmgr);
+       unsigned long state_id;
+       int ret = -EINVAL;
+
+       if (!hwmgr->ps)
+               return 0;
+
+       if (!psm_get_state_by_classification(hwmgr, PP_StateClassificationFlag_Boot,
+                                       &state_id))
+               ret = psm_set_states(hwmgr, state_id);
+
+       return ret;
 }

 int psm_set_performance_states(struct pp_hwmgr *hwmgr)
 {
-       if (hwmgr->chip_id != CHIP_VEGA12)
-               return psm_legacy_set_performance_states(hwmgr);
-       else
-               return psm_new_set_performance_states(hwmgr);
+       unsigned long state_id;
+       int ret = -EINVAL;
+
+       if (!hwmgr->ps)
+               return 0;
+
+       if (!psm_get_ui_state(hwmgr, PP_StateUILabel_Performance,
+                                       &state_id))
+               ret = psm_set_states(hwmgr, state_id);
+
+       return ret;
 }

 int psm_set_user_performance_state(struct pp_hwmgr *hwmgr,
                                         enum PP_StateUILabel label_id,
                                         struct pp_power_state **state)
 {
-       if (hwmgr->chip_id != CHIP_VEGA12)
-               return psm_legacy_set_user_performance_state(hwmgr,
-                               label_id,
-                               state);
+       int table_entries;
+       int i;
+
+       if (!hwmgr->ps)
+               return 0;
+
+       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;
+}
+
+static void power_state_management(struct pp_hwmgr *hwmgr,
+                                               struct pp_power_state *new_ps)
+{
+       struct pp_power_state *pcurrent;
+       struct pp_power_state *requested;
+       bool equal;
+
+       if (new_ps != NULL)
+               requested = new_ps;
         else
-               return psm_new_set_user_performance_state(hwmgr,
-                               label_id,
-                               state);
+               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);
+       }
 }

 int psm_adjust_power_state_dynamic(struct pp_hwmgr *hwmgr, bool skip,
                                                 struct pp_power_state *new_ps)
 {
-       if (hwmgr->chip_id != CHIP_VEGA12)
-               return psm_legacy_adjust_power_state_dynamic(hwmgr,
-                               skip,
-                               new_ps);
-       else
-               return psm_new_adjust_power_state_dynamic(hwmgr,
-                               skip,
-                               new_ps);
+       uint32_t index;
+       long workload;
+
+       if (skip)
+               return 0;
+
+       phm_display_configuration_changed(hwmgr);
+
+       if (hwmgr->ps)
+               power_state_management(hwmgr, new_ps);
+
+       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.c b/drivers/gpu/drm/amd/powerplay/hwmgr/pp_psm_legacy.c
deleted file mode 100644
index e3ac52820..0000000
--- a/drivers/gpu/drm/amd/powerplay/hwmgr/pp_psm_legacy.c
+++ /dev/null
@@ -1,262 +0,0 @@
-/*
- * 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
deleted file mode 100644
index bc99411..0000000
--- a/drivers/gpu/drm/amd/powerplay/hwmgr/pp_psm_legacy.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * 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
deleted file mode 100644
index 9eba8a1..0000000
--- a/drivers/gpu/drm/amd/powerplay/hwmgr/pp_psm_new.c
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * 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
deleted file mode 100644
index 5c4fabc..0000000
--- a/drivers/gpu/drm/amd/powerplay/hwmgr/pp_psm_new.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * 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
--
1.9.1

_______________________________________________
amd-gfx mailing list
amd-gfx at lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.freedesktop.org/archives/amd-gfx/attachments/20180321/5255e1ae/attachment-0001.html>


[Index of Archives]     [Linux USB Devel]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]

  Powered by Linux