diff options
| author | Rex Zhu <Rex.Zhu@amd.com> | 2015-11-19 13:47:02 +0800 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2015-12-21 16:42:41 -0500 |
| commit | 73afe621016645ec9dbeacefd6a38cc7054ec8c4 (patch) | |
| tree | 30f92fa727d13b8741d3043288de86c841e94836 /drivers | |
| parent | 7fb72a1fc01cc1a8de533abc80b9eaf0120e8529 (diff) | |
| download | linux-73afe621016645ec9dbeacefd6a38cc7054ec8c4.tar.bz2 | |
drm/amd/powerplay: enable set_cpu_power_state task. (v2)
v2: integrate Jammy's crash fix
Signed-off-by: Rex Zhu <Rex.Zhu@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: Jammy Zhou <Jammy.Zhou@amd.com>
Diffstat (limited to 'drivers')
6 files changed, 21 insertions, 5 deletions
diff --git a/drivers/gpu/drm/amd/powerplay/eventmgr/eventactionchains.c b/drivers/gpu/drm/amd/powerplay/eventmgr/eventactionchains.c index bbbb76ca9002..9458394aec05 100644 --- a/drivers/gpu/drm/amd/powerplay/eventmgr/eventactionchains.c +++ b/drivers/gpu/drm/amd/powerplay/eventmgr/eventactionchains.c @@ -260,7 +260,7 @@ const struct action_chain disable_user_2d_performance_action_chain = { static const pem_event_action *display_config_change_event[] = { /* countDisplayConfigurationChangeEventTasks, */ unblock_adjust_power_state_tasks, - /* setCPUPowerState,*/ + set_cpu_power_state, notify_hw_power_source_tasks, /* updateDALConfigurationTasks, variBrightDisplayConfigurationChangeTasks, */ diff --git a/drivers/gpu/drm/amd/powerplay/eventmgr/eventsubchains.c b/drivers/gpu/drm/amd/powerplay/eventmgr/eventsubchains.c index 3dd671eb65eb..9ef2d90e2886 100644 --- a/drivers/gpu/drm/amd/powerplay/eventmgr/eventsubchains.c +++ b/drivers/gpu/drm/amd/powerplay/eventmgr/eventsubchains.c @@ -403,3 +403,8 @@ const pem_event_action uninitialize_thermal_controller_tasks[] = { pem_task_uninitialize_thermal_controller, NULL }; + +const pem_event_action set_cpu_power_state[] = { + pem_task_set_cpu_power_state, + NULL +};
\ No newline at end of file diff --git a/drivers/gpu/drm/amd/powerplay/eventmgr/eventsubchains.h b/drivers/gpu/drm/amd/powerplay/eventmgr/eventsubchains.h index 741ebfcf18b6..7714cb927428 100644 --- a/drivers/gpu/drm/amd/powerplay/eventmgr/eventsubchains.h +++ b/drivers/gpu/drm/amd/powerplay/eventmgr/eventsubchains.h @@ -96,4 +96,5 @@ extern const pem_event_action reset_boot_state_tasks[]; extern const pem_event_action create_new_user_performance_state_tasks[]; extern const pem_event_action initialize_thermal_controller_tasks[]; extern const pem_event_action uninitialize_thermal_controller_tasks[]; +extern const pem_event_action set_cpu_power_state[]; #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 618aadf14cff..0a03f798773e 100644 --- a/drivers/gpu/drm/amd/powerplay/eventmgr/eventtasks.c +++ b/drivers/gpu/drm/amd/powerplay/eventmgr/eventtasks.c @@ -248,8 +248,7 @@ int pem_task_reset_display_phys_access(struct pp_eventmgr *eventmgr, struct pem_ int pem_task_set_cpu_power_state(struct pp_eventmgr *eventmgr, struct pem_event_data *event_data) { - /* TODO */ - return 0; + return phm_set_cpu_power_state(eventmgr->hwmgr); } /*powersaving*/ diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/hardwaremanager.c b/drivers/gpu/drm/amd/powerplay/hwmgr/hardwaremanager.c index d6d28497d7d9..31b0dc3b10a2 100644 --- a/drivers/gpu/drm/amd/powerplay/hwmgr/hardwaremanager.c +++ b/drivers/gpu/drm/amd/powerplay/hwmgr/hardwaremanager.c @@ -180,7 +180,7 @@ int phm_display_configuration_changed(struct pp_hwmgr *hwmgr) hwmgr->hwmgr_func->display_config_changed(hwmgr); } else return phm_dispatch_table(hwmgr, &hwmgr->display_configuration_changed, NULL, NULL); - return 0; + return 0; } int phm_notify_smc_display_config_after_ps_adjustment(struct pp_hwmgr *hwmgr) @@ -193,7 +193,7 @@ int phm_notify_smc_display_config_after_ps_adjustment(struct pp_hwmgr *hwmgr) if (NULL != hwmgr->hwmgr_func->display_config_changed) hwmgr->hwmgr_func->notify_smc_display_config_after_ps_adjustment(hwmgr); - return 0; + return 0; } int phm_stop_thermal_controller(struct pp_hwmgr *hwmgr) @@ -260,3 +260,12 @@ int phm_store_dal_configuration_data(struct pp_hwmgr *hwmgr, display_config->nb_pstate_switch_disable); } + +int phm_set_cpu_power_state(struct pp_hwmgr *hwmgr) +{ + if (hwmgr != NULL && hwmgr->hwmgr_func->set_cpu_power_state != NULL) + return hwmgr->hwmgr_func->set_cpu_power_state(hwmgr); + + return 0; +} + diff --git a/drivers/gpu/drm/amd/powerplay/inc/hardwaremanager.h b/drivers/gpu/drm/amd/powerplay/inc/hardwaremanager.h index 7b721e8ea531..820622dfe753 100644 --- a/drivers/gpu/drm/amd/powerplay/inc/hardwaremanager.h +++ b/drivers/gpu/drm/amd/powerplay/inc/hardwaremanager.h @@ -356,5 +356,7 @@ extern int phm_check_states_equal(struct pp_hwmgr *hwmgr, extern int phm_store_dal_configuration_data(struct pp_hwmgr *hwmgr, const struct amd_pp_display_configuration *display_config); +extern int phm_set_cpu_power_state(struct pp_hwmgr *hwmgr); + #endif /* _HARDWARE_MANAGER_H_ */ |