xf86-video-ati: Branch 'master'

[Dave Airlie]

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

New commits:
commit 22c6ca0d5d226c725ba448e5db63fdba9e32332c
Author: Dave Airlie <airlied at redhat.com>
Date:   Thu Jul 3 20:14:59 2008 +1000

    rotate: fix rotation in conf file.
    
    need to set modes after init accel architecture
    
    reported-by: Christoph Bartoschek <bartoschek at or.uni-bonn.de>

diff --git a/src/radeon_driver.c b/src/radeon_driver.c
index a481491..16a0530 100644
--- a/src/radeon_driver.c
+++ b/src/radeon_driver.c
@@ -3471,9 +3471,6 @@ 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 */
@@ -3554,6 +3551,9 @@ 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");