xf86-video-ati: Branch 'master'

[Alex Deucher]

 src/radeon_driver.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 1f783117f79f95f1744681ccc7d80dc0e7b53057
Author: Alex Deucher <alexdeucher at gmail.com>
Date:   Thu Feb 19 21:07:06 2009 -0500

    RBBM_GUICNTL is pre-r6xx only

diff --git a/src/radeon_driver.c b/src/radeon_driver.c
index 28db063..87d5e9b 100644
--- a/src/radeon_driver.c
+++ b/src/radeon_driver.c
@@ -5049,8 +5049,10 @@ static void RADEONRestore(ScrnInfoPtr pScrn)
 		   "RADEONRestore\n");
 
 #if X_BYTE_ORDER == X_BIG_ENDIAN
-    RADEONWaitForFifo(pScrn, 1);
-    OUTREG(RADEON_RBBM_GUICNTL, RADEON_HOST_DATA_SWAP_NONE);
+    if (info->ChipFamily < CHIP_FAMILY_R600) {
+	RADEONWaitForFifo(pScrn, 1);
+	OUTREG(RADEON_RBBM_GUICNTL, RADEON_HOST_DATA_SWAP_NONE);
+    }
 #endif
 
     RADEONBlank(pScrn);