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: Tom St Denis <tom.stdenis@amd.com>
Reviewed-By: Rex Zhu <Rex.Zhu@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c
index c6157bcdf7d690063178c4acace1504609f563be..4f1b932361b252aa7841f1d1cffee9f0c8fc7e58 100644 (file)
--- a/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c
+++ b/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c
@@ -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 PP_StateUILabel requested_ui_label;
-               struct pp_power_state *requested_ps;
+               struct pp_power_state *requested_ps = NULL;
 
                if (input == NULL) {
                        ret = -EINVAL;
@@ -303,7 +303,7 @@ int hwmgr_handle_task(struct pp_instance *handle, enum amd_pp_task task_id,
                ps = *(unsigned long *)input;
 
                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)
                        return ret;
                ret = psm_adjust_power_state_dynamic(hwmgr, false, requested_ps);

diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/pp_psm.c b/drivers/gpu/drm/amd/powerplay/hwmgr/pp_psm.c
index 7656324957a8d54537959904fd7cc5ab20e6f173..167cdc321db282754c788b48973480e567e36a47 100644 (file)
--- a/drivers/gpu/drm/amd/powerplay/hwmgr/pp_psm.c
+++ b/drivers/gpu/drm/amd/powerplay/hwmgr/pp_psm.c
@@ -188,19 +188,19 @@ int psm_set_performance_states(struct pp_hwmgr *hwmgr)
 
 int psm_set_user_performance_state(struct pp_hwmgr *hwmgr,
                                        enum PP_StateUILabel label_id,
-                                       struct pp_power_state *state)
+                                       struct pp_power_state **state)
 {
        int table_entries;
        int i;
 
        table_entries = hwmgr->num_ps;
-       state = hwmgr->ps;
+       *state = hwmgr->ps;
 
 restart_search:
        for (i = 0; i < table_entries; i++) {
-               if (state->classification.ui_label & label_id)
+               if ((*state)->classification.ui_label & label_id)
                        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) {

diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/pp_psm.h b/drivers/gpu/drm/amd/powerplay/hwmgr/pp_psm.h
index aa44e60ec1b6ea3572a5af19696d5e4e8ff55922..fa1b6825036a1c2ad45bfaa577ca40de46a0230f 100644 (file)
--- a/drivers/gpu/drm/amd/powerplay/hwmgr/pp_psm.h
+++ b/drivers/gpu/drm/amd/powerplay/hwmgr/pp_psm.h
@@ -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_user_performance_state(struct pp_hwmgr *hwmgr,
                                        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,
                                bool skip,
                                struct pp_power_state *new_ps);