xf86-video-ati: Branch 'master'

[Dave Airlie]

 src/radeon_driver.c |    6 ++++++
 1 file changed, 6 insertions(+)

New commits:
commit b7ca1ab11ac0e4e4be5a1e7789ae8633b460a2d4
Author: Dave Airlie <airlied at redhat.com>
Date:   Fri Feb 5 13:37:20 2010 +1000

    rs400/rs480: mc idle bit is bit 2 like original radeon
    
    backport from a KMS fix, the rs400/480 mc idle is bit 2 not bit 4.
    
    Signed-off-by: Dave Airlie <airlied at redhat.com>

diff --git a/src/radeon_driver.c b/src/radeon_driver.c
index 859a709..c4d2ef5 100644
--- a/src/radeon_driver.c
+++ b/src/radeon_driver.c
@@ -772,6 +772,12 @@ static Bool radeon_get_mc_idle(ScrnInfoPtr pScrn)
 	    return TRUE;
 	else
 	    return FALSE;
+    } else if ((info->ChipFamily == CHIP_FAMILY_RS400) ||
+	       (info->ChipFamily == CHIP_FAMILY_RS480)) {
+	if (INREG(RADEON_MC_STATUS) & RADEON_MC_IDLE)
+	    return TRUE;
+	else
+	    return FALSE;
     } else if (IS_R300_VARIANT) {
 	if (INREG(RADEON_MC_STATUS) & R300_MC_IDLE)
 	    return TRUE;