drm/amd/powerplay: remove useless pp_table codes for Tonga/Fiji/Polaris10
Due to uploading pptable implementation changed, the generic codes in previous commit have been used intead of the Asic specific codes. Reviewed-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Eric Huang <JinHuiEric.Huang@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
parent
4dcf9e6f2e
commit
e8c1fe9f50
|
@ -5296,42 +5296,6 @@ static int fiji_get_fan_control_mode(struct pp_hwmgr *hwmgr)
|
|||
CG_FDO_CTRL2, FDO_PWM_MODE);
|
||||
}
|
||||
|
||||
static int fiji_get_pp_table(struct pp_hwmgr *hwmgr, char **table)
|
||||
{
|
||||
struct fiji_hwmgr *data = (struct fiji_hwmgr *)(hwmgr->backend);
|
||||
|
||||
if (!data->soft_pp_table) {
|
||||
data->soft_pp_table = kmemdup(hwmgr->soft_pp_table,
|
||||
hwmgr->soft_pp_table_size,
|
||||
GFP_KERNEL);
|
||||
if (!data->soft_pp_table)
|
||||
return -ENOMEM;
|
||||
}
|
||||
|
||||
*table = (char *)&data->soft_pp_table;
|
||||
|
||||
return hwmgr->soft_pp_table_size;
|
||||
}
|
||||
|
||||
static int fiji_set_pp_table(struct pp_hwmgr *hwmgr, const char *buf, size_t size)
|
||||
{
|
||||
struct fiji_hwmgr *data = (struct fiji_hwmgr *)(hwmgr->backend);
|
||||
|
||||
if (!data->soft_pp_table) {
|
||||
data->soft_pp_table = kzalloc(hwmgr->soft_pp_table_size, GFP_KERNEL);
|
||||
if (!data->soft_pp_table)
|
||||
return -ENOMEM;
|
||||
}
|
||||
|
||||
memcpy(data->soft_pp_table, buf, size);
|
||||
|
||||
hwmgr->soft_pp_table = data->soft_pp_table;
|
||||
|
||||
/* TODO: re-init powerplay to implement modified pptable */
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int fiji_force_clock_level(struct pp_hwmgr *hwmgr,
|
||||
enum pp_clock_type type, uint32_t mask)
|
||||
{
|
||||
|
@ -5623,8 +5587,6 @@ static const struct pp_hwmgr_func fiji_hwmgr_funcs = {
|
|||
.get_fan_control_mode = fiji_get_fan_control_mode,
|
||||
.check_states_equal = fiji_check_states_equal,
|
||||
.check_smc_update_required_for_display_configuration = fiji_check_smc_update_required_for_display_configuration,
|
||||
.get_pp_table = fiji_get_pp_table,
|
||||
.set_pp_table = fiji_set_pp_table,
|
||||
.force_clock_level = fiji_force_clock_level,
|
||||
.print_clock_levels = fiji_print_clock_levels,
|
||||
.get_sclk_od = fiji_get_sclk_od,
|
||||
|
|
|
@ -4959,42 +4959,6 @@ int polaris10_setup_asic_task(struct pp_hwmgr *hwmgr)
|
|||
return result;
|
||||
}
|
||||
|
||||
static int polaris10_get_pp_table(struct pp_hwmgr *hwmgr, char **table)
|
||||
{
|
||||
struct polaris10_hwmgr *data = (struct polaris10_hwmgr *)(hwmgr->backend);
|
||||
|
||||
if (!data->soft_pp_table) {
|
||||
data->soft_pp_table = kmemdup(hwmgr->soft_pp_table,
|
||||
hwmgr->soft_pp_table_size,
|
||||
GFP_KERNEL);
|
||||
if (!data->soft_pp_table)
|
||||
return -ENOMEM;
|
||||
}
|
||||
|
||||
*table = (char *)&data->soft_pp_table;
|
||||
|
||||
return hwmgr->soft_pp_table_size;
|
||||
}
|
||||
|
||||
static int polaris10_set_pp_table(struct pp_hwmgr *hwmgr, const char *buf, size_t size)
|
||||
{
|
||||
struct polaris10_hwmgr *data = (struct polaris10_hwmgr *)(hwmgr->backend);
|
||||
|
||||
if (!data->soft_pp_table) {
|
||||
data->soft_pp_table = kzalloc(hwmgr->soft_pp_table_size, GFP_KERNEL);
|
||||
if (!data->soft_pp_table)
|
||||
return -ENOMEM;
|
||||
}
|
||||
|
||||
memcpy(data->soft_pp_table, buf, size);
|
||||
|
||||
hwmgr->soft_pp_table = data->soft_pp_table;
|
||||
|
||||
/* TODO: re-init powerplay to implement modified pptable */
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int polaris10_force_clock_level(struct pp_hwmgr *hwmgr,
|
||||
enum pp_clock_type type, uint32_t mask)
|
||||
{
|
||||
|
@ -5258,8 +5222,6 @@ static const struct pp_hwmgr_func polaris10_hwmgr_funcs = {
|
|||
.check_states_equal = polaris10_check_states_equal,
|
||||
.set_fan_control_mode = polaris10_set_fan_control_mode,
|
||||
.get_fan_control_mode = polaris10_get_fan_control_mode,
|
||||
.get_pp_table = polaris10_get_pp_table,
|
||||
.set_pp_table = polaris10_set_pp_table,
|
||||
.force_clock_level = polaris10_force_clock_level,
|
||||
.print_clock_levels = polaris10_print_clock_levels,
|
||||
.enable_per_cu_power_gating = polaris10_phm_enable_per_cu_power_gating,
|
||||
|
|
|
@ -6037,42 +6037,6 @@ static int tonga_get_fan_control_mode(struct pp_hwmgr *hwmgr)
|
|||
CG_FDO_CTRL2, FDO_PWM_MODE);
|
||||
}
|
||||
|
||||
static int tonga_get_pp_table(struct pp_hwmgr *hwmgr, char **table)
|
||||
{
|
||||
struct tonga_hwmgr *data = (struct tonga_hwmgr *)(hwmgr->backend);
|
||||
|
||||
if (!data->soft_pp_table) {
|
||||
data->soft_pp_table = kmemdup(hwmgr->soft_pp_table,
|
||||
hwmgr->soft_pp_table_size,
|
||||
GFP_KERNEL);
|
||||
if (!data->soft_pp_table)
|
||||
return -ENOMEM;
|
||||
}
|
||||
|
||||
*table = (char *)&data->soft_pp_table;
|
||||
|
||||
return hwmgr->soft_pp_table_size;
|
||||
}
|
||||
|
||||
static int tonga_set_pp_table(struct pp_hwmgr *hwmgr, const char *buf, size_t size)
|
||||
{
|
||||
struct tonga_hwmgr *data = (struct tonga_hwmgr *)(hwmgr->backend);
|
||||
|
||||
if (!data->soft_pp_table) {
|
||||
data->soft_pp_table = kzalloc(hwmgr->soft_pp_table_size, GFP_KERNEL);
|
||||
if (!data->soft_pp_table)
|
||||
return -ENOMEM;
|
||||
}
|
||||
|
||||
memcpy(data->soft_pp_table, buf, size);
|
||||
|
||||
hwmgr->soft_pp_table = data->soft_pp_table;
|
||||
|
||||
/* TODO: re-init powerplay to implement modified pptable */
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int tonga_force_clock_level(struct pp_hwmgr *hwmgr,
|
||||
enum pp_clock_type type, uint32_t mask)
|
||||
{
|
||||
|
@ -6303,8 +6267,6 @@ static const struct pp_hwmgr_func tonga_hwmgr_funcs = {
|
|||
.check_states_equal = tonga_check_states_equal,
|
||||
.set_fan_control_mode = tonga_set_fan_control_mode,
|
||||
.get_fan_control_mode = tonga_get_fan_control_mode,
|
||||
.get_pp_table = tonga_get_pp_table,
|
||||
.set_pp_table = tonga_set_pp_table,
|
||||
.force_clock_level = tonga_force_clock_level,
|
||||
.print_clock_levels = tonga_print_clock_levels,
|
||||
.get_sclk_od = tonga_get_sclk_od,
|
||||
|
|
|
@ -335,8 +335,6 @@ struct pp_hwmgr_func {
|
|||
int (*get_clock_by_type)(struct pp_hwmgr *hwmgr, enum amd_pp_clock_type type, struct amd_pp_clocks *clocks);
|
||||
int (*get_max_high_clocks)(struct pp_hwmgr *hwmgr, struct amd_pp_simple_clock_info *clocks);
|
||||
int (*power_off_asic)(struct pp_hwmgr *hwmgr);
|
||||
int (*get_pp_table)(struct pp_hwmgr *hwmgr, char **table);
|
||||
int (*set_pp_table)(struct pp_hwmgr *hwmgr, const char *buf, size_t size);
|
||||
int (*force_clock_level)(struct pp_hwmgr *hwmgr, enum pp_clock_type type, uint32_t mask);
|
||||
int (*print_clock_levels)(struct pp_hwmgr *hwmgr, enum pp_clock_type type, char *buf);
|
||||
int (*enable_per_cu_power_gating)(struct pp_hwmgr *hwmgr, bool enable);
|
||||
|
|
Loading…
Reference in New Issue