xf86-video-ati: Branch 'master'

[Alex Deucher]

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

New commits:
commit f71ac0e40b9d950bcb3bba42a75d41f45b6ed1bf
Author: Alban Browaeys <prahal at yahoo.com>
Date:   Mon Mar 17 20:48:48 2008 -0400

    RADEON: Revert to old behavior when resetting the memmap on VT switch
    
    Not sure why this needs to be done twice.  Should fix bug 14980
    Probably needs more investigation.

diff --git a/src/radeon_driver.c b/src/radeon_driver.c
index 65f6485..bf7ef8c 100644
--- a/src/radeon_driver.c
+++ b/src/radeon_driver.c
@@ -5208,6 +5208,7 @@ Bool RADEONEnterVT(int scrnIndex, int flags)
 
     pScrn->vtSema = TRUE;
 
+    RADEONRestoreMemMapRegisters(pScrn, info->ModeReg);
     RADEONRestoreSurfaces(pScrn, info->ModeReg);
 
     if (!xf86SetDesiredModes(pScrn))
@@ -5227,10 +5228,8 @@ Bool RADEONEnterVT(int scrnIndex, int flags)
 	RADEONDRIResume(pScrn->pScreen);
 	RADEONAdjustMemMapRegisters(pScrn, info->ModeReg);
 
-    } else
+    }
 #endif
-	RADEONRestoreMemMapRegisters(pScrn, info->ModeReg);
-
 
     /* this will get XVideo going again, but only if XVideo was initialised
        during server startup (hence the info->adaptor if). */