xf86-video-ati: Branch 'master'

[Alex Deucher]

 src/radeon_driver.c |    5 +++++
 src/radeon_reg.h    |    2 ++
 2 files changed, 7 insertions(+)

New commits:
commit ce77ed78a877023da72dbe51609aef9a07e250b1
Author: Maciej Cencora <m.cencora at gmail.com>
Date:   Mon Jan 28 19:02:56 2008 -0500

    RS690: Implement MC idle check

diff --git a/src/radeon_driver.c b/src/radeon_driver.c
index 23ab792..047f014 100644
--- a/src/radeon_driver.c
+++ b/src/radeon_driver.c
@@ -649,6 +649,11 @@ Bool avivo_get_mc_idle(ScrnInfoPtr pScrn)
 	    return TRUE;
 	else
 	    return FALSE;
+    } else if (info->ChipFamily == CHIP_FAMILY_RS690) {
+	if (INMC(pScrn, RS690_MC_STATUS) & RS690_MC_STATUS_IDLE)
+	    return TRUE;
+	else
+	    return FALSE;
     } else {
 	if (INMC(pScrn, R520_MC_STATUS) & R520_MC_STATUS_IDLE)
 	    return TRUE;
diff --git a/src/radeon_reg.h b/src/radeon_reg.h
index ea1cebf..4d20bf8 100644
--- a/src/radeon_reg.h
+++ b/src/radeon_reg.h
@@ -3281,6 +3281,8 @@
 #define RS690_MC_FB_LOCATION			0x100
 #define RS690_MC_AGP_LOCATION			0x101
 #define RS690_MC_AGP_BASE			0x102
+#define RS690_MC_STATUS                         0x90
+#define RS690_MC_STATUS_IDLE                     (1 << 0)
 
 #define AVIVO_MC_INDEX						0x0070
 #define R520_MC_STATUS 0x00