This is a note to let you know that I've just added the patch titled

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

to the 2.6.36-stable tree which can be found at:
    
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     drm-radeon-kms-fix-thermal-sensor-reporting-on-rv6xx.patch
and it can be found in the queue-2.6.36 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <[email protected]> know about it.


>From b2298fd27127f872881048fd37cb9217a648ae06 Mon Sep 17 00:00:00 2001
From: Alex Deucher <[email protected]>
Date: Mon, 8 Nov 2010 18:39:18 +0000
Subject: drm/radeon/kms: fix thermal sensor reporting on rv6xx

From: Alex Deucher <[email protected]>

commit b2298fd27127f872881048fd37cb9217a648ae06 upstream.

Temperature is not shifted as on newer asics.

Signed-off-by: Alex Deucher <[email protected]>
Signed-off-by: Dave Airlie <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

---
 drivers/gpu/drm/radeon/r600.c |    8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

--- 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
 {
        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)


Patches currently in stable-queue which might be from [email protected] are

queue-2.6.36/drm-radeon-kms-fix-regression-in-rs4xx-i2c-setup.patch
queue-2.6.36/drm-radeon-kms-fix-i2c-pad-masks-on-rs4xx.patch
queue-2.6.36/drm-radeon-kms-fix-2d-tile-height-alignment-in-the-r600-cs-checker.patch
queue-2.6.36/drm-radeon-kms-add-workaround-for-dce3-ddc-line-vbios-bug.patch
queue-2.6.36/drm-radeon-kms-fix-resume-regression-for-some-r5xx-laptops.patch
queue-2.6.36/drm-radeon-kms-fix-thermal-sensor-reporting-on-rv6xx.patch
queue-2.6.36/drm-radeon-kms-fix-interlaced-and-doublescan-handling.patch
queue-2.6.36/drm-radeon-kms-make-sure-blit-addr-masks-are-64-bit.patch
queue-2.6.36/drm-radeon-kms-register-an-i2c-adapter-name-for-the-dp-aux-bus.patch
queue-2.6.36/drm-radeon-kms-fix-handling-of-tex-lookup-disable-in-cs-checker-on-r2xx.patch
queue-2.6.36/drm-radeon-kms-properly-compute-group_size-on-6xx-7xx.patch
queue-2.6.36/drm-radeon-kms-mc-vram-map-needs-to-be-pci-aperture-size.patch
queue-2.6.36/drm-radeon-kms-atom-set-sane-defaults-in-atombios_get_encoder_mode.patch
queue-2.6.36/drm-radeon-kms-fix-typos-in-disabled-vbios-code.patch
queue-2.6.36/drm-radeon-kms-don-t-disable-shared-encoders-on-pre-dce3-display-blocks.patch

_______________________________________________
stable mailing list
[email protected]
http://linux.kernel.org/mailman/listinfo/stable

Reply via email to