diff options
| author | Alex Deucher <alexdeucher@gmail.com> | 2011-06-14 15:15:53 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2011-06-16 02:27:20 -0400 |
| commit | 1c88d74f3a0b748b0c7e88e91e9d0503815d5689 (patch) | |
| tree | 0fa574ef188ea342a4f7bffcac2babfbcc349a8c /drivers/gpu | |
| parent | 45e97ab65026a3391cb2c938f834ca5db4d2e5b3 (diff) | |
drm/radeon/kms: signed fix for evergreen thermal
temperature is signed.
Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/radeon/evergreen.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/evergreen.c b/drivers/gpu/drm/radeon/evergreen.c index 86157b172c88..7e3d96e7ac04 100644 --- a/drivers/gpu/drm/radeon/evergreen.c +++ b/drivers/gpu/drm/radeon/evergreen.c | |||
| @@ -88,7 +88,8 @@ u32 evergreen_page_flip(struct radeon_device *rdev, int crtc_id, u64 crtc_base) | |||
| 88 | /* get temperature in millidegrees */ | 88 | /* get temperature in millidegrees */ |
| 89 | int evergreen_get_temp(struct radeon_device *rdev) | 89 | int evergreen_get_temp(struct radeon_device *rdev) |
| 90 | { | 90 | { |
| 91 | u32 temp, toffset, actual_temp = 0; | 91 | u32 temp, toffset; |
| 92 | int actual_temp = 0; | ||
| 92 | 93 | ||
| 93 | if (rdev->family == CHIP_JUNIPER) { | 94 | if (rdev->family == CHIP_JUNIPER) { |
| 94 | toffset = (RREG32(CG_THERMAL_CTRL) & TOFFSET_MASK) >> | 95 | toffset = (RREG32(CG_THERMAL_CTRL) & TOFFSET_MASK) >> |