xf86-video-ati: Branch 'master'

[Alex Deucher]

 src/radeon_driver.c |    3 +--
 1 files changed, 1 insertion(+), 2 deletions(-)

New commits:
diff-tree 92e65d5e0d6817ff4c9a08020a0a9b3a8c3c98b0 (from b72ff160f908bf3aa9f64705377e92d80360a4f7)
Author: Andrew Randrianasulu <randrik at mail.ru>
Date:   Fri Jun 22 00:55:00 2007 -0400

    RADEON: Fix VT switch hangs
    
    - reorder RADEONDRISetVBlankInterrupt() and RADEONDRIResume()
    - see bug 11287

diff --git a/src/radeon_driver.c b/src/radeon_driver.c
index caa478e..4e1868d 100644
--- a/src/radeon_driver.c
+++ b/src/radeon_driver.c
@@ -6931,10 +6931,9 @@ Bool RADEONEnterVT(int scrnIndex, int fl
     	}
 
 	/* get the DRI back into shape after resume */
+	RADEONDRISetVBlankInterrupt (pScrn, TRUE);
 	RADEONDRIResume(pScrn->pScreen);
 	RADEONAdjustMemMapRegisters(pScrn, &info->ModeReg);
-
-	RADEONDRISetVBlankInterrupt (pScrn, TRUE);
     }
 #endif
     /* this will get XVideo going again, but only if XVideo was initialised