Commit a72d5604 authored by Eric Huang's avatar Eric Huang Committed by Alex Deucher

drm/amd/powerplay: revise reading/writing pptable on Polaris10

Change the way we store pptables in the driver to better
facilitate eventual runtime updates for debugging.
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarEric Huang <JinHuiEric.Huang@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 92dea67d
...@@ -2560,6 +2560,13 @@ int polaris10_reset_asic_tasks(struct pp_hwmgr *hwmgr) ...@@ -2560,6 +2560,13 @@ int polaris10_reset_asic_tasks(struct pp_hwmgr *hwmgr)
int polaris10_hwmgr_backend_fini(struct pp_hwmgr *hwmgr) int polaris10_hwmgr_backend_fini(struct pp_hwmgr *hwmgr)
{ {
struct polaris10_hwmgr *data = (struct polaris10_hwmgr *)(hwmgr->backend);
if (data->soft_pp_table) {
kfree(data->soft_pp_table);
data->soft_pp_table = NULL;
}
return phm_hwmgr_backend_fini(hwmgr); return phm_hwmgr_backend_fini(hwmgr);
} }
...@@ -4750,18 +4757,34 @@ static int polaris10_get_pp_table(struct pp_hwmgr *hwmgr, char **table) ...@@ -4750,18 +4757,34 @@ static int polaris10_get_pp_table(struct pp_hwmgr *hwmgr, char **table)
{ {
struct polaris10_hwmgr *data = (struct polaris10_hwmgr *)(hwmgr->backend); struct polaris10_hwmgr *data = (struct polaris10_hwmgr *)(hwmgr->backend);
*table = (char *)&data->smc_state_table; 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, hwmgr->soft_pp_table,
hwmgr->soft_pp_table_size);
}
return sizeof(struct SMU74_Discrete_DpmTable); *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) 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); struct polaris10_hwmgr *data = (struct polaris10_hwmgr *)(hwmgr->backend);
void *table = (void *)&data->smc_state_table; 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;
memcpy(table, buf, size); /* TODO: re-init powerplay to implement modified pptable */
return 0; return 0;
} }
......
...@@ -309,6 +309,9 @@ struct polaris10_hwmgr { ...@@ -309,6 +309,9 @@ struct polaris10_hwmgr {
uint32_t up_hyst; uint32_t up_hyst;
uint32_t disable_dpm_mask; uint32_t disable_dpm_mask;
bool apply_optimized_settings; bool apply_optimized_settings;
/* soft pptable for re-uploading into smu */
void *soft_pp_table;
}; };
/* To convert to Q8.8 format for firmware */ /* To convert to Q8.8 format for firmware */
......
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