From c0bca891640a6246234648d8ae98c609e9ce20a0 Mon Sep 17 00:00:00 2001 From: Alex Deucher Date: Mon, 8 Nov 2010 18:39:18 +0000 Subject: [PATCH] --- yaml --- r: 221797 b: refs/heads/master c: b2298fd27127f872881048fd37cb9217a648ae06 h: refs/heads/master i: 221795: a46306a3fd56b61c470a4a4d1d11891ad889ed88 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/radeon/r600.c | 8 +------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 86c0a4ddd21a..6c5327399edf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bdd91b2b571c80dacfca88667d935f9907e62931 +refs/heads/master: b2298fd27127f872881048fd37cb9217a648ae06 diff --git a/trunk/drivers/gpu/drm/radeon/r600.c b/trunk/drivers/gpu/drm/radeon/r600.c index 403e0df52a9d..0f806cc7dc75 100644 --- a/trunk/drivers/gpu/drm/radeon/r600.c +++ b/trunk/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)