From: Alex Deucher <alexdeucher@gmail.com>
Date: Mon, 8 Nov 2010 18:39:18 +0000 (+0000)
Subject: drm/radeon/kms: fix thermal sensor reporting on rv6xx
X-Git-Tag: firefly_0821_release~9833^2~79^2^2~112
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=5ff3d5acba98a66f835b2fd70cd03962eac9dd65;p=firefly-linux-kernel-4.4.55.git

drm/radeon/kms: fix thermal sensor reporting on rv6xx

commit b2298fd27127f872881048fd37cb9217a648ae06 upstream.

Temperature is not shifted as on newer asics.

Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c
index a556fd352d36..d4503df333e9 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)