Commit c6ce68e6 authored by Evan Quan's avatar Evan Quan Committed by Alex Deucher

drm/amd/pm: label these APIs used internally as static

Also drop unnecessary header file and declarations.
Signed-off-by: default avatarEvan Quan <evan.quan@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 5f400639
......@@ -24,7 +24,6 @@
#include <linux/list.h>
#include "amdgpu.h"
#include "amdgpu_xgmi.h"
#include "amdgpu_smu.h"
#include "amdgpu_ras.h"
#include "soc15.h"
#include "df/df_3_6_offset.h"
......
......@@ -29,7 +29,6 @@
#include "amdgpu.h"
#include "amdgpu_gfx.h"
#include "amdgpu_psp.h"
#include "amdgpu_smu.h"
#include "nv.h"
#include "nvd.h"
......
......@@ -34,7 +34,6 @@
#include "amdgpu_vce.h"
#include "amdgpu_ucode.h"
#include "amdgpu_psp.h"
#include "amdgpu_smu.h"
#include "atom.h"
#include "amd_pcie.h"
......
......@@ -76,7 +76,6 @@
#include "smuio_v13_0.h"
#include "dce_virtual.h"
#include "mxgpu_ai.h"
#include "amdgpu_smu.h"
#include "amdgpu_ras.h"
#include "amdgpu_xgmi.h"
#include <uapi/linux/kfd_ioctl.h>
......
......@@ -27,7 +27,6 @@
#include "amdgpu_drv.h"
#include "amdgpu_pm.h"
#include "amdgpu_dpm.h"
#include "amdgpu_smu.h"
#include "atom.h"
#include <linux/pci.h>
#include <linux/hwmon.h>
......@@ -927,14 +926,7 @@ static ssize_t amdgpu_set_pp_features(struct device *dev,
return ret;
}
if (is_support_sw_smu(adev)) {
ret = smu_sys_set_pp_feature_mask(&adev->smu, featuremask);
if (ret) {
pm_runtime_mark_last_busy(ddev->dev);
pm_runtime_put_autosuspend(ddev->dev);
return -EINVAL;
}
} else if (adev->powerplay.pp_funcs->set_ppfeature_status) {
if (adev->powerplay.pp_funcs->set_ppfeature_status) {
ret = amdgpu_dpm_set_ppfeature_status(adev, featuremask);
if (ret) {
pm_runtime_mark_last_busy(ddev->dev);
......
......@@ -1246,50 +1246,22 @@ int smu_load_microcode(struct smu_context *smu);
int smu_check_fw_status(struct smu_context *smu);
int smu_set_gfx_cgpg(struct smu_context *smu, bool enabled);
int smu_set_fan_speed_rpm(void *handle, uint32_t speed);
int smu_get_power_limit(struct smu_context *smu,
uint32_t *limit,
enum smu_ppt_limit_level limit_level);
int smu_set_power_limit(void *handle, uint32_t limit);
int smu_print_ppclk_levels(void *handle, enum pp_clock_type type, char *buf);
int smu_od_edit_dpm_table(void *handle,
enum PP_OD_DPM_TABLE_COMMAND type,
long *input, uint32_t size);
int smu_read_sensor(void *handle, int sensor, void *data, int *size);
int smu_get_power_profile_mode(void *handle, char *buf);
int smu_set_power_profile_mode(void *handle, long *param, uint32_t param_size);
u32 smu_get_fan_control_mode(void *handle);
int smu_set_fan_control_mode(struct smu_context *smu, int value);
void smu_pp_set_fan_control_mode(void *handle, u32 value);
int smu_get_fan_speed_percent(void *handle, u32 *speed);
int smu_set_fan_speed_percent(void *handle, u32 speed);
int smu_get_fan_speed_rpm(void *handle, uint32_t *speed);
int smu_set_xgmi_pstate(void *handle,
uint32_t pstate);
int smu_set_azalia_d3_pme(struct smu_context *smu);
bool smu_baco_is_support(struct smu_context *smu);
int smu_get_baco_capability(void *handle, bool *cap);
int smu_baco_get_state(struct smu_context *smu, enum smu_baco_state *state);
int smu_baco_enter(struct smu_context *smu);
int smu_baco_exit(struct smu_context *smu);
int smu_baco_set_state(void *handle, int state);
bool smu_mode1_reset_is_support(struct smu_context *smu);
bool smu_mode2_reset_is_support(struct smu_context *smu);
int smu_mode1_reset(struct smu_context *smu);
int smu_mode2_reset(void *handle);
extern const struct amd_ip_funcs smu_ip_funcs;
......@@ -1299,48 +1271,23 @@ extern const struct amdgpu_ip_block_version smu_v13_0_ip_block;
bool is_support_sw_smu(struct amdgpu_device *adev);
bool is_support_cclk_dpm(struct amdgpu_device *adev);
int smu_reset(struct smu_context *smu);
int smu_sys_get_pp_table(void *handle, char **table);
int smu_sys_set_pp_table(void *handle, const char *buf, size_t size);
int smu_get_power_num_states(void *handle, struct pp_states_info *state_info);
enum amd_pm_state_type smu_get_current_power_state(void *handle);
int smu_write_watermarks_table(struct smu_context *smu);
/* smu to display interface */
extern int smu_dpm_set_power_gate(void *handle, uint32_t block_type, bool gate);
extern int smu_handle_task(struct smu_context *smu,
enum amd_dpm_forced_level level,
enum amd_pp_task task_id,
bool lock_needed);
extern int smu_handle_dpm_task(void *handle,
enum amd_pp_task task_id,
enum amd_pm_state_type *user_state);
int smu_switch_power_profile(void *handle,
enum PP_SMC_POWER_PROFILE type,
bool en);
int smu_get_dpm_freq_range(struct smu_context *smu, enum smu_clk_type clk_type,
uint32_t *min, uint32_t *max);
u32 smu_get_mclk(void *handle, bool low);
u32 smu_get_sclk(void *handle, bool low);
int smu_set_soft_freq_range(struct smu_context *smu, enum smu_clk_type clk_type,
uint32_t min, uint32_t max);
enum amd_dpm_forced_level smu_get_performance_level(void *handle);
int smu_force_performance_level(void *handle, enum amd_dpm_forced_level level);
int smu_set_ac_dc(struct smu_context *smu);
int smu_sys_get_pp_feature_mask(void *handle, char *buf);
int smu_sys_set_pp_feature_mask(void *handle, uint64_t new_mask);
int smu_force_ppclk_levels(void *handle, enum pp_clock_type type, uint32_t mask);
int smu_set_mp1_state(void *handle,
enum pp_mp1_state mp1_state);
int smu_set_df_cstate(void *handle,
enum pp_df_cstate state);
int smu_allow_xgmi_power_down(struct smu_context *smu, bool en);
int smu_get_status_gfxoff(struct amdgpu_device *adev, uint32_t *value);
ssize_t smu_sys_get_gpu_metrics(void *handle, void **table);
int smu_enable_mgpu_fan_boost(void *handle);
int smu_gfx_state_change_set(struct smu_context *smu, uint32_t state);
int smu_set_light_sbr(struct smu_context *smu, bool enable);
......
......@@ -51,8 +51,19 @@ static const struct amd_pm_funcs swsmu_pm_funcs;
static int smu_force_smuclk_levels(struct smu_context *smu,
enum smu_clk_type clk_type,
uint32_t mask);
static int smu_handle_task(struct smu_context *smu,
enum amd_dpm_forced_level level,
enum amd_pp_task task_id,
bool lock_needed);
static int smu_reset(struct smu_context *smu);
static int smu_set_fan_speed_percent(void *handle, u32 speed);
static int smu_set_fan_control_mode(struct smu_context *smu, int value);
static int smu_set_power_limit(void *handle, uint32_t limit);
static int smu_set_fan_speed_rpm(void *handle, uint32_t speed);
static int smu_set_gfx_cgpg(struct smu_context *smu, bool enabled);
int smu_sys_get_pp_feature_mask(void *handle, char *buf)
static int smu_sys_get_pp_feature_mask(void *handle,
char *buf)
{
struct smu_context *smu = handle;
int size = 0;
......@@ -69,7 +80,8 @@ int smu_sys_get_pp_feature_mask(void *handle, char *buf)
return size;
}
int smu_sys_set_pp_feature_mask(void *handle, uint64_t new_mask)
static int smu_sys_set_pp_feature_mask(void *handle,
uint64_t new_mask)
{
struct smu_context *smu = handle;
int ret = 0;
......@@ -142,7 +154,7 @@ int smu_get_dpm_freq_range(struct smu_context *smu,
return ret;
}
u32 smu_get_mclk(void *handle, bool low)
static u32 smu_get_mclk(void *handle, bool low)
{
struct smu_context *smu = handle;
uint32_t clk_freq;
......@@ -156,7 +168,7 @@ u32 smu_get_mclk(void *handle, bool low)
return clk_freq * 100;
}
u32 smu_get_sclk(void *handle, bool low)
static u32 smu_get_sclk(void *handle, bool low)
{
struct smu_context *smu = handle;
uint32_t clk_freq;
......@@ -256,7 +268,8 @@ static int smu_dpm_set_jpeg_enable(struct smu_context *smu,
* Under this case, the smu->mutex lock protection is already enforced on
* the parent API smu_force_performance_level of the call path.
*/
int smu_dpm_set_power_gate(void *handle, uint32_t block_type,
int smu_dpm_set_power_gate(void *handle,
uint32_t block_type,
bool gate)
{
struct smu_context *smu = handle;
......@@ -406,7 +419,7 @@ static void smu_restore_dpm_user_profile(struct smu_context *smu)
smu->user_dpm_profile.flags &= ~SMU_DPM_USER_PROFILE_RESTORE;
}
int smu_get_power_num_states(void *handle,
static int smu_get_power_num_states(void *handle,
struct pp_states_info *state_info)
{
if (!state_info)
......@@ -442,7 +455,8 @@ bool is_support_cclk_dpm(struct amdgpu_device *adev)
}
int smu_sys_get_pp_table(void *handle, char **table)
static int smu_sys_get_pp_table(void *handle,
char **table)
{
struct smu_context *smu = handle;
struct smu_table_context *smu_table = &smu->smu_table;
......@@ -468,7 +482,9 @@ int smu_sys_get_pp_table(void *handle, char **table)
return powerplay_table_size;
}
int smu_sys_set_pp_table(void *handle, const char *buf, size_t size)
static int smu_sys_set_pp_table(void *handle,
const char *buf,
size_t size)
{
struct smu_context *smu = handle;
struct smu_table_context *smu_table = &smu->smu_table;
......@@ -632,6 +648,7 @@ static int smu_set_default_dpm_table(struct smu_context *smu)
return ret;
}
static int smu_late_init(void *handle)
{
struct amdgpu_device *adev = (struct amdgpu_device *)handle;
......@@ -1519,7 +1536,7 @@ static int smu_resume(void *handle)
return 0;
}
int smu_display_configuration_change(void *handle,
static int smu_display_configuration_change(void *handle,
const struct amd_pp_display_configuration *display_config)
{
struct smu_context *smu = handle;
......@@ -1713,7 +1730,7 @@ int smu_handle_task(struct smu_context *smu,
return ret;
}
int smu_handle_dpm_task(void *handle,
static int smu_handle_dpm_task(void *handle,
enum amd_pp_task task_id,
enum amd_pm_state_type *user_state)
{
......@@ -1724,8 +1741,7 @@ int smu_handle_dpm_task(void *handle,
}
int smu_switch_power_profile(void *handle,
static int smu_switch_power_profile(void *handle,
enum PP_SMC_POWER_PROFILE type,
bool en)
{
......@@ -1763,7 +1779,7 @@ int smu_switch_power_profile(void *handle,
return 0;
}
enum amd_dpm_forced_level smu_get_performance_level(void *handle)
static enum amd_dpm_forced_level smu_get_performance_level(void *handle)
{
struct smu_context *smu = handle;
struct smu_dpm_context *smu_dpm_ctx = &(smu->smu_dpm);
......@@ -1782,7 +1798,8 @@ enum amd_dpm_forced_level smu_get_performance_level(void *handle)
return level;
}
int smu_force_performance_level(void *handle, enum amd_dpm_forced_level level)
static int smu_force_performance_level(void *handle,
enum amd_dpm_forced_level level)
{
struct smu_context *smu = handle;
struct smu_dpm_context *smu_dpm_ctx = &(smu->smu_dpm);
......@@ -1817,7 +1834,7 @@ int smu_force_performance_level(void *handle, enum amd_dpm_forced_level level)
return ret;
}
int smu_set_display_count(void *handle, uint32_t count)
static int smu_set_display_count(void *handle, uint32_t count)
{
struct smu_context *smu = handle;
int ret = 0;
......@@ -1862,7 +1879,9 @@ static int smu_force_smuclk_levels(struct smu_context *smu,
return ret;
}
int smu_force_ppclk_levels(void *handle, enum pp_clock_type type, uint32_t mask)
static int smu_force_ppclk_levels(void *handle,
enum pp_clock_type type,
uint32_t mask)
{
struct smu_context *smu = handle;
enum smu_clk_type clk_type;
......@@ -1906,7 +1925,7 @@ int smu_force_ppclk_levels(void *handle, enum pp_clock_type type, uint32_t mask)
* However, the mp1 state setting should still be granted
* even if the dpm_enabled cleared.
*/
int smu_set_mp1_state(void *handle,
static int smu_set_mp1_state(void *handle,
enum pp_mp1_state mp1_state)
{
struct smu_context *smu = handle;
......@@ -1926,7 +1945,7 @@ int smu_set_mp1_state(void *handle,
return ret;
}
int smu_set_df_cstate(void *handle,
static int smu_set_df_cstate(void *handle,
enum pp_df_cstate state)
{
struct smu_context *smu = handle;
......@@ -1986,7 +2005,7 @@ int smu_write_watermarks_table(struct smu_context *smu)
return ret;
}
int smu_set_watermarks_for_clock_ranges(void *handle,
static int smu_set_watermarks_for_clock_ranges(void *handle,
struct pp_smu_wm_range_sets *clock_ranges)
{
struct smu_context *smu = handle;
......@@ -2124,7 +2143,7 @@ int smu_set_gfx_cgpg(struct smu_context *smu, bool enabled)
return ret;
}
int smu_set_fan_speed_rpm(void *handle, uint32_t speed)
static int smu_set_fan_speed_rpm(void *handle, uint32_t speed)
{
struct smu_context *smu = handle;
u32 percent;
......@@ -2183,7 +2202,7 @@ int smu_get_power_limit(struct smu_context *smu,
return ret;
}
int smu_set_power_limit(void *handle, uint32_t limit)
static int smu_set_power_limit(void *handle, uint32_t limit)
{
struct smu_context *smu = handle;
uint32_t limit_type = limit >> 24;
......@@ -2239,7 +2258,9 @@ static int smu_print_smuclk_levels(struct smu_context *smu, enum smu_clk_type cl
return ret;
}
int smu_print_ppclk_levels(void *handle, enum pp_clock_type type, char *buf)
static int smu_print_ppclk_levels(void *handle,
enum pp_clock_type type,
char *buf)
{
struct smu_context *smu = handle;
enum smu_clk_type clk_type;
......@@ -2280,7 +2301,7 @@ int smu_print_ppclk_levels(void *handle, enum pp_clock_type type, char *buf)
return smu_print_smuclk_levels(smu, clk_type, buf);
}
int smu_od_edit_dpm_table(void *handle,
static int smu_od_edit_dpm_table(void *handle,
enum PP_OD_DPM_TABLE_COMMAND type,
long *input, uint32_t size)
{
......@@ -2301,7 +2322,10 @@ int smu_od_edit_dpm_table(void *handle,
return ret;
}
int smu_read_sensor(void *handle, int sensor, void *data, int *size_arg)
static int smu_read_sensor(void *handle,
int sensor,
void *data,
int *size_arg)
{
struct smu_context *smu = handle;
struct smu_umd_pstate_table *pstate_table =
......@@ -2368,7 +2392,7 @@ int smu_read_sensor(void *handle, int sensor, void *data, int *size_arg)
return ret;
}
int smu_get_power_profile_mode(void *handle, char *buf)
static int smu_get_power_profile_mode(void *handle, char *buf)
{
struct smu_context *smu = handle;
int ret = 0;
......@@ -2386,7 +2410,9 @@ int smu_get_power_profile_mode(void *handle, char *buf)
return ret;
}
int smu_set_power_profile_mode(void *handle, long *param, uint32_t param_size)
static int smu_set_power_profile_mode(void *handle,
long *param,
uint32_t param_size)
{
struct smu_context *smu = handle;
int ret = 0;
......@@ -2404,7 +2430,7 @@ int smu_set_power_profile_mode(void *handle, long *param, uint32_t param_size)
}
u32 smu_get_fan_control_mode(void *handle)
static u32 smu_get_fan_control_mode(void *handle)
{
struct smu_context *smu = handle;
u32 ret = 0;
......@@ -2447,14 +2473,15 @@ int smu_set_fan_control_mode(struct smu_context *smu, int value)
return ret;
}
void smu_pp_set_fan_control_mode(void *handle, u32 value) {
static void smu_pp_set_fan_control_mode(void *handle, u32 value)
{
struct smu_context *smu = handle;
smu_set_fan_control_mode(smu, value);
}
int smu_get_fan_speed_percent(void *handle, u32 *speed)
static int smu_get_fan_speed_percent(void *handle, u32 *speed)
{
struct smu_context *smu = handle;
int ret = 0;
......@@ -2478,7 +2505,7 @@ int smu_get_fan_speed_percent(void *handle, u32 *speed)
return ret;
}
int smu_set_fan_speed_percent(void *handle, u32 speed)
static int smu_set_fan_speed_percent(void *handle, u32 speed)
{
struct smu_context *smu = handle;
int ret = 0;
......@@ -2501,7 +2528,7 @@ int smu_set_fan_speed_percent(void *handle, u32 speed)
return ret;
}
int smu_get_fan_speed_rpm(void *handle, uint32_t *speed)
static int smu_get_fan_speed_rpm(void *handle, uint32_t *speed)
{
struct smu_context *smu = handle;
int ret = 0;
......@@ -2522,7 +2549,7 @@ int smu_get_fan_speed_rpm(void *handle, uint32_t *speed)
return ret;
}
int smu_set_deep_sleep_dcefclk(void *handle, uint32_t clk)
static int smu_set_deep_sleep_dcefclk(void *handle, uint32_t clk)
{
struct smu_context *smu = handle;
int ret = 0;
......@@ -2539,7 +2566,7 @@ int smu_set_deep_sleep_dcefclk(void *handle, uint32_t clk)
return ret;
}
int smu_get_clock_by_type_with_latency(void *handle,
static int smu_get_clock_by_type_with_latency(void *handle,
enum amd_pp_clock_type type,
struct pp_clock_levels_with_latency *clocks)
{
......@@ -2580,7 +2607,7 @@ int smu_get_clock_by_type_with_latency(void *handle,
return ret;
}
int smu_display_clock_voltage_request(void *handle,
static int smu_display_clock_voltage_request(void *handle,
struct pp_display_clock_request *clock_req)
{
struct smu_context *smu = handle;
......@@ -2600,7 +2627,7 @@ int smu_display_clock_voltage_request(void *handle,
}
int smu_display_disable_memory_clock_switch(void *handle,
static int smu_display_disable_memory_clock_switch(void *handle,
bool disable_memory_clock_switch)
{
struct smu_context *smu = handle;
......@@ -2619,7 +2646,7 @@ int smu_display_disable_memory_clock_switch(void *handle,
return ret;
}
int smu_set_xgmi_pstate(void *handle,
static int smu_set_xgmi_pstate(void *handle,
uint32_t pstate)
{
struct smu_context *smu = handle;
......@@ -2683,7 +2710,7 @@ bool smu_baco_is_support(struct smu_context *smu)
return ret;
}
int smu_get_baco_capability(void *handle, bool *cap)
static int smu_get_baco_capability(void *handle, bool *cap)
{
struct smu_context *smu = handle;
int ret = 0;
......@@ -2756,7 +2783,7 @@ int smu_baco_exit(struct smu_context *smu)
return ret;
}
int smu_baco_set_state(void *handle, int state)
static int smu_baco_set_state(void *handle, int state)
{
struct smu_context *smu = handle;
int ret = 0;
......@@ -2841,7 +2868,7 @@ int smu_mode1_reset(struct smu_context *smu)
return ret;
}
int smu_mode2_reset(void *handle)
static int smu_mode2_reset(void *handle)
{
struct smu_context *smu = handle;
int ret = 0;
......@@ -2862,7 +2889,7 @@ int smu_mode2_reset(void *handle)
return ret;
}
int smu_get_max_sustainable_clocks_by_dc(void *handle,
static int smu_get_max_sustainable_clocks_by_dc(void *handle,
struct pp_smu_nv_clock_table *max_clocks)
{
struct smu_context *smu = handle;
......@@ -2881,7 +2908,7 @@ int smu_get_max_sustainable_clocks_by_dc(void *handle,
return ret;
}
int smu_get_uclk_dpm_states(void *handle,
static int smu_get_uclk_dpm_states(void *handle,
unsigned int *clock_values_in_khz,
unsigned int *num_states)
{
......@@ -2901,7 +2928,7 @@ int smu_get_uclk_dpm_states(void *handle,
return ret;
}
enum amd_pm_state_type smu_get_current_power_state(void *handle)
static enum amd_pm_state_type smu_get_current_power_state(void *handle)
{
struct smu_context *smu = handle;
enum amd_pm_state_type pm_state = POWER_STATE_TYPE_DEFAULT;
......@@ -2919,7 +2946,7 @@ enum amd_pm_state_type smu_get_current_power_state(void *handle)
return pm_state;
}
int smu_get_dpm_clock_table(void *handle,
static int smu_get_dpm_clock_table(void *handle,
struct dpm_clocks *clock_table)
{
struct smu_context *smu = handle;
......@@ -2938,7 +2965,7 @@ int smu_get_dpm_clock_table(void *handle,
return ret;
}
ssize_t smu_sys_get_gpu_metrics(void *handle, void **table)
static ssize_t smu_sys_get_gpu_metrics(void *handle, void **table)
{
struct smu_context *smu = handle;
ssize_t size;
......@@ -2958,7 +2985,7 @@ ssize_t smu_sys_get_gpu_metrics(void *handle, void **table)
return size;
}
int smu_enable_mgpu_fan_boost(void *handle)
static int smu_enable_mgpu_fan_boost(void *handle)
{
struct smu_context *smu = handle;
int ret = 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment