diff options
Diffstat (limited to 'meta-v1000/recipes-kernel/linux/linux-yocto-4.14.71/1049-drm-amdgpu-rename-amdgpu_dpm_funcs-to-amd_pm_funcs.patch')
-rw-r--r-- | meta-v1000/recipes-kernel/linux/linux-yocto-4.14.71/1049-drm-amdgpu-rename-amdgpu_dpm_funcs-to-amd_pm_funcs.patch | 991 |
1 files changed, 0 insertions, 991 deletions
diff --git a/meta-v1000/recipes-kernel/linux/linux-yocto-4.14.71/1049-drm-amdgpu-rename-amdgpu_dpm_funcs-to-amd_pm_funcs.patch b/meta-v1000/recipes-kernel/linux/linux-yocto-4.14.71/1049-drm-amdgpu-rename-amdgpu_dpm_funcs-to-amd_pm_funcs.patch deleted file mode 100644 index 1132029f..00000000 --- a/meta-v1000/recipes-kernel/linux/linux-yocto-4.14.71/1049-drm-amdgpu-rename-amdgpu_dpm_funcs-to-amd_pm_funcs.patch +++ /dev/null @@ -1,991 +0,0 @@ -From 059e6e9ee0b6b930ee90a57d4682a7fb7e99847c Mon Sep 17 00:00:00 2001 -From: Rex Zhu <Rex.Zhu@amd.com> -Date: Wed, 6 Sep 2017 15:27:59 +0800 -Subject: [PATCH 1049/4131] drm/amdgpu: rename amdgpu_dpm_funcs to amd_pm_funcs - -renamed amdgpu_dpm_funcs and moved to amd_shared.h -so can shared with powerplay. - -Change-Id: Ia22d8c43aab274e9f2ba85ab39de9b6f3f7c8864 -Reviewed-by: Alex Deucher <alexander.deucher@amd.com> -Signed-off-by: Rex Zhu <Rex.Zhu@amd.com> ---- - drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.c | 4 +- - drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.h | 47 +--------- - drivers/gpu/drm/amd/amdgpu/ci_dpm.c | 100 ++++++++++++++-------- - drivers/gpu/drm/amd/amdgpu/kv_dpm.c | 53 ++++++++---- - drivers/gpu/drm/amd/amdgpu/si_dpm.c | 69 +++++++++------ - drivers/gpu/drm/amd/include/amd_shared.h | 51 +++++++++++ - drivers/gpu/drm/amd/powerplay/inc/amd_powerplay.h | 6 -- - 7 files changed, 201 insertions(+), 129 deletions(-) - -diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.c -index 1cb52fd..e997ebbe43 100644 ---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.c -+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.c -@@ -960,8 +960,10 @@ u8 amdgpu_encode_pci_lane_width(u32 lanes) - } - - struct amd_vce_state* --amdgpu_get_vce_clock_state(struct amdgpu_device *adev, unsigned idx) -+amdgpu_get_vce_clock_state(void *handle, u32 idx) - { -+ struct amdgpu_device *adev = (struct amdgpu_device *)handle; -+ - if (idx < adev->pm.dpm.num_of_vce_states) - return &adev->pm.dpm.vce_states[idx]; - -diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.h -index bf41c67..5b2b724 100644 ---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.h -+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.h -@@ -241,49 +241,6 @@ enum amdgpu_pcie_gen { - AMDGPU_PCIE_GEN_INVALID = 0xffff - }; - --struct amdgpu_dpm_funcs { -- int (*get_temperature)(struct amdgpu_device *adev); -- int (*pre_set_power_state)(struct amdgpu_device *adev); -- int (*set_power_state)(struct amdgpu_device *adev); -- void (*post_set_power_state)(struct amdgpu_device *adev); -- void (*display_configuration_changed)(struct amdgpu_device *adev); -- u32 (*get_sclk)(struct amdgpu_device *adev, bool low); -- u32 (*get_mclk)(struct amdgpu_device *adev, bool low); -- void (*print_power_state)(struct amdgpu_device *adev, struct amdgpu_ps *ps); -- void (*debugfs_print_current_performance_level)(struct amdgpu_device *adev, struct seq_file *m); -- int (*force_performance_level)(struct amdgpu_device *adev, enum amd_dpm_forced_level level); -- bool (*vblank_too_short)(struct amdgpu_device *adev); -- void (*powergate_uvd)(struct amdgpu_device *adev, bool gate); -- void (*powergate_vce)(struct amdgpu_device *adev, bool gate); -- void (*enable_bapm)(struct amdgpu_device *adev, bool enable); -- void (*set_fan_control_mode)(struct amdgpu_device *adev, u32 mode); -- u32 (*get_fan_control_mode)(struct amdgpu_device *adev); -- int (*set_fan_speed_percent)(struct amdgpu_device *adev, u32 speed); -- int (*get_fan_speed_percent)(struct amdgpu_device *adev, u32 *speed); -- int (*force_clock_level)(struct amdgpu_device *adev, enum pp_clock_type type, uint32_t mask); -- int (*print_clock_levels)(struct amdgpu_device *adev, enum pp_clock_type type, char *buf); -- int (*get_sclk_od)(struct amdgpu_device *adev); -- int (*set_sclk_od)(struct amdgpu_device *adev, uint32_t value); -- int (*get_mclk_od)(struct amdgpu_device *adev); -- int (*set_mclk_od)(struct amdgpu_device *adev, uint32_t value); -- int (*check_state_equal)(struct amdgpu_device *adev, -- struct amdgpu_ps *cps, -- struct amdgpu_ps *rps, -- bool *equal); -- int (*read_sensor)(struct amdgpu_device *adev, int idx, void *value, -- int *size); -- -- struct amd_vce_state* (*get_vce_clock_state)(struct amdgpu_device *adev, unsigned idx); -- int (*reset_power_profile_state)(struct amdgpu_device *adev, -- struct amd_pp_profile *request); -- int (*get_power_profile_state)(struct amdgpu_device *adev, -- struct amd_pp_profile *query); -- int (*set_power_profile_state)(struct amdgpu_device *adev, -- struct amd_pp_profile *request); -- int (*switch_power_profile)(struct amdgpu_device *adev, -- enum amd_pp_profile_type type); --}; -- - #define amdgpu_dpm_pre_set_power_state(adev) (adev)->pm.funcs->pre_set_power_state((adev)) - #define amdgpu_dpm_set_power_state(adev) (adev)->pm.funcs->set_power_state((adev)) - #define amdgpu_dpm_post_set_power_state(adev) (adev)->pm.funcs->post_set_power_state((adev)) -@@ -485,7 +442,7 @@ struct amdgpu_pm { - struct amdgpu_dpm dpm; - const struct firmware *fw; /* SMC firmware */ - uint32_t fw_version; -- const struct amdgpu_dpm_funcs *funcs; -+ const struct amd_pm_funcs *funcs; - uint32_t pcie_gen_mask; - uint32_t pcie_mlw_mask; - struct amd_pp_display_configuration pm_display_cfg;/* set by dc */ -@@ -551,6 +508,6 @@ u16 amdgpu_get_pcie_lane_support(struct amdgpu_device *adev, - u8 amdgpu_encode_pci_lane_width(u32 lanes); - - struct amd_vce_state* --amdgpu_get_vce_clock_state(struct amdgpu_device *adev, unsigned idx); -+amdgpu_get_vce_clock_state(void *handle, u32 idx); - - #endif -diff --git a/drivers/gpu/drm/amd/amdgpu/ci_dpm.c b/drivers/gpu/drm/amd/amdgpu/ci_dpm.c -index cb508a2..bdf7928 100644 ---- a/drivers/gpu/drm/amd/amdgpu/ci_dpm.c -+++ b/drivers/gpu/drm/amd/amdgpu/ci_dpm.c -@@ -883,8 +883,9 @@ static int ci_power_control_set_level(struct amdgpu_device *adev) - return ret; - } - --static void ci_dpm_powergate_uvd(struct amdgpu_device *adev, bool gate) -+static void ci_dpm_powergate_uvd(void *handle, bool gate) - { -+ struct amdgpu_device *adev = (struct amdgpu_device *)handle; - struct ci_power_info *pi = ci_get_pi(adev); - - pi->uvd_power_gated = gate; -@@ -901,8 +902,9 @@ static void ci_dpm_powergate_uvd(struct amdgpu_device *adev, bool gate) - } - } - --static bool ci_dpm_vblank_too_short(struct amdgpu_device *adev) -+static bool ci_dpm_vblank_too_short(void *handle) - { -+ struct amdgpu_device *adev = (struct amdgpu_device *)handle; - u32 vblank_time = amdgpu_dpm_get_vblank_time(adev); - u32 switch_limit = adev->mc.vram_type == AMDGPU_VRAM_TYPE_GDDR5 ? 450 : 300; - -@@ -1210,11 +1212,12 @@ static int ci_fan_ctrl_stop_smc_fan_control(struct amdgpu_device *adev) - } - } - --static int ci_dpm_get_fan_speed_percent(struct amdgpu_device *adev, -+static int ci_dpm_get_fan_speed_percent(void *handle, - u32 *speed) - { - u32 duty, duty100; - u64 tmp64; -+ struct amdgpu_device *adev = (struct amdgpu_device *)handle; - - if (adev->pm.no_fan) - return -ENOENT; -@@ -1237,12 +1240,13 @@ static int ci_dpm_get_fan_speed_percent(struct amdgpu_device *adev, - return 0; - } - --static int ci_dpm_set_fan_speed_percent(struct amdgpu_device *adev, -+static int ci_dpm_set_fan_speed_percent(void *handle, - u32 speed) - { - u32 tmp; - u32 duty, duty100; - u64 tmp64; -+ struct amdgpu_device *adev = (struct amdgpu_device *)handle; - struct ci_power_info *pi = ci_get_pi(adev); - - if (adev->pm.no_fan) -@@ -1271,8 +1275,10 @@ static int ci_dpm_set_fan_speed_percent(struct amdgpu_device *adev, - return 0; - } - --static void ci_dpm_set_fan_control_mode(struct amdgpu_device *adev, u32 mode) -+static void ci_dpm_set_fan_control_mode(void *handle, u32 mode) - { -+ struct amdgpu_device *adev = (struct amdgpu_device *)handle; -+ - switch (mode) { - case AMD_FAN_CTRL_NONE: - if (adev->pm.dpm.fan.ucode_fan_control) -@@ -1292,8 +1298,9 @@ static void ci_dpm_set_fan_control_mode(struct amdgpu_device *adev, u32 mode) - } - } - --static u32 ci_dpm_get_fan_control_mode(struct amdgpu_device *adev) -+static u32 ci_dpm_get_fan_control_mode(void *handle) - { -+ struct amdgpu_device *adev = (struct amdgpu_device *)handle; - struct ci_power_info *pi = ci_get_pi(adev); - - if (pi->fan_is_controlled_by_smc) -@@ -4378,9 +4385,10 @@ static u32 ci_get_lowest_enabled_level(struct amdgpu_device *adev, - } - - --static int ci_dpm_force_performance_level(struct amdgpu_device *adev, -+static int ci_dpm_force_performance_level(void *handle, - enum amd_dpm_forced_level level) - { -+ struct amdgpu_device *adev = (struct amdgpu_device *)handle; - struct ci_power_info *pi = ci_get_pi(adev); - u32 tmp, levels, i; - int ret; -@@ -5291,8 +5299,9 @@ static void ci_update_requested_ps(struct amdgpu_device *adev, - adev->pm.dpm.requested_ps = &pi->requested_rps; - } - --static int ci_dpm_pre_set_power_state(struct amdgpu_device *adev) -+static int ci_dpm_pre_set_power_state(void *handle) - { -+ struct amdgpu_device *adev = (struct amdgpu_device *)handle; - struct ci_power_info *pi = ci_get_pi(adev); - struct amdgpu_ps requested_ps = *adev->pm.dpm.requested_ps; - struct amdgpu_ps *new_ps = &requested_ps; -@@ -5304,8 +5313,9 @@ static int ci_dpm_pre_set_power_state(struct amdgpu_device *adev) - return 0; - } - --static void ci_dpm_post_set_power_state(struct amdgpu_device *adev) -+static void ci_dpm_post_set_power_state(void *handle) - { -+ struct amdgpu_device *adev = (struct amdgpu_device *)handle; - struct ci_power_info *pi = ci_get_pi(adev); - struct amdgpu_ps *new_ps = &pi->requested_rps; - -@@ -5479,8 +5489,9 @@ static void ci_dpm_disable(struct amdgpu_device *adev) - ci_update_current_ps(adev, boot_ps); - } - --static int ci_dpm_set_power_state(struct amdgpu_device *adev) -+static int ci_dpm_set_power_state(void *handle) - { -+ struct amdgpu_device *adev = (struct amdgpu_device *)handle; - struct ci_power_info *pi = ci_get_pi(adev); - struct amdgpu_ps *new_ps = &pi->requested_rps; - struct amdgpu_ps *old_ps = &pi->current_rps; -@@ -5551,8 +5562,10 @@ static void ci_dpm_reset_asic(struct amdgpu_device *adev) - } - #endif - --static void ci_dpm_display_configuration_changed(struct amdgpu_device *adev) -+static void ci_dpm_display_configuration_changed(void *handle) - { -+ struct amdgpu_device *adev = (struct amdgpu_device *)handle; -+ - ci_program_display_gap(adev); - } - -@@ -6105,9 +6118,10 @@ static int ci_dpm_init(struct amdgpu_device *adev) - } - - static void --ci_dpm_debugfs_print_current_performance_level(struct amdgpu_device *adev, -+ci_dpm_debugfs_print_current_performance_level(void *handle, - struct seq_file *m) - { -+ struct amdgpu_device *adev = (struct amdgpu_device *)handle; - struct ci_power_info *pi = ci_get_pi(adev); - struct amdgpu_ps *rps = &pi->current_rps; - u32 sclk = ci_get_average_sclk_freq(adev); -@@ -6131,12 +6145,13 @@ ci_dpm_debugfs_print_current_performance_level(struct amdgpu_device *adev, - seq_printf(m, "GPU load: %u %%\n", activity_percent); - } - --static void ci_dpm_print_power_state(struct amdgpu_device *adev, -- struct amdgpu_ps *rps) -+static void ci_dpm_print_power_state(void *handle, void *current_ps) - { -+ struct amdgpu_ps *rps = (struct amdgpu_ps *)current_ps; - struct ci_ps *ps = ci_get_ps(rps); - struct ci_pl *pl; - int i; -+ struct amdgpu_device *adev = (struct amdgpu_device *)handle; - - amdgpu_dpm_print_class_info(rps->class, rps->class2); - amdgpu_dpm_print_cap_info(rps->caps); -@@ -6158,20 +6173,23 @@ static inline bool ci_are_power_levels_equal(const struct ci_pl *ci_cpl1, - (ci_cpl1->pcie_lane == ci_cpl2->pcie_lane)); - } - --static int ci_check_state_equal(struct amdgpu_device *adev, -- struct amdgpu_ps *cps, -- struct amdgpu_ps *rps, -+static int ci_check_state_equal(void *handle, -+ void *current_ps, -+ void *request_ps, - bool *equal) - { - struct ci_ps *ci_cps; - struct ci_ps *ci_rps; - int i; -+ struct amdgpu_ps *cps = (struct amdgpu_ps *)current_ps; -+ struct amdgpu_ps *rps = (struct amdgpu_ps *)request_ps; -+ struct amdgpu_device *adev = (struct amdgpu_device *)handle; - - if (adev == NULL || cps == NULL || rps == NULL || equal == NULL) - return -EINVAL; - -- ci_cps = ci_get_ps(cps); -- ci_rps = ci_get_ps(rps); -+ ci_cps = ci_get_ps((struct amdgpu_ps *)cps); -+ ci_rps = ci_get_ps((struct amdgpu_ps *)rps); - - if (ci_cps == NULL) { - *equal = false; -@@ -6199,8 +6217,9 @@ static int ci_check_state_equal(struct amdgpu_device *adev, - return 0; - } - --static u32 ci_dpm_get_sclk(struct amdgpu_device *adev, bool low) -+static u32 ci_dpm_get_sclk(void *handle, bool low) - { -+ struct amdgpu_device *adev = (struct amdgpu_device *)handle; - struct ci_power_info *pi = ci_get_pi(adev); - struct ci_ps *requested_state = ci_get_ps(&pi->requested_rps); - -@@ -6210,8 +6229,9 @@ static u32 ci_dpm_get_sclk(struct amdgpu_device *adev, bool low) - return requested_state->performance_levels[requested_state->performance_level_count - 1].sclk; - } - --static u32 ci_dpm_get_mclk(struct amdgpu_device *adev, bool low) -+static u32 ci_dpm_get_mclk(void *handle, bool low) - { -+ struct amdgpu_device *adev = (struct amdgpu_device *)handle; - struct ci_power_info *pi = ci_get_pi(adev); - struct ci_ps *requested_state = ci_get_ps(&pi->requested_rps); - -@@ -6222,10 +6242,11 @@ static u32 ci_dpm_get_mclk(struct amdgpu_device *adev, bool low) - } - - /* get temperature in millidegrees */ --static int ci_dpm_get_temp(struct amdgpu_device *adev) -+static int ci_dpm_get_temp(void *handle) - { - u32 temp; - int actual_temp = 0; -+ struct amdgpu_device *adev = (struct amdgpu_device *)handle; - - temp = (RREG32_SMC(ixCG_MULT_THERMAL_STATUS) & CG_MULT_THERMAL_STATUS__CTF_TEMP_MASK) >> - CG_MULT_THERMAL_STATUS__CTF_TEMP__SHIFT; -@@ -6551,9 +6572,10 @@ static int ci_dpm_set_powergating_state(void *handle, - return 0; - } - --static int ci_dpm_print_clock_levels(struct amdgpu_device *adev, -+static int ci_dpm_print_clock_levels(void *handle, - enum pp_clock_type type, char *buf) - { -+ struct amdgpu_device *adev = (struct amdgpu_device *)handle; - struct ci_power_info *pi = ci_get_pi(adev); - struct ci_single_dpm_table *sclk_table = &pi->dpm_table.sclk_table; - struct ci_single_dpm_table *mclk_table = &pi->dpm_table.mclk_table; -@@ -6618,9 +6640,10 @@ static int ci_dpm_print_clock_levels(struct amdgpu_device *adev, - return size; - } - --static int ci_dpm_force_clock_level(struct amdgpu_device *adev, -+static int ci_dpm_force_clock_level(void *handle, - enum pp_clock_type type, uint32_t mask) - { -+ struct amdgpu_device *adev = (struct amdgpu_device *)handle; - struct ci_power_info *pi = ci_get_pi(adev); - - if (adev->pm.dpm.forced_level & (AMD_DPM_FORCED_LEVEL_AUTO | -@@ -6664,8 +6687,9 @@ static int ci_dpm_force_clock_level(struct amdgpu_device *adev, - return 0; - } - --static int ci_dpm_get_sclk_od(struct amdgpu_device *adev) -+static int ci_dpm_get_sclk_od(void *handle) - { -+ struct amdgpu_device *adev = (struct amdgpu_device *)handle; - struct ci_power_info *pi = ci_get_pi(adev); - struct ci_single_dpm_table *sclk_table = &(pi->dpm_table.sclk_table); - struct ci_single_dpm_table *golden_sclk_table = -@@ -6680,8 +6704,9 @@ static int ci_dpm_get_sclk_od(struct amdgpu_device *adev) - return value; - } - --static int ci_dpm_set_sclk_od(struct amdgpu_device *adev, uint32_t value) -+static int ci_dpm_set_sclk_od(void *handle, uint32_t value) - { -+ struct amdgpu_device *adev = (struct amdgpu_device *)handle; - struct ci_power_info *pi = ci_get_pi(adev); - struct ci_ps *ps = ci_get_ps(adev->pm.dpm.requested_ps); - struct ci_single_dpm_table *golden_sclk_table = -@@ -6698,8 +6723,9 @@ static int ci_dpm_set_sclk_od(struct amdgpu_device *adev, uint32_t value) - return 0; - } - --static int ci_dpm_get_mclk_od(struct amdgpu_device *adev) -+static int ci_dpm_get_mclk_od(void *handle) - { -+ struct amdgpu_device *adev = (struct amdgpu_device *)handle; - struct ci_power_info *pi = ci_get_pi(adev); - struct ci_single_dpm_table *mclk_table = &(pi->dpm_table.mclk_table); - struct ci_single_dpm_table *golden_mclk_table = -@@ -6714,8 +6740,9 @@ static int ci_dpm_get_mclk_od(struct amdgpu_device *adev) - return value; - } - --static int ci_dpm_set_mclk_od(struct amdgpu_device *adev, uint32_t value) -+static int ci_dpm_set_mclk_od(void *handle, uint32_t value) - { -+ struct amdgpu_device *adev = (struct amdgpu_device *)handle; - struct ci_power_info *pi = ci_get_pi(adev); - struct ci_ps *ps = ci_get_ps(adev->pm.dpm.requested_ps); - struct ci_single_dpm_table *golden_mclk_table = -@@ -6732,9 +6759,10 @@ static int ci_dpm_set_mclk_od(struct amdgpu_device *adev, uint32_t value) - return 0; - } - --static int ci_dpm_get_power_profile_state(struct amdgpu_device *adev, -+static int ci_dpm_get_power_profile_state(void *handle, - struct amd_pp_profile *query) - { -+ struct amdgpu_device *adev = (struct amdgpu_device *)handle; - struct ci_power_info *pi = ci_get_pi(adev); - - if (!pi || !query) -@@ -6851,9 +6879,10 @@ static int ci_set_power_profile_state(struct amdgpu_device *adev, - return result; - } - --static int ci_dpm_set_power_profile_state(struct amdgpu_device *adev, -+static int ci_dpm_set_power_profile_state(void *handle, - struct amd_pp_profile *request) - { -+ struct amdgpu_device *adev = (struct amdgpu_device *)handle; - struct ci_power_info *pi = ci_get_pi(adev); - int ret = -1; - -@@ -6906,9 +6935,10 @@ static int ci_dpm_set_power_profile_state(struct amdgpu_device *adev, - return 0; - } - --static int ci_dpm_reset_power_profile_state(struct amdgpu_device *adev, -+static int ci_dpm_reset_power_profile_state(void *handle, - struct amd_pp_profile *request) - { -+ struct amdgpu_device *adev = (struct amdgpu_device *)handle; - struct ci_power_info *pi = ci_get_pi(adev); - - if (!pi || !request) -@@ -6927,9 +6957,10 @@ static int ci_dpm_reset_power_profile_state(struct amdgpu_device *adev, - return -EINVAL; - } - --static int ci_dpm_switch_power_profile(struct amdgpu_device *adev, -+static int ci_dpm_switch_power_profile(void *handle, - enum amd_pp_profile_type type) - { -+ struct amdgpu_device *adev = (struct amdgpu_device *)handle; - struct ci_power_info *pi = ci_get_pi(adev); - struct amd_pp_profile request = {0}; - -@@ -6944,11 +6975,12 @@ static int ci_dpm_switch_power_profile(struct amdgpu_device *adev, - return 0; - } - --static int ci_dpm_read_sensor(struct amdgpu_device *adev, int idx, -+static int ci_dpm_read_sensor(void *handle, int idx, - void *value, int *size) - { - u32 activity_percent = 50; - int ret; -+ struct amdgpu_device *adev = (struct amdgpu_device *)handle; - - /* size must be at least 4 bytes for all sensors */ - if (*size < 4) -@@ -7003,7 +7035,7 @@ const struct amd_ip_funcs ci_dpm_ip_funcs = { - .set_powergating_state = ci_dpm_set_powergating_state, - }; - --static const struct amdgpu_dpm_funcs ci_dpm_funcs = { -+static const struct amd_pm_funcs ci_dpm_funcs = { - .get_temperature = &ci_dpm_get_temp, - .pre_set_power_state = &ci_dpm_pre_set_power_state, - .set_power_state = &ci_dpm_set_power_state, -diff --git a/drivers/gpu/drm/amd/amdgpu/kv_dpm.c b/drivers/gpu/drm/amd/amdgpu/kv_dpm.c -index 3bbf2cc..f68d7ab 100644 ---- a/drivers/gpu/drm/amd/amdgpu/kv_dpm.c -+++ b/drivers/gpu/drm/amd/amdgpu/kv_dpm.c -@@ -64,7 +64,7 @@ static int kv_set_thermal_temperature_range(struct amdgpu_device *adev, - int min_temp, int max_temp); - static int kv_init_fps_limits(struct amdgpu_device *adev); - --static void kv_dpm_powergate_uvd(struct amdgpu_device *adev, bool gate); -+static void kv_dpm_powergate_uvd(void *handle, bool gate); - static void kv_dpm_powergate_vce(struct amdgpu_device *adev, bool gate); - static void kv_dpm_powergate_samu(struct amdgpu_device *adev, bool gate); - static void kv_dpm_powergate_acp(struct amdgpu_device *adev, bool gate); -@@ -1245,8 +1245,9 @@ static void kv_update_requested_ps(struct amdgpu_device *adev, - adev->pm.dpm.requested_ps = &pi->requested_rps; - } - --static void kv_dpm_enable_bapm(struct amdgpu_device *adev, bool enable) -+static void kv_dpm_enable_bapm(void *handle, bool enable) - { -+ struct amdgpu_device *adev = (struct amdgpu_device *)handle; - struct kv_power_info *pi = kv_get_pi(adev); - int ret; - -@@ -1672,8 +1673,9 @@ static int kv_update_acp_dpm(struct amdgpu_device *adev, bool gate) - return kv_enable_acp_dpm(adev, !gate); - } - --static void kv_dpm_powergate_uvd(struct amdgpu_device *adev, bool gate) -+static void kv_dpm_powergate_uvd(void *handle, bool gate) - { -+ struct amdgpu_device *adev = (struct amdgpu_device *)handle; - struct kv_power_info *pi = kv_get_pi(adev); - int ret; - -@@ -1868,10 +1870,11 @@ static int kv_enable_nb_dpm(struct amdgpu_device *adev, - return ret; - } - --static int kv_dpm_force_performance_level(struct amdgpu_device *adev, -+static int kv_dpm_force_performance_level(void *handle, - enum amd_dpm_forced_level level) - { - int ret; -+ struct amdgpu_device *adev = (struct amdgpu_device *)handle; - - if (level == AMD_DPM_FORCED_LEVEL_HIGH) { - ret = kv_force_dpm_highest(adev); -@@ -1892,8 +1895,9 @@ static int kv_dpm_force_performance_level(struct amdgpu_device *adev, - return 0; - } - --static int kv_dpm_pre_set_power_state(struct amdgpu_device *adev) -+static int kv_dpm_pre_set_power_state(void *handle) - { -+ struct amdgpu_device *adev = (struct amdgpu_device *)handle; - struct kv_power_info *pi = kv_get_pi(adev); - struct amdgpu_ps requested_ps = *adev->pm.dpm.requested_ps; - struct amdgpu_ps *new_ps = &requested_ps; -@@ -1907,8 +1911,9 @@ static int kv_dpm_pre_set_power_state(struct amdgpu_device *adev) - return 0; - } - --static int kv_dpm_set_power_state(struct amdgpu_device *adev) -+static int kv_dpm_set_power_state(void *handle) - { -+ struct amdgpu_device *adev = (struct amdgpu_device *)handle; - struct kv_power_info *pi = kv_get_pi(adev); - struct amdgpu_ps *new_ps = &pi->requested_rps; - struct amdgpu_ps *old_ps = &pi->current_rps; -@@ -1981,8 +1986,9 @@ static int kv_dpm_set_power_state(struct amdgpu_device *adev) - return 0; - } - --static void kv_dpm_post_set_power_state(struct amdgpu_device *adev) -+static void kv_dpm_post_set_power_state(void *handle) - { -+ struct amdgpu_device *adev = (struct amdgpu_device *)handle; - struct kv_power_info *pi = kv_get_pi(adev); - struct amdgpu_ps *new_ps = &pi->requested_rps; - -@@ -2848,9 +2854,10 @@ static int kv_dpm_init(struct amdgpu_device *adev) - } - - static void --kv_dpm_debugfs_print_current_performance_level(struct amdgpu_device *adev, -+kv_dpm_debugfs_print_current_performance_level(void *handle, - struct seq_file *m) - { -+ struct amdgpu_device *adev = (struct amdgpu_device *)handle; - struct kv_power_info *pi = kv_get_pi(adev); - u32 current_index = - (RREG32_SMC(ixTARGET_AND_CURRENT_PROFILE_INDEX) & -@@ -2875,11 +2882,12 @@ kv_dpm_debugfs_print_current_performance_level(struct amdgpu_device *adev, - } - - static void --kv_dpm_print_power_state(struct amdgpu_device *adev, -- struct amdgpu_ps *rps) -+kv_dpm_print_power_state(void *handle, void *request_ps) - { - int i; -+ struct amdgpu_ps *rps = (struct amdgpu_ps *)request_ps; - struct kv_ps *ps = kv_get_ps(rps); -+ struct amdgpu_device *adev = (struct amdgpu_device *)handle; - - amdgpu_dpm_print_class_info(rps->class, rps->class2); - amdgpu_dpm_print_cap_info(rps->caps); -@@ -2905,13 +2913,14 @@ static void kv_dpm_fini(struct amdgpu_device *adev) - amdgpu_free_extended_power_table(adev); - } - --static void kv_dpm_display_configuration_changed(struct amdgpu_device *adev) -+static void kv_dpm_display_configuration_changed(void *handle) - { - - } - --static u32 kv_dpm_get_sclk(struct amdgpu_device *adev, bool low) -+static u32 kv_dpm_get_sclk(void *handle, bool low) - { -+ struct amdgpu_device *adev = (struct amdgpu_device *)handle; - struct kv_power_info *pi = kv_get_pi(adev); - struct kv_ps *requested_state = kv_get_ps(&pi->requested_rps); - -@@ -2921,18 +2930,20 @@ static u32 kv_dpm_get_sclk(struct amdgpu_device *adev, bool low) - return requested_state->levels[requested_state->num_levels - 1].sclk; - } - --static u32 kv_dpm_get_mclk(struct amdgpu_device *adev, bool low) -+static u32 kv_dpm_get_mclk(void *handle, bool low) - { -+ struct amdgpu_device *adev = (struct amdgpu_device *)handle; - struct kv_power_info *pi = kv_get_pi(adev); - - return pi->sys_info.bootup_uma_clk; - } - - /* get temperature in millidegrees */ --static int kv_dpm_get_temp(struct amdgpu_device *adev) -+static int kv_dpm_get_temp(void *handle) - { - u32 temp; - int actual_temp = 0; -+ struct amdgpu_device *adev = (struct amdgpu_device *)handle; - - temp = RREG32_SMC(0xC0300E0C); - -@@ -3222,14 +3233,17 @@ static inline bool kv_are_power_levels_equal(const struct kv_pl *kv_cpl1, - (kv_cpl1->force_nbp_state == kv_cpl2->force_nbp_state)); - } - --static int kv_check_state_equal(struct amdgpu_device *adev, -- struct amdgpu_ps *cps, -- struct amdgpu_ps *rps, -+static int kv_check_state_equal(void *handle, -+ void *current_ps, -+ void *request_ps, - bool *equal) - { - struct kv_ps *kv_cps; - struct kv_ps *kv_rps; - int i; -+ struct amdgpu_ps *cps = (struct amdgpu_ps *)current_ps; -+ struct amdgpu_ps *rps = (struct amdgpu_ps *)request_ps; -+ struct amdgpu_device *adev = (struct amdgpu_device *)handle; - - if (adev == NULL || cps == NULL || rps == NULL || equal == NULL) - return -EINVAL; -@@ -3262,9 +3276,10 @@ static int kv_check_state_equal(struct amdgpu_device *adev, - return 0; - } - --static int kv_dpm_read_sensor(struct amdgpu_device *adev, int idx, -+static int kv_dpm_read_sensor(void *handle, int idx, - void *value, int *size) - { -+ struct amdgpu_device *adev = (struct amdgpu_device *)handle; - struct kv_power_info *pi = kv_get_pi(adev); - uint32_t sclk; - u32 pl_index = -@@ -3312,7 +3327,7 @@ const struct amd_ip_funcs kv_dpm_ip_funcs = { - .set_powergating_state = kv_dpm_set_powergating_state, - }; - --static const struct amdgpu_dpm_funcs kv_dpm_funcs = { -+static const struct amd_pm_funcs kv_dpm_funcs = { - .get_temperature = &kv_dpm_get_temp, - .pre_set_power_state = &kv_dpm_pre_set_power_state, - .set_power_state = &kv_dpm_set_power_state, -diff --git a/drivers/gpu/drm/amd/amdgpu/si_dpm.c b/drivers/gpu/drm/amd/amdgpu/si_dpm.c -index 6f1dea1..6e1240d 100644 ---- a/drivers/gpu/drm/amd/amdgpu/si_dpm.c -+++ b/drivers/gpu/drm/amd/amdgpu/si_dpm.c -@@ -3061,9 +3061,9 @@ static int si_get_vce_clock_voltage(struct amdgpu_device *adev, - return ret; - } - --static bool si_dpm_vblank_too_short(struct amdgpu_device *adev) -+static bool si_dpm_vblank_too_short(void *handle) - { -- -+ struct amdgpu_device *adev = (struct amdgpu_device *)handle; - u32 vblank_time = amdgpu_dpm_get_vblank_time(adev); - /* we never hit the non-gddr5 limit so disable it */ - u32 switch_limit = adev->mc.vram_type == AMDGPU_VRAM_TYPE_GDDR5 ? 450 : 0; -@@ -3854,9 +3854,10 @@ static int si_restrict_performance_levels_before_switch(struct amdgpu_device *ad - 0 : -EINVAL; - } - --static int si_dpm_force_performance_level(struct amdgpu_device *adev, -+static int si_dpm_force_performance_level(void *handle, - enum amd_dpm_forced_level level) - { -+ struct amdgpu_device *adev = (struct amdgpu_device *)handle; - struct amdgpu_ps *rps = adev->pm.dpm.current_ps; - struct si_ps *ps = si_get_ps(rps); - u32 levels = ps->performance_level_count; -@@ -6559,11 +6560,12 @@ static int si_fan_ctrl_stop_smc_fan_control(struct amdgpu_device *adev) - } - } - --static int si_dpm_get_fan_speed_percent(struct amdgpu_device *adev, -+static int si_dpm_get_fan_speed_percent(void *handle, - u32 *speed) - { - u32 duty, duty100; - u64 tmp64; -+ struct amdgpu_device *adev = (struct amdgpu_device *)handle; - - if (adev->pm.no_fan) - return -ENOENT; -@@ -6584,9 +6586,10 @@ static int si_dpm_get_fan_speed_percent(struct amdgpu_device *adev, - return 0; - } - --static int si_dpm_set_fan_speed_percent(struct amdgpu_device *adev, -+static int si_dpm_set_fan_speed_percent(void *handle, - u32 speed) - { -+ struct amdgpu_device *adev = (struct amdgpu_device *)handle; - struct si_power_info *si_pi = si_get_pi(adev); - u32 tmp; - u32 duty, duty100; -@@ -6617,8 +6620,10 @@ static int si_dpm_set_fan_speed_percent(struct amdgpu_device *adev, - return 0; - } - --static void si_dpm_set_fan_control_mode(struct amdgpu_device *adev, u32 mode) -+static void si_dpm_set_fan_control_mode(void *handle, u32 mode) - { -+ struct amdgpu_device *adev = (struct amdgpu_device *)handle; -+ - if (mode) { - /* stop auto-manage */ - if (adev->pm.dpm.fan.ucode_fan_control) -@@ -6633,8 +6638,9 @@ static void si_dpm_set_fan_control_mode(struct amdgpu_device *adev, u32 mode) - } - } - --static u32 si_dpm_get_fan_control_mode(struct amdgpu_device *adev) -+static u32 si_dpm_get_fan_control_mode(void *handle) - { -+ struct amdgpu_device *adev = (struct amdgpu_device *)handle; - struct si_power_info *si_pi = si_get_pi(adev); - u32 tmp; - -@@ -6930,8 +6936,9 @@ static void si_dpm_disable(struct amdgpu_device *adev) - ni_update_current_ps(adev, boot_ps); - } - --static int si_dpm_pre_set_power_state(struct amdgpu_device *adev) -+static int si_dpm_pre_set_power_state(void *handle) - { -+ struct amdgpu_device *adev = (struct amdgpu_device *)handle; - struct evergreen_power_info *eg_pi = evergreen_get_pi(adev); - struct amdgpu_ps requested_ps = *adev->pm.dpm.requested_ps; - struct amdgpu_ps *new_ps = &requested_ps; -@@ -6968,8 +6975,9 @@ static int si_power_control_set_level(struct amdgpu_device *adev) - return 0; - } - --static int si_dpm_set_power_state(struct amdgpu_device *adev) -+static int si_dpm_set_power_state(void *handle) - { -+ struct amdgpu_device *adev = (struct amdgpu_device *)handle; - struct evergreen_power_info *eg_pi = evergreen_get_pi(adev); - struct amdgpu_ps *new_ps = &eg_pi->requested_rps; - struct amdgpu_ps *old_ps = &eg_pi->current_rps; -@@ -7070,8 +7078,9 @@ static int si_dpm_set_power_state(struct amdgpu_device *adev) - return 0; - } - --static void si_dpm_post_set_power_state(struct amdgpu_device *adev) -+static void si_dpm_post_set_power_state(void *handle) - { -+ struct amdgpu_device *adev = (struct amdgpu_device *)handle; - struct evergreen_power_info *eg_pi = evergreen_get_pi(adev); - struct amdgpu_ps *new_ps = &eg_pi->requested_rps; - -@@ -7087,8 +7096,10 @@ void si_dpm_reset_asic(struct amdgpu_device *adev) - } - #endif - --static void si_dpm_display_configuration_changed(struct amdgpu_device *adev) -+static void si_dpm_display_configuration_changed(void *handle) - { -+ struct amdgpu_device *adev = (struct amdgpu_device *)handle; -+ - si_program_display_gap(adev); - } - -@@ -7467,9 +7478,10 @@ static void si_dpm_fini(struct amdgpu_device *adev) - amdgpu_free_extended_power_table(adev); - } - --static void si_dpm_debugfs_print_current_performance_level(struct amdgpu_device *adev, -+static void si_dpm_debugfs_print_current_performance_level(void *handle, - struct seq_file *m) - { -+ struct amdgpu_device *adev = (struct amdgpu_device *)handle; - struct evergreen_power_info *eg_pi = evergreen_get_pi(adev); - struct amdgpu_ps *rps = &eg_pi->current_rps; - struct si_ps *ps = si_get_ps(rps); -@@ -7841,10 +7853,11 @@ static int si_dpm_set_powergating_state(void *handle, - } - - /* get temperature in millidegrees */ --static int si_dpm_get_temp(struct amdgpu_device *adev) -+static int si_dpm_get_temp(void *handle) - { - u32 temp; - int actual_temp = 0; -+ struct amdgpu_device *adev = (struct amdgpu_device *)handle; - - temp = (RREG32(CG_MULT_THERMAL_STATUS) & CTF_TEMP_MASK) >> - CTF_TEMP_SHIFT; -@@ -7859,8 +7872,9 @@ static int si_dpm_get_temp(struct amdgpu_device *adev) - return actual_temp; - } - --static u32 si_dpm_get_sclk(struct amdgpu_device *adev, bool low) -+static u32 si_dpm_get_sclk(void *handle, bool low) - { -+ struct amdgpu_device *adev = (struct amdgpu_device *)handle; - struct evergreen_power_info *eg_pi = evergreen_get_pi(adev); - struct si_ps *requested_state = si_get_ps(&eg_pi->requested_rps); - -@@ -7870,8 +7884,9 @@ static u32 si_dpm_get_sclk(struct amdgpu_device *adev, bool low) - return requested_state->performance_levels[requested_state->performance_level_count - 1].sclk; - } - --static u32 si_dpm_get_mclk(struct amdgpu_device *adev, bool low) -+static u32 si_dpm_get_mclk(void *handle, bool low) - { -+ struct amdgpu_device *adev = (struct amdgpu_device *)handle; - struct evergreen_power_info *eg_pi = evergreen_get_pi(adev); - struct si_ps *requested_state = si_get_ps(&eg_pi->requested_rps); - -@@ -7881,9 +7896,11 @@ static u32 si_dpm_get_mclk(struct amdgpu_device *adev, bool low) - return requested_state->performance_levels[requested_state->performance_level_count - 1].mclk; - } - --static void si_dpm_print_power_state(struct amdgpu_device *adev, -- struct amdgpu_ps *rps) -+static void si_dpm_print_power_state(void *handle, -+ void *current_ps) - { -+ struct amdgpu_device *adev = (struct amdgpu_device *)handle; -+ struct amdgpu_ps *rps = (struct amdgpu_ps *)current_ps; - struct si_ps *ps = si_get_ps(rps); - struct rv7xx_pl *pl; - int i; -@@ -7923,20 +7940,23 @@ static inline bool si_are_power_levels_equal(const struct rv7xx_pl *si_cpl1, - (si_cpl1->vddci == si_cpl2->vddci)); - } - --static int si_check_state_equal(struct amdgpu_device *adev, -- struct amdgpu_ps *cps, -- struct amdgpu_ps *rps, -+static int si_check_state_equal(void *handle, -+ void *current_ps, -+ void *request_ps, - bool *equal) - { - struct si_ps *si_cps; - struct si_ps *si_rps; - int i; -+ struct amdgpu_ps *cps = (struct amdgpu_ps *)current_ps; -+ struct amdgpu_ps *rps = (struct amdgpu_ps *)request_ps; -+ struct amdgpu_device *adev = (struct amdgpu_device *)handle; - - if (adev == NULL || cps == NULL || rps == NULL || equal == NULL) - return -EINVAL; - -- si_cps = si_get_ps(cps); -- si_rps = si_get_ps(rps); -+ si_cps = si_get_ps((struct amdgpu_ps *)cps); -+ si_rps = si_get_ps((struct amdgpu_ps *)rps); - - if (si_cps == NULL) { - printk("si_cps is NULL\n"); -@@ -7964,9 +7984,10 @@ static int si_check_state_equal(struct amdgpu_device *adev, - return 0; - } - --static int si_dpm_read_sensor(struct amdgpu_device *adev, int idx, -+static int si_dpm_read_sensor(void *handle, int idx, - void *value, int *size) - { -+ struct amdgpu_device *adev = (struct amdgpu_device *)handle; - struct evergreen_power_info *eg_pi = evergreen_get_pi(adev); - struct amdgpu_ps *rps = &eg_pi->current_rps; - struct si_ps *ps = si_get_ps(rps); -@@ -8022,7 +8043,7 @@ const struct amd_ip_funcs si_dpm_ip_funcs = { - .set_powergating_state = si_dpm_set_powergating_state, - }; - --static const struct amdgpu_dpm_funcs si_dpm_funcs = { -+static const struct amd_pm_funcs si_dpm_funcs = { - .get_temperature = &si_dpm_get_temp, - .pre_set_power_state = &si_dpm_pre_set_power_state, - .set_power_state = &si_dpm_set_power_state, -diff --git a/drivers/gpu/drm/amd/include/amd_shared.h b/drivers/gpu/drm/amd/include/amd_shared.h -index 3a49fbd..5d2d58b 100644 ---- a/drivers/gpu/drm/amd/include/amd_shared.h -+++ b/drivers/gpu/drm/amd/include/amd_shared.h -@@ -27,6 +27,8 @@ - - #define AMD_MAX_USEC_TIMEOUT 200000 /* 200 ms */ - -+struct seq_file; -+ - /* - * Chip flags - */ -@@ -119,6 +121,12 @@ enum amd_fan_ctrl_mode { - AMD_FAN_CTRL_AUTO = 2, - }; - -+enum pp_clock_type { -+ PP_SCLK, -+ PP_MCLK, -+ PP_PCIE, -+}; -+ - /* CG flags */ - #define AMD_CG_SUPPORT_GFX_MGCG (1 << 0) - #define AMD_CG_SUPPORT_GFX_MGLS (1 << 1) -@@ -224,4 +232,47 @@ struct amd_ip_funcs { - void (*get_clockgating_state)(void *handle, u32 *flags); - }; - -+struct amd_pm_funcs { -+ int (*get_temperature)(void *handle); -+ int (*pre_set_power_state)(void *handle); -+ int (*set_power_state)(void *handle); -+ void (*post_set_power_state)(void *handle); -+ void (*display_configuration_changed)(void *handle); -+ u32 (*get_sclk)(void *handle, bool low); -+ u32 (*get_mclk)(void *handle, bool low); -+ void (*print_power_state)(void *handle, void *ps); -+ void (*debugfs_print_current_performance_level)(void *handle, struct seq_file *m); -+ int (*force_performance_level)(void *handle, enum amd_dpm_forced_level level); -+ bool (*vblank_too_short)(void *handle); -+ void (*powergate_uvd)(void *handle, bool gate); -+ void (*powergate_vce)(void *handle, bool gate); -+ void (*enable_bapm)(void *handle, bool enable); -+ void (*set_fan_control_mode)(void *handle, u32 mode); -+ u32 (*get_fan_control_mode)(void *handle); -+ int (*set_fan_speed_percent)(void *handle, u32 speed); -+ int (*get_fan_speed_percent)(void *handle, u32 *speed); -+ int (*force_clock_level)(void *handle, enum pp_clock_type type, uint32_t mask); -+ int (*print_clock_levels)(void *handle, enum pp_clock_type type, char *buf); -+ int (*get_sclk_od)(void *handle); -+ int (*set_sclk_od)(void *handle, uint32_t value); -+ int (*get_mclk_od)(void *handle); -+ int (*set_mclk_od)(void *handle, uint32_t value); -+ int (*check_state_equal)(void *handle, -+ void *cps, -+ void *rps, -+ bool *equal); -+ int (*read_sensor)(void *handle, int idx, void *value, -+ int *size); -+ -+ struct amd_vce_state* (*get_vce_clock_state)(void *handle, u32 idx); -+ int (*reset_power_profile_state)(void *handle, -+ struct amd_pp_profile *request); -+ int (*get_power_profile_state)(void *handle, -+ struct amd_pp_profile *query); -+ int (*set_power_profile_state)(void *handle, -+ struct amd_pp_profile *request); -+ int (*switch_power_profile)(void *handle, -+ enum amd_pp_profile_type type); -+}; -+ - #endif /* __AMD_SHARED_H__ */ -diff --git a/drivers/gpu/drm/amd/powerplay/inc/amd_powerplay.h b/drivers/gpu/drm/amd/powerplay/inc/amd_powerplay.h -index f471b99..832340b 100644 ---- a/drivers/gpu/drm/amd/powerplay/inc/amd_powerplay.h -+++ b/drivers/gpu/drm/amd/powerplay/inc/amd_powerplay.h -@@ -213,12 +213,6 @@ enum { - PP_GROUP_MAX - }; - --enum pp_clock_type { -- PP_SCLK, -- PP_MCLK, -- PP_PCIE, --}; -- - struct pp_states_info { - uint32_t nums; - uint32_t states[16]; --- -2.7.4 - |