diff options
author | Rex Zhu <Rex.Zhu@amd.com> | 2015-12-17 01:20:06 -0500 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2015-12-21 16:42:57 -0500 |
commit | cae9b9c81bde812590cdac7df32ad5662741b3d5 (patch) | |
tree | f30adb0b78d4c46ff61e9b0004b4e74355863bfa | |
parent | 88b8dcbe21fda8024827a6559af596f9d0caaadb (diff) |
drm/amd/powerplay: check whether need to enable thermal control. (v2)
In I+A platform(skylake), it is controlled by intel.
v2: integrate Tom's fix
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Rex Zhu <Rex.Zhu@amd.com>
-rw-r--r-- | drivers/gpu/drm/amd/powerplay/eventmgr/eventtasks.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/powerplay/eventmgr/eventtasks.c b/drivers/gpu/drm/amd/powerplay/eventmgr/eventtasks.c index 0a03f798773e..f0700d077925 100644 --- a/drivers/gpu/drm/amd/powerplay/eventmgr/eventtasks.c +++ b/drivers/gpu/drm/amd/powerplay/eventmgr/eventtasks.c | |||
@@ -418,10 +418,17 @@ restart_search: | |||
418 | int pem_task_initialize_thermal_controller(struct pp_eventmgr *eventmgr, struct pem_event_data *event_data) | 418 | int pem_task_initialize_thermal_controller(struct pp_eventmgr *eventmgr, struct pem_event_data *event_data) |
419 | { | 419 | { |
420 | struct PP_TemperatureRange range; | 420 | struct PP_TemperatureRange range; |
421 | |||
421 | range.max = TEMP_RANGE_MAX; | 422 | range.max = TEMP_RANGE_MAX; |
422 | range.min = TEMP_RANGE_MIN; | 423 | range.min = TEMP_RANGE_MIN; |
423 | 424 | ||
424 | return phm_start_thermal_controller(eventmgr->hwmgr, &range); | 425 | if (eventmgr == NULL || eventmgr->platform_descriptor == NULL) |
426 | return -EINVAL; | ||
427 | |||
428 | if (phm_cap_enabled(eventmgr->platform_descriptor->platformCaps, PHM_PlatformCaps_ThermalController)) | ||
429 | return phm_start_thermal_controller(eventmgr->hwmgr, &range); | ||
430 | |||
431 | return 0; | ||
425 | } | 432 | } |
426 | 433 | ||
427 | int pem_task_uninitialize_thermal_controller(struct pp_eventmgr *eventmgr, struct pem_event_data *event_data) | 434 | int pem_task_uninitialize_thermal_controller(struct pp_eventmgr *eventmgr, struct pem_event_data *event_data) |