On Mon, Nov 8, 2010 at 1:39 PM, Alex Deucher <alexdeucher@xxxxxxxxx> wrote: > Temperature is not shifted as on newer asics. > > Signed-off-by: Alex Deucher <alexdeucher@xxxxxxxxx> Should be CC'ed to stable as well. Alex > --- > 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 951af00..bd69299 100644 > --- a/drivers/gpu/drm/radeon/r600.c > +++ b/drivers/gpu/drm/radeon/r600.c > @@ -106,14 +106,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) > -- > 1.7.1.1 > > _______________________________________________ dri-devel mailing list dri-devel@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/dri-devel