releases/2.6.36.2/drm-radeon-kms-fix-thermal-sensor-reporting-on-rv6xx.patch

   1 From b2298fd27127f872881048fd37cb9217a648ae06 Mon Sep 17 00:00:00 2001
   2 From: Alex Deucher <alexdeucher@gmail.com>
   3 Date: Mon, 8 Nov 2010 18:39:18 +0000
   4 Subject: drm/radeon/kms: fix thermal sensor reporting on rv6xx
   5
   6 From: Alex Deucher <alexdeucher@gmail.com>
   7
   8 commit b2298fd27127f872881048fd37cb9217a648ae06 upstream.
   9
  10 Temperature is not shifted as on newer asics.
  11
  12 Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
  13 Signed-off-by: Dave Airlie <airlied@redhat.com>
  14 Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  15
  16 ---
  17  drivers/gpu/drm/radeon/r600.c |    8 +-------
  18  1 file changed, 1 insertion(+), 7 deletions(-)
  19
  20 --- a/drivers/gpu/drm/radeon/r600.c
  21 +++ b/drivers/gpu/drm/radeon/r600.c
  22 @@ -97,14 +97,8 @@ u32 rv6xx_get_temp(struct radeon_device
  23  {
  24         u32 temp = (RREG32(CG_THERMAL_STATUS) & ASIC_T_MASK) >>
  25                 ASIC_T_SHIFT;
  26 -       u32 actual_temp = 0;
  27
  28 -       if ((temp >> 7) & 1)
  29 -               actual_temp = 0;
  30 -       else
  31 -               actual_temp = (temp >> 1) & 0xff;
  32 -
  33 -       return actual_temp * 1000;
  34 +       return temp * 1000;
  35  }
  36
  37  void r600_pm_get_dynpm_state(struct radeon_device *rdev)