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 58bc387..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"
@@ -2072,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;
@@ -2118,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;
 
@@ -2472,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,
 };