xf86-video-ati: Branch 'master'

[Dave Airlie]

 src/radeon_kms.c |    9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

New commits:
commit ea37d24b1b6d4cbcf73e680846de25b72af216e3
Author: Dave Airlie <airlied at redhat.com>
Date:   Mon Jun 21 13:55:15 2010 +1000

    radeon: fix support for 1.9 server master.
    
    This moves pixmap and mode set into CSR where its allowed. Should work fine on
    old servers also.
    
    Signed-off-by: Dave Airlie <airlied at redhat.com>

diff --git a/src/radeon_kms.c b/src/radeon_kms.c
index 3f77207..a28f5e6 100644
--- a/src/radeon_kms.c
+++ b/src/radeon_kms.c
@@ -159,6 +159,11 @@ static Bool RADEONCreateScreenResources_KMS(ScreenPtr pScreen)
 	return FALSE;
     pScreen->CreateScreenResources = RADEONCreateScreenResources_KMS;
 
+    if (!drmmode_set_desired_modes(pScrn, &info->drmmode))
+	return FALSE;
+
+    drmmode_uevent_init(pScrn, &info->drmmode);
+
     if (info->r600_shadow_fb) {
 	pixmap = pScreen->GetScreenPixmap(pScreen);
 
@@ -865,9 +870,6 @@ Bool RADEONScreenInit_KMS(int scrnIndex, ScreenPtr pScreen,
     }
     pScrn->pScreen = pScreen;
 
-    if (!drmmode_set_desired_modes(pScrn, &info->drmmode))
-	return FALSE;
-
     /* Provide SaveScreen & wrap BlockHandler and CloseScreen */
     /* Wrap CloseScreen */
     info->CloseScreen    = pScreen->CloseScreen;
@@ -898,7 +900,6 @@ Bool RADEONScreenInit_KMS(int scrnIndex, ScreenPtr pScreen,
     info->accel_state->XInited3D = FALSE;
     info->accel_state->engineMode = EXA_ENGINEMODE_UNKNOWN;
 
-    drmmode_uevent_init(pScrn, &info->drmmode);
     return TRUE;
 }