aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRex Zhu <Rex.Zhu@amd.com>2015-12-28 22:19:14 -0500
committerAlex Deucher <alexander.deucher@amd.com>2016-01-08 15:39:26 -0500
commit018462d015c5672de0be8045b1acff19f5df6010 (patch)
treebc879d8de0d41a518d6c921388c65c83d2816350
parentf556c2744a8e7508493cf409849d5a248ed3fb9d (diff)
drm/amd/powerplay: enable set boot state task
Signed-off-by: Rex Zhu <Rex.Zhu@amd.com> Reviewed-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-rw-r--r--drivers/gpu/drm/amd/powerplay/eventmgr/eventtasks.c6
-rw-r--r--drivers/gpu/drm/amd/powerplay/eventmgr/psm.c3
-rw-r--r--drivers/gpu/drm/amd/powerplay/eventmgr/psm.h2
3 files changed, 6 insertions, 5 deletions
diff --git a/drivers/gpu/drm/amd/powerplay/eventmgr/eventtasks.c b/drivers/gpu/drm/amd/powerplay/eventmgr/eventtasks.c
index f0700d077925..f0b449157653 100644
--- a/drivers/gpu/drm/amd/powerplay/eventmgr/eventtasks.c
+++ b/drivers/gpu/drm/amd/powerplay/eventmgr/eventtasks.c
@@ -74,7 +74,9 @@ int pem_task_power_down_asic(struct pp_eventmgr *eventmgr, struct pem_event_data
74 74
75int pem_task_set_boot_state(struct pp_eventmgr *eventmgr, struct pem_event_data *event_data) 75int pem_task_set_boot_state(struct pp_eventmgr *eventmgr, struct pem_event_data *event_data)
76{ 76{
77 /* TODO */ 77 if (pem_is_event_data_valid(event_data->valid_fields, PEM_EventDataValid_RequestedStateID))
78 return psm_set_states(eventmgr, &(event_data->requested_state_id));
79
78 return 0; 80 return 0;
79} 81}
80 82
@@ -343,7 +345,7 @@ int pem_task_disable_gfx_clock_gating(struct pp_eventmgr *eventmgr, struct pem_e
343int pem_task_set_performance_state(struct pp_eventmgr *eventmgr, struct pem_event_data *event_data) 345int pem_task_set_performance_state(struct pp_eventmgr *eventmgr, struct pem_event_data *event_data)
344{ 346{
345 if (pem_is_event_data_valid(event_data->valid_fields, PEM_EventDataValid_RequestedStateID)) 347 if (pem_is_event_data_valid(event_data->valid_fields, PEM_EventDataValid_RequestedStateID))
346 return psm_set_performance_states(eventmgr, &(event_data->requested_state_id)); 348 return psm_set_states(eventmgr, &(event_data->requested_state_id));
347 349
348 return 0; 350 return 0;
349} 351}
diff --git a/drivers/gpu/drm/amd/powerplay/eventmgr/psm.c b/drivers/gpu/drm/amd/powerplay/eventmgr/psm.c
index 5740fbfcbeab..a46225c0fc01 100644
--- a/drivers/gpu/drm/amd/powerplay/eventmgr/psm.c
+++ b/drivers/gpu/drm/amd/powerplay/eventmgr/psm.c
@@ -62,7 +62,7 @@ int psm_get_state_by_classification(struct pp_eventmgr *eventmgr, enum PP_StateC
62 return -1; 62 return -1;
63} 63}
64 64
65int psm_set_performance_states(struct pp_eventmgr *eventmgr, unsigned long *state_id) 65int psm_set_states(struct pp_eventmgr *eventmgr, unsigned long *state_id)
66{ 66{
67 struct pp_power_state *state; 67 struct pp_power_state *state;
68 int table_entries; 68 int table_entries;
@@ -82,7 +82,6 @@ int psm_set_performance_states(struct pp_eventmgr *eventmgr, unsigned long *stat
82 return -1; 82 return -1;
83} 83}
84 84
85
86int psm_adjust_power_state_dynamic(struct pp_eventmgr *eventmgr, bool skip) 85int psm_adjust_power_state_dynamic(struct pp_eventmgr *eventmgr, bool skip)
87{ 86{
88 87
diff --git a/drivers/gpu/drm/amd/powerplay/eventmgr/psm.h b/drivers/gpu/drm/amd/powerplay/eventmgr/psm.h
index 1380470fdb1c..fbdff3e02aa3 100644
--- a/drivers/gpu/drm/amd/powerplay/eventmgr/psm.h
+++ b/drivers/gpu/drm/amd/powerplay/eventmgr/psm.h
@@ -31,7 +31,7 @@ int psm_get_ui_state(struct pp_eventmgr *eventmgr, enum PP_StateUILabel ui_label
31 31
32int psm_get_state_by_classification(struct pp_eventmgr *eventmgr, enum PP_StateClassificationFlag flag, unsigned long *state_id); 32int psm_get_state_by_classification(struct pp_eventmgr *eventmgr, enum PP_StateClassificationFlag flag, unsigned long *state_id);
33 33
34int psm_set_performance_states(struct pp_eventmgr *eventmgr, unsigned long *state_id); 34int psm_set_states(struct pp_eventmgr *eventmgr, unsigned long *state_id);
35 35
36int psm_adjust_power_state_dynamic(struct pp_eventmgr *eventmgr, bool skip); 36int psm_adjust_power_state_dynamic(struct pp_eventmgr *eventmgr, bool skip);
37 37