the pptable_func callback sets should be has unify interface,
so use "smu" as the pptable_func interface first parameter.
fix interfaces:
1. i2c_eeprom_init
2. i2c_eeprom_fini
Signed-off-by: Kevin Wang <kevin1.w...@amd.com>
---
drivers/gpu/drm/amd/powerplay/arcturus_ppt.c | 4 ++--
drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h | 4 ++--
drivers/gpu/drm/amd/powerplay/smu_internal.h | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/gpu/drm/amd/powerplay/arcturus_ppt.c
b/drivers/gpu/drm/amd/powerplay/arcturus_ppt.c
index 16a107cd8b2d..b27d0b18eafa 100644
--- a/drivers/gpu/drm/amd/powerplay/arcturus_ppt.c
+++ b/drivers/gpu/drm/amd/powerplay/arcturus_ppt.c
@@ -2338,7 +2338,7 @@ static bool arcturus_i2c_adapter_is_added(struct
i2c_adapter *control)
return control->dev.parent == &adev->pdev->dev;
}
-static int arcturus_i2c_eeprom_control_init(struct i2c_adapter *control)
+static int arcturus_i2c_eeprom_control_init(struct smu_context *smu, struct
i2c_adapter *control)
{
struct amdgpu_device *adev = to_amdgpu_device(control);
int res;
@@ -2360,7 +2360,7 @@ static int arcturus_i2c_eeprom_control_init(struct
i2c_adapter *control)
return res;
}
-static void arcturus_i2c_eeprom_control_fini(struct i2c_adapter *control)
+static void arcturus_i2c_eeprom_control_fini(struct smu_context *smu, struct
i2c_adapter *control)
{
if (!arcturus_i2c_adapter_is_added(control))
return;
diff --git a/drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h
b/drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h
index 01afc8f07879..7b349e038972 100644
--- a/drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h
+++ b/drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h
@@ -491,8 +491,8 @@ struct pptable_funcs {
int (*set_df_cstate)(struct smu_context *smu, enum pp_df_cstate state);
int (*allow_xgmi_power_down)(struct smu_context *smu, bool en);
int (*update_pcie_parameters)(struct smu_context *smu, uint32_t
pcie_gen_cap, uint32_t pcie_width_cap);
- int (*i2c_eeprom_init)(struct i2c_adapter *control);
- void (*i2c_eeprom_fini)(struct i2c_adapter *control);
+ int (*i2c_eeprom_init)(struct smu_context *smu, struct i2c_adapter
*control);
+ void (*i2c_eeprom_fini)(struct smu_context *smu, struct i2c_adapter
*control);
void (*get_unique_id)(struct smu_context *smu);
int (*get_dpm_clock_table)(struct smu_context *smu, struct dpm_clocks
*clock_table);
int (*init_microcode)(struct smu_context *smu);
diff --git a/drivers/gpu/drm/amd/powerplay/smu_internal.h
b/drivers/gpu/drm/amd/powerplay/smu_internal.h
index 149f5e50e619..880ef54884f8 100644
--- a/drivers/gpu/drm/amd/powerplay/smu_internal.h
+++ b/drivers/gpu/drm/amd/powerplay/smu_internal.h
@@ -200,9 +200,9 @@ static inline int smu_send_smc_msg(struct smu_context *smu,
enum smu_message_typ
((smu)->ppt_funcs->set_power_source ?
(smu)->ppt_funcs->set_power_source((smu), (power_src)) : 0)
#define smu_i2c_eeprom_init(smu, control) \
- ((smu)->ppt_funcs->i2c_eeprom_init ?
(smu)->ppt_funcs->i2c_eeprom_init((control)) : 0)
+ ((smu)->ppt_funcs->i2c_eeprom_init ?
(smu)->ppt_funcs->i2c_eeprom_init((smu), (control)) : 0)
#define smu_i2c_eeprom_fini(smu, control) \
- ((smu)->ppt_funcs->i2c_eeprom_fini ?
(smu)->ppt_funcs->i2c_eeprom_fini((control)) : 0)
+ ((smu)->ppt_funcs->i2c_eeprom_fini ?
(smu)->ppt_funcs->i2c_eeprom_fini((smu), (control)) : 0)
#define smu_get_unique_id(smu) \
((smu)->ppt_funcs->get_unique_id ?
(smu)->ppt_funcs->get_unique_id((smu)) : 0)
--
2.17.1
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
