Commit 64d03abe authored by Tom St Denis's avatar Tom St Denis Committed by Alex Deucher

drm/amd/powerplay: Fix psm_set_user_performance_state()

We now pass a pointer to a pointer which seems to be
what they meant in the first place.  The previous version
was modifying a pointer passed by value.

Fixes bug that was introduced by

commit 332798d40c2e91:drm/amd/powerplay: delete eventmgr layer in poweprlay
Signed-off-by: default avatarTom St Denis <tom.stdenis@amd.com>
Reviewed-By: default avatarRex Zhu <Rex.Zhu@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent a216ab09
...@@ -294,7 +294,7 @@ int hwmgr_handle_task(struct pp_instance *handle, enum amd_pp_task task_id, ...@@ -294,7 +294,7 @@ int hwmgr_handle_task(struct pp_instance *handle, enum amd_pp_task task_id,
{ {
enum amd_pm_state_type ps; enum amd_pm_state_type ps;
enum PP_StateUILabel requested_ui_label; enum PP_StateUILabel requested_ui_label;
struct pp_power_state *requested_ps; struct pp_power_state *requested_ps = NULL;
if (input == NULL) { if (input == NULL) {
ret = -EINVAL; ret = -EINVAL;
...@@ -303,7 +303,7 @@ int hwmgr_handle_task(struct pp_instance *handle, enum amd_pp_task task_id, ...@@ -303,7 +303,7 @@ int hwmgr_handle_task(struct pp_instance *handle, enum amd_pp_task task_id,
ps = *(unsigned long *)input; ps = *(unsigned long *)input;
requested_ui_label = power_state_convert(ps); requested_ui_label = power_state_convert(ps);
ret = psm_set_user_performance_state(hwmgr, requested_ui_label, requested_ps); ret = psm_set_user_performance_state(hwmgr, requested_ui_label, &requested_ps);
if (ret) if (ret)
return ret; return ret;
ret = psm_adjust_power_state_dynamic(hwmgr, false, requested_ps); ret = psm_adjust_power_state_dynamic(hwmgr, false, requested_ps);
......
...@@ -188,19 +188,19 @@ int psm_set_performance_states(struct pp_hwmgr *hwmgr) ...@@ -188,19 +188,19 @@ int psm_set_performance_states(struct pp_hwmgr *hwmgr)
int psm_set_user_performance_state(struct pp_hwmgr *hwmgr, int psm_set_user_performance_state(struct pp_hwmgr *hwmgr,
enum PP_StateUILabel label_id, enum PP_StateUILabel label_id,
struct pp_power_state *state) struct pp_power_state **state)
{ {
int table_entries; int table_entries;
int i; int i;
table_entries = hwmgr->num_ps; table_entries = hwmgr->num_ps;
state = hwmgr->ps; *state = hwmgr->ps;
restart_search: restart_search:
for (i = 0; i < table_entries; i++) { for (i = 0; i < table_entries; i++) {
if (state->classification.ui_label & label_id) if ((*state)->classification.ui_label & label_id)
return 0; return 0;
state = (struct pp_power_state *)((unsigned long)state + hwmgr->ps_size); *state = (struct pp_power_state *)((uintptr_t)*state + hwmgr->ps_size);
} }
switch (label_id) { switch (label_id) {
......
...@@ -32,7 +32,7 @@ int psm_set_boot_states(struct pp_hwmgr *hwmgr); ...@@ -32,7 +32,7 @@ int psm_set_boot_states(struct pp_hwmgr *hwmgr);
int psm_set_performance_states(struct pp_hwmgr *hwmgr); int psm_set_performance_states(struct pp_hwmgr *hwmgr);
int psm_set_user_performance_state(struct pp_hwmgr *hwmgr, int psm_set_user_performance_state(struct pp_hwmgr *hwmgr,
enum PP_StateUILabel label_id, enum PP_StateUILabel label_id,
struct pp_power_state *state); struct pp_power_state **state);
int psm_adjust_power_state_dynamic(struct pp_hwmgr *hwmgr, int psm_adjust_power_state_dynamic(struct pp_hwmgr *hwmgr,
bool skip, bool skip,
struct pp_power_state *new_ps); struct pp_power_state *new_ps);
......
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