From f91eadbb14ec5fddd0c375adeda64024eff85327 Mon Sep 17 00:00:00 2001 From: Alex Deucher Date: Mon, 15 Mar 2010 01:36:32 -0400 Subject: [PATCH] --- yaml --- r: 189341 b: refs/heads/master c: 06abdb0ec6b91f634631404012c4d646389e9e0b h: refs/heads/master i: 189339: 181ac40e9d44dbae4d3d470465fc360a8f003107 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/radeon/radeon_atombios.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 8e8d4ff075b2..2f9c1c3a926a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f867c60def7a8dcd86657fd38a8920a4354f305e +refs/heads/master: 06abdb0ec6b91f634631404012c4d646389e9e0b diff --git a/trunk/drivers/gpu/drm/radeon/radeon_atombios.c b/trunk/drivers/gpu/drm/radeon/radeon_atombios.c index 815116e38aa3..92e688697165 100644 --- a/trunk/drivers/gpu/drm/radeon/radeon_atombios.c +++ b/trunk/drivers/gpu/drm/radeon/radeon_atombios.c @@ -1734,7 +1734,7 @@ void radeon_atombios_get_power_modes(struct radeon_device *rdev) /* add the i2c bus for thermal/fan chip */ /* no support for internal controller yet */ if (power_info->info_4.sThermalController.ucType > 0) { - if ((power_info->info_4.sThermalController.ucType == ATOM_PP_THERMALCONTROLLER_RV6xx) && + if ((power_info->info_4.sThermalController.ucType == ATOM_PP_THERMALCONTROLLER_RV6xx) || (power_info->info_4.sThermalController.ucType == ATOM_PP_THERMALCONTROLLER_RV770)) { DRM_INFO("Internal thermal controller %s fan control\n", (power_info->info_4.sThermalController.ucFanParameters &