drm/amd/pm: relocate the power related headers

[linux-2.6-microblaze.git] / drivers / gpu / drm / amd / pm / swsmu / smu11 / arcturus_ppt.c

diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c
index fd1d30a..d3963bf 100644 (file)
--- a/drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c
@@ -33,7 +33,6 @@
 #include "smu11_driver_if_arcturus.h"
 #include "soc15_common.h"
 #include "atom.h"
-#include "power_state.h"
 #include "arcturus_ppt.h"
 #include "smu_v11_0_pptable.h"
 #include "arcturus_ppsmc.h"
@@ -295,16 +294,6 @@ static int arcturus_allocate_dpm_context(struct smu_context *smu)
                return -ENOMEM;
        smu_dpm->dpm_context_size = sizeof(struct smu_11_0_dpm_context);
 
-       smu_dpm->dpm_current_power_state = kzalloc(sizeof(struct smu_power_state),
-                                      GFP_KERNEL);
-       if (!smu_dpm->dpm_current_power_state)
-               return -ENOMEM;
-
-       smu_dpm->dpm_request_power_state = kzalloc(sizeof(struct smu_power_state),
-                                      GFP_KERNEL);
-       if (!smu_dpm->dpm_request_power_state)
-               return -ENOMEM;
-
        return 0;
 }
 
@@ -1389,14 +1378,6 @@ static int arcturus_get_power_profile_mode(struct smu_context *smu,
                                           char *buf)
 {
        DpmActivityMonitorCoeffInt_t activity_monitor;
-       static const char *profile_name[] = {
-                                       "BOOTUP_DEFAULT",
-                                       "3D_FULL_SCREEN",
-                                       "POWER_SAVING",
-                                       "VIDEO",
-                                       "VR",
-                                       "COMPUTE",
-                                       "CUSTOM"};
        static const char *title[] = {
                        "PROFILE_INDEX(NAME)",
                        "CLOCK_TYPE(NAME)",
@@ -1453,7 +1434,7 @@ static int arcturus_get_power_profile_mode(struct smu_context *smu,
                }
 
                size += sysfs_emit_at(buf, size, "%2d %14s%s\n",
-                       i, profile_name[i], (i == smu->power_profile_mode) ? "*" : " ");
+                       i, amdgpu_pp_profile_name[i], (i == smu->power_profile_mode) ? "*" : " ");
 
                if (smu_version >= 0x360d00) {
                        size += sysfs_emit_at(buf, size, "%19s %d(%13s) %7d %7d %7d %7d %7d %7d %7d %7d %7d\n",
@@ -2090,7 +2071,8 @@ static int arcturus_i2c_xfer(struct i2c_adapter *i2c_adap,
                             struct i2c_msg *msg, int num_msgs)
 {
        struct amdgpu_device *adev = to_amdgpu_device(i2c_adap);
-       struct smu_table_context *smu_table = &adev->smu.smu_table;
+       struct smu_context *smu = adev->powerplay.pp_handle;
+       struct smu_table_context *smu_table = &smu->smu_table;
        struct smu_table *table = &smu_table->driver_table;
        SwI2cRequest_t *req, *res = (SwI2cRequest_t *)table->cpu_addr;
        int i, j, r, c;
@@ -2136,9 +2118,9 @@ static int arcturus_i2c_xfer(struct i2c_adapter *i2c_adap,
                        }
                }
        }
-       mutex_lock(&adev->smu.mutex);
-       r = smu_cmn_update_table(&adev->smu, SMU_TABLE_I2C_COMMANDS, 0, req, true);
-       mutex_unlock(&adev->smu.mutex);
+       mutex_lock(&smu->mutex);
+       r = smu_cmn_update_table(smu, SMU_TABLE_I2C_COMMANDS, 0, req, true);
+       mutex_unlock(&smu->mutex);
        if (r)
                goto fail;
 
@@ -2490,7 +2472,7 @@ static const struct pptable_funcs arcturus_ppt_funcs = {
        .deep_sleep_control = smu_v11_0_deep_sleep_control,
        .get_fan_parameters = arcturus_get_fan_parameters,
        .interrupt_work = smu_v11_0_interrupt_work,
-       .set_light_sbr = smu_v11_0_set_light_sbr,
+       .smu_handle_passthrough_sbr = smu_v11_0_handle_passthrough_sbr,
        .set_mp1_state = smu_cmn_set_mp1_state,
 };