xf86-video-ati: Branch 'master'

[Alex Deucher]

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

New commits:
commit 53ba7f5771b0b53fb0d3bc29d64bdd3813756d10
Author: Alex Deucher <alex at cube.(none)>
Date:   Tue Mar 11 19:12:40 2008 -0400

    RADEON: fix vblank interrupts after VT switch or suspend/resume

diff --git a/src/radeon_driver.c b/src/radeon_driver.c
index de81b2d..42324b1 100644
--- a/src/radeon_driver.c
+++ b/src/radeon_driver.c
@@ -5208,6 +5208,11 @@ Bool RADEONEnterVT(int scrnIndex, int flags)
 
     pScrn->vtSema = TRUE;
 
+    RADEONRestoreSurfaces(pScrn, info->ModeReg);
+
+    if (!xf86SetDesiredModes(pScrn))
+	return FALSE;
+
 #ifdef XF86DRI
     if (info->directRenderingEnabled) {
 	if (info->cardType == CARD_PCIE &&
@@ -5226,10 +5231,6 @@ Bool RADEONEnterVT(int scrnIndex, int flags)
 #endif
 	RADEONRestoreMemMapRegisters(pScrn, info->ModeReg);
 
-    RADEONRestoreSurfaces(pScrn, info->ModeReg);
-
-    if (!xf86SetDesiredModes(pScrn))
-	return FALSE;
 
     /* this will get XVideo going again, but only if XVideo was initialised
        during server startup (hence the info->adaptor if). */