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>

diff --git a/drivers/gpu/drm/amd/powerplay/eventmgr/eventtasks.c b/drivers/gpu/drm/amd/powerplay/eventmgr/eventtasks.c
index 0a03f798773ece73756bd67597d08e45fb562d65..f0700d07792518699aefbe06f9f3625ac257ad26 100644 (file)
--- 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)