xf86-video-ati: Branch 'master'

[Alex Deucher]

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

New commits:
commit 879f9a37856642b337e3c0233e38fd5443338eef
Author: Alex Deucher <alexdeucher at gmail.com>
Date:   Fri Jul 4 13:54:49 2008 -0400

    Revert "rotate: fix rotation in conf file."
    
    This reverts commit 22c6ca0d5d226c725ba448e5db63fdba9e32332c.
    
    There seems to be an ordering issue in that causes a nasty hang
    if the DRI is enabled.  This needs more investigation.

diff --git a/src/radeon_driver.c b/src/radeon_driver.c
index 16a0530..a481491 100644
--- a/src/radeon_driver.c
+++ b/src/radeon_driver.c
@@ -3471,6 +3471,9 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
     /* xf86CrtcRotate() accesses pScrn->pScreen */
     pScrn->pScreen = pScreen;
 
+    if (!xf86SetDesiredModes (pScrn))
+	return FALSE;
+
     RADEONSaveScreen(pScreen, SCREEN_SAVER_ON);
 
     /* Backing store setup */
@@ -3551,9 +3554,6 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
 	info->accelOn = FALSE;
     }
 
-    if (!xf86SetDesiredModes (pScrn))
-	return FALSE;
-
     /* Init DPMS */
     xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, RADEON_LOGLEVEL_DEBUG,
 		   "Initializing DPMS\n");