Skip to content

Commit

Permalink
drm/radeon/kms: fix thermal sensor reporting on rv6xx
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Alex Deucher authored and Dave Airlie committed Nov 9, 2010
1 parent bdd91b2 commit b2298fd
Showing 1 changed file with 1 addition and 7 deletions.
8 changes: 1 addition & 7 deletions drivers/gpu/drm/radeon/r600.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit b2298fd

Please sign in to comment.