diff options
author | Rex Zhu <Rex.Zhu@amd.com> | 2015-10-16 08:32:36 -0400 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2015-12-21 16:42:25 -0500 |
commit | 2dfea9cd1ffe3aacbf52a913257ab3adedfe1ac1 (patch) | |
tree | 463b5a1b86fd37a3c74fefa1ab9caa4c90b10da5 /drivers | |
parent | fba4eef5847a1c9c8b49c039bc8aa6c9070d058e (diff) |
drm/amdgpu/powerplay: enable thermal interrupt task in eventmgr.
Add thermal handling to the event manager.
Signed-off-by: Rex Zhu <Rex.Zhu@amd.com>
Reviewed-by: Jammy Zhou <Jammy.Zhou@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers')
6 files changed, 48 insertions, 4 deletions
diff --git a/drivers/gpu/drm/amd/powerplay/eventmgr/eventactionchains.c b/drivers/gpu/drm/amd/powerplay/eventmgr/eventactionchains.c index e9fe85fca292..bbbb76ca9002 100644 --- a/drivers/gpu/drm/amd/powerplay/eventmgr/eventactionchains.c +++ b/drivers/gpu/drm/amd/powerplay/eventmgr/eventactionchains.c | |||
@@ -33,6 +33,7 @@ static const pem_event_action *initialize_event[] = { | |||
33 | enable_clock_power_gatings_tasks, | 33 | enable_clock_power_gatings_tasks, |
34 | get_2d_performance_state_tasks, | 34 | get_2d_performance_state_tasks, |
35 | set_performance_state_tasks, | 35 | set_performance_state_tasks, |
36 | initialize_thermal_controller_tasks, | ||
36 | conditionally_force_3d_performance_state_tasks, | 37 | conditionally_force_3d_performance_state_tasks, |
37 | process_vbios_eventinfo_tasks, | 38 | process_vbios_eventinfo_tasks, |
38 | broadcast_power_policy_tasks, | 39 | broadcast_power_policy_tasks, |
diff --git a/drivers/gpu/drm/amd/powerplay/eventmgr/eventinit.c b/drivers/gpu/drm/amd/powerplay/eventmgr/eventinit.c index 04384426e548..d5ec8ccbe97d 100644 --- a/drivers/gpu/drm/amd/powerplay/eventmgr/eventinit.c +++ b/drivers/gpu/drm/amd/powerplay/eventmgr/eventinit.c | |||
@@ -22,6 +22,8 @@ | |||
22 | */ | 22 | */ |
23 | #include "eventmgr.h" | 23 | #include "eventmgr.h" |
24 | #include "eventinit.h" | 24 | #include "eventinit.h" |
25 | #include "ppinterrupt.h" | ||
26 | #include "hardwaremanager.h" | ||
25 | 27 | ||
26 | void pem_init_feature_info(struct pp_eventmgr *eventmgr) | 28 | void pem_init_feature_info(struct pp_eventmgr *eventmgr) |
27 | { | 29 | { |
@@ -145,12 +147,25 @@ void pem_init_feature_info(struct pp_eventmgr *eventmgr) | |||
145 | eventmgr->features[PP_Feature_ViPG].enabled = false; | 147 | eventmgr->features[PP_Feature_ViPG].enabled = false; |
146 | } | 148 | } |
147 | 149 | ||
150 | static int thermal_interrupt_callback(void *private_data, | ||
151 | unsigned src_id, const uint32_t *iv_entry) | ||
152 | { | ||
153 | /* TO DO hanle PEM_Event_ThermalNotification (struct pp_eventmgr *)private_data*/ | ||
154 | printk("current thermal is out of range \n"); | ||
155 | return 0; | ||
156 | } | ||
157 | |||
148 | int pem_register_interrupts(struct pp_eventmgr *eventmgr) | 158 | int pem_register_interrupts(struct pp_eventmgr *eventmgr) |
149 | { | 159 | { |
150 | int result = 0; | 160 | int result = 0; |
161 | struct pp_interrupt_registration_info info; | ||
162 | |||
163 | info.call_back = thermal_interrupt_callback; | ||
164 | info.context = eventmgr; | ||
165 | |||
166 | result = phm_register_thermal_interrupt(eventmgr->hwmgr, &info); | ||
151 | 167 | ||
152 | /* TODO: | 168 | /* TODO: |
153 | * 1. Register thermal events interrupt | ||
154 | * 2. Register CTF event interrupt | 169 | * 2. Register CTF event interrupt |
155 | * 3. Register for vbios events interrupt | 170 | * 3. Register for vbios events interrupt |
156 | * 4. Register External Throttle Interrupt | 171 | * 4. Register External Throttle Interrupt |
diff --git a/drivers/gpu/drm/amd/powerplay/eventmgr/eventsubchains.c b/drivers/gpu/drm/amd/powerplay/eventmgr/eventsubchains.c index e5dd86d23045..3dd671eb65eb 100644 --- a/drivers/gpu/drm/amd/powerplay/eventmgr/eventsubchains.c +++ b/drivers/gpu/drm/amd/powerplay/eventmgr/eventsubchains.c | |||
@@ -393,3 +393,13 @@ const pem_event_action create_new_user_performance_state_tasks[] = { | |||
393 | pem_task_create_user_performance_state, | 393 | pem_task_create_user_performance_state, |
394 | NULL | 394 | NULL |
395 | }; | 395 | }; |
396 | |||
397 | const pem_event_action initialize_thermal_controller_tasks[] = { | ||
398 | pem_task_initialize_thermal_controller, | ||
399 | NULL | ||
400 | }; | ||
401 | |||
402 | const pem_event_action uninitialize_thermal_controller_tasks[] = { | ||
403 | pem_task_uninitialize_thermal_controller, | ||
404 | NULL | ||
405 | }; | ||
diff --git a/drivers/gpu/drm/amd/powerplay/eventmgr/eventsubchains.h b/drivers/gpu/drm/amd/powerplay/eventmgr/eventsubchains.h index 27e0e610650a..741ebfcf18b6 100644 --- a/drivers/gpu/drm/amd/powerplay/eventmgr/eventsubchains.h +++ b/drivers/gpu/drm/amd/powerplay/eventmgr/eventsubchains.h | |||
@@ -94,5 +94,6 @@ extern const pem_event_action enable_stutter_mode_tasks[]; | |||
94 | extern const pem_event_action enable_disable_bapm_tasks[]; | 94 | extern const pem_event_action enable_disable_bapm_tasks[]; |
95 | extern const pem_event_action reset_boot_state_tasks[]; | 95 | extern const pem_event_action reset_boot_state_tasks[]; |
96 | extern const pem_event_action create_new_user_performance_state_tasks[]; | 96 | extern const pem_event_action create_new_user_performance_state_tasks[]; |
97 | 97 | extern const pem_event_action initialize_thermal_controller_tasks[]; | |
98 | extern const pem_event_action uninitialize_thermal_controller_tasks[]; | ||
98 | #endif /* _EVENT_SUB_CHAINS_H_ */ | 99 | #endif /* _EVENT_SUB_CHAINS_H_ */ |
diff --git a/drivers/gpu/drm/amd/powerplay/eventmgr/eventtasks.c b/drivers/gpu/drm/amd/powerplay/eventmgr/eventtasks.c index 8ca32803c2ed..fdd67c65c724 100644 --- a/drivers/gpu/drm/amd/powerplay/eventmgr/eventtasks.c +++ b/drivers/gpu/drm/amd/powerplay/eventmgr/eventtasks.c | |||
@@ -32,6 +32,9 @@ | |||
32 | #include "amd_powerplay.h" | 32 | #include "amd_powerplay.h" |
33 | #include "psm.h" | 33 | #include "psm.h" |
34 | 34 | ||
35 | #define TEMP_RANGE_MIN (90 * 1000) | ||
36 | #define TEMP_RANGE_MAX (120 * 1000) | ||
37 | |||
35 | int pem_task_update_allowed_performance_levels(struct pp_eventmgr *eventmgr, struct pem_event_data *event_data) | 38 | int pem_task_update_allowed_performance_levels(struct pp_eventmgr *eventmgr, struct pem_event_data *event_data) |
36 | { | 39 | { |
37 | 40 | ||
@@ -104,8 +107,6 @@ int pem_task_unregister_interrupts(struct pp_eventmgr *eventmgr, struct pem_even | |||
104 | return pem_unregister_interrupts(eventmgr); | 107 | return pem_unregister_interrupts(eventmgr); |
105 | } | 108 | } |
106 | 109 | ||
107 | |||
108 | |||
109 | int pem_task_get_boot_state_id(struct pp_eventmgr *eventmgr, struct pem_event_data *event_data) | 110 | int pem_task_get_boot_state_id(struct pp_eventmgr *eventmgr, struct pem_event_data *event_data) |
110 | { | 111 | { |
111 | int result; | 112 | int result; |
@@ -415,3 +416,16 @@ restart_search: | |||
415 | return -1; | 416 | return -1; |
416 | } | 417 | } |
417 | 418 | ||
419 | int pem_task_initialize_thermal_controller(struct pp_eventmgr *eventmgr, struct pem_event_data *event_data) | ||
420 | { | ||
421 | struct PP_TemperatureRange range; | ||
422 | range.max = TEMP_RANGE_MAX; | ||
423 | range.min = TEMP_RANGE_MIN; | ||
424 | |||
425 | return phm_start_thermal_controller(eventmgr->hwmgr, &range); | ||
426 | } | ||
427 | |||
428 | int pem_task_uninitialize_thermal_controller(struct pp_eventmgr *eventmgr, struct pem_event_data *event_data) | ||
429 | { | ||
430 | return phm_stop_thermal_controller(eventmgr->hwmgr); | ||
431 | } \ No newline at end of file | ||
diff --git a/drivers/gpu/drm/amd/powerplay/eventmgr/eventtasks.h b/drivers/gpu/drm/amd/powerplay/eventmgr/eventtasks.h index 287c87cede77..6c6297e3b598 100644 --- a/drivers/gpu/drm/amd/powerplay/eventmgr/eventtasks.h +++ b/drivers/gpu/drm/amd/powerplay/eventmgr/eventtasks.h | |||
@@ -81,5 +81,8 @@ int pem_task_conditionally_force_3d_performance_state(struct pp_eventmgr *eventm | |||
81 | int pem_task_get_2D_performance_state_id(struct pp_eventmgr *eventmgr, struct pem_event_data *event_data); | 81 | int pem_task_get_2D_performance_state_id(struct pp_eventmgr *eventmgr, struct pem_event_data *event_data); |
82 | int pem_task_create_user_performance_state(struct pp_eventmgr *eventmgr, struct pem_event_data *event_data); | 82 | int pem_task_create_user_performance_state(struct pp_eventmgr *eventmgr, struct pem_event_data *event_data); |
83 | int pem_task_update_allowed_performance_levels(struct pp_eventmgr *eventmgr, struct pem_event_data *event_data); | 83 | int pem_task_update_allowed_performance_levels(struct pp_eventmgr *eventmgr, struct pem_event_data *event_data); |
84 | /*thermal */ | ||
85 | int pem_task_initialize_thermal_controller(struct pp_eventmgr *eventmgr, struct pem_event_data *event_data); | ||
86 | int pem_task_uninitialize_thermal_controller(struct pp_eventmgr *eventmgr, struct pem_event_data *event_data); | ||
84 | 87 | ||
85 | #endif /* _EVENT_TASKS_H_ */ | 88 | #endif /* _EVENT_TASKS_H_ */ |