diff options
| author | Alex Deucher <alexdeucher@gmail.com> | 2010-11-08 18:39:18 +0000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-11-09 13:44:18 +1000 |
| commit | b2298fd27127f872881048fd37cb9217a648ae06 (patch) | |
| tree | 6399cc95f47a3ae434074a96ed8b1e1c967a3765 /drivers/gpu/drm/radeon/r600.c | |
| parent | bdd91b2b571c80dacfca88667d935f9907e62931 (diff) | |
| download | blackbird-op-linux-b2298fd27127f872881048fd37cb9217a648ae06.tar.gz blackbird-op-linux-b2298fd27127f872881048fd37cb9217a648ae06.zip | |
drm/radeon/kms: fix thermal sensor reporting on rv6xx
Temperature is not shifted as on newer asics.
Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
Cc: stable@kernel.org
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/r600.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/r600.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c index 403e0df52a9d..0f806cc7dc75 100644 --- a/drivers/gpu/drm/radeon/r600.c +++ b/drivers/gpu/drm/radeon/r600.c @@ -97,14 +97,8 @@ u32 rv6xx_get_temp(struct radeon_device *rdev) { u32 temp = (RREG32(CG_THERMAL_STATUS) & ASIC_T_MASK) >> ASIC_T_SHIFT; - u32 actual_temp = 0; - if ((temp >> 7) & 1) - actual_temp = 0; - else - actual_temp = (temp >> 1) & 0xff; - - return actual_temp * 1000; + return temp * 1000; } void r600_pm_get_dynpm_state(struct radeon_device *rdev) |
