aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/radeon/radeon_atombios.c
diff options
context:
space:
mode:
authorAlex Deucher <alexdeucher@gmail.com>2011-01-06 21:19:22 -0500
committerDave Airlie <airlied@redhat.com>2011-01-06 23:11:29 -0500
commit4fddba1fd9df94caaa03956bf36e1a887a1c92a5 (patch)
treecd30b44c4b7d1bc55f0f046772ceb2fe66206b90 /drivers/gpu/drm/radeon/radeon_atombios.c
parent36868bda88b92ce8a9aa8b3ee2e0d1e0de09cc19 (diff)
drm/radeon/kms: handle NI thermal controller
Signed-off-by: Alex Deucher <alexdeucher@gmail.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon_atombios.c')
-rw-r--r--drivers/gpu/drm/radeon/radeon_atombios.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_atombios.c b/drivers/gpu/drm/radeon/radeon_atombios.c
index a2dfe257079c..03f1c9a10ba4 100644
--- a/drivers/gpu/drm/radeon/radeon_atombios.c
+++ b/drivers/gpu/drm/radeon/radeon_atombios.c
@@ -1891,6 +1891,7 @@ static const char *pp_lib_thermal_controller_names[] = {
1891 "Evergreen", 1891 "Evergreen",
1892 "emc2103", 1892 "emc2103",
1893 "Sumo", 1893 "Sumo",
1894 "Northern Islands",
1894}; 1895};
1895 1896
1896union power_info { 1897union power_info {
@@ -2154,6 +2155,11 @@ static void radeon_atombios_add_pplib_thermal_controller(struct radeon_device *r
2154 (controller->ucFanParameters & 2155 (controller->ucFanParameters &
2155 ATOM_PP_FANPARAMETERS_NOFAN) ? "without" : "with"); 2156 ATOM_PP_FANPARAMETERS_NOFAN) ? "without" : "with");
2156 rdev->pm.int_thermal_type = THERMAL_TYPE_SUMO; 2157 rdev->pm.int_thermal_type = THERMAL_TYPE_SUMO;
2158 } else if (controller->ucType == ATOM_PP_THERMALCONTROLLER_NISLANDS) {
2159 DRM_INFO("Internal thermal controller %s fan control\n",
2160 (controller->ucFanParameters &
2161 ATOM_PP_FANPARAMETERS_NOFAN) ? "without" : "with");
2162 rdev->pm.int_thermal_type = THERMAL_TYPE_NI;
2157 } else if ((controller->ucType == 2163 } else if ((controller->ucType ==
2158 ATOM_PP_THERMALCONTROLLER_EXTERNAL_GPIO) || 2164 ATOM_PP_THERMALCONTROLLER_EXTERNAL_GPIO) ||
2159 (controller->ucType == 2165 (controller->ucType ==