diff options
Diffstat (limited to 'common/recipes-kernel/linux/files/0134-drm-amd-powerplay-check-whether-need-to-enable-therm.patch')
| -rw-r--r-- | common/recipes-kernel/linux/files/0134-drm-amd-powerplay-check-whether-need-to-enable-therm.patch | 42 |
1 files changed, 42 insertions, 0 deletions
diff --git a/common/recipes-kernel/linux/files/0134-drm-amd-powerplay-check-whether-need-to-enable-therm.patch b/common/recipes-kernel/linux/files/0134-drm-amd-powerplay-check-whether-need-to-enable-therm.patch new file mode 100644 index 00000000..cbb9e3ea --- /dev/null +++ b/common/recipes-kernel/linux/files/0134-drm-amd-powerplay-check-whether-need-to-enable-therm.patch @@ -0,0 +1,42 @@ +From 6c152c0ae63512ee7eda1a08bdc4c640a17ba194 Mon Sep 17 00:00:00 2001 +From: Rex Zhu <Rex.Zhu@amd.com> +Date: Thu, 17 Dec 2015 14:20:06 +0800 +Subject: [PATCH 0134/1110] 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> +--- + drivers/gpu/drm/amd/powerplay/eventmgr/eventtasks.c | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +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) +-- +2.7.4 + |