xf86-video-ati: Branch 'master'

[Dave Airlie]

 src/radeon_accel.c       |    5 +++++
 src/radeon_commonfuncs.c |    3 +++
 2 files changed, 8 insertions(+)

New commits:
commit 89a8fd5337c77abf1f3166e69ed061d85b5c20f0
Author: Dave Airlie <airlied at redhat.com>
Date:   Mon Dec 15 14:41:10 2008 +1000

    r600: don't idle engine
    (cherry picked from commit b77729448e487d37707ce028d8edc59352d1cc2d)

diff --git a/src/radeon_accel.c b/src/radeon_accel.c
index a6e332d..2f62fa5 100644
--- a/src/radeon_accel.c
+++ b/src/radeon_accel.c
@@ -156,6 +156,9 @@ void RADEONEngineFlush(ScrnInfoPtr pScrn)
     unsigned char *RADEONMMIO = info->MMIO;
     int            i;
 
+    if (info->ChipFamily >= CHIP_FAMILY_R600)
+        return;
+
     if (info->ChipFamily <= CHIP_FAMILY_RV280) {
 	OUTREGP(RADEON_RB3D_DSTCACHE_CTLSTAT,
 		RADEON_RB3D_DC_FLUSH_ALL,
@@ -195,6 +198,8 @@ void RADEONEngineReset(ScrnInfoPtr pScrn)
     uint32_t       rbbm_soft_reset;
     uint32_t       host_path_cntl;
 
+    if (info->ChipFamily >= CHIP_FAMILY_R600)
+        return;
     /* The following RBBM_SOFT_RESET sequence can help un-wedge
      * an R300 after the command processor got stuck.
      */
diff --git a/src/radeon_commonfuncs.c b/src/radeon_commonfuncs.c
index 12ddaff..0a9f9db 100644
--- a/src/radeon_commonfuncs.c
+++ b/src/radeon_commonfuncs.c
@@ -750,6 +750,9 @@ void FUNC_NAME(RADEONWaitForIdle)(ScrnInfoPtr pScrn)
 		   INREG(RADEON_RBBM_STATUS));
 #endif
 
+    if (info->ChipFamily >= CHIP_FAMILY_R600)
+      return;
+
     /* Wait for the engine to go idle */
     RADEONWaitForFifoFunction(pScrn, 64);