From: Rex Zhu Date: Thu, 17 Dec 2015 06:20:06 +0000 (+0800) Subject: drm/amd/powerplay: check whether need to enable thermal control. (v2) X-Git-Tag: v4.14-rc1~3993^2~19^2~4 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cae9b9c81bde812590cdac7df32ad5662741b3d5;p=platform%2Fkernel%2Flinux-rpi.git 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 Signed-off-by: Rex Zhu --- diff --git a/drivers/gpu/drm/amd/powerplay/eventmgr/eventtasks.c b/drivers/gpu/drm/amd/powerplay/eventmgr/eventtasks.c index 0a03f79..f0700d0 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: int pem_task_initialize_thermal_controller(struct pp_eventmgr *eventmgr, struct pem_event_data *event_data) { struct PP_TemperatureRange range; + range.max = TEMP_RANGE_MAX; range.min = TEMP_RANGE_MIN; - return phm_start_thermal_controller(eventmgr->hwmgr, &range); + if (eventmgr == NULL || eventmgr->platform_descriptor == NULL) + return -EINVAL; + + if (phm_cap_enabled(eventmgr->platform_descriptor->platformCaps, PHM_PlatformCaps_ThermalController)) + return phm_start_thermal_controller(eventmgr->hwmgr, &range); + + return 0; } int pem_task_uninitialize_thermal_controller(struct pp_eventmgr *eventmgr, struct pem_event_data *event_data)