summaryrefslogtreecommitdiff
path: root/src/radeon_driver.c
diff options
context:
space:
mode:
authorAlban Browaeys <prahal@yahoo.com>2008-03-17 20:48:48 -0400
committerAlex Deucher <alex@cube.(none)>2008-03-17 20:48:48 -0400
commitf71ac0e40b9d950bcb3bba42a75d41f45b6ed1bf (patch)
tree37d5d40efa66433ea7ac0dc8ab4237d012e4fe3a /src/radeon_driver.c
parent29ea5bfc0eb3194e2454fc3ee863df54f0300880 (diff)
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.
Diffstat (limited to 'src/radeon_driver.c')
-rw-r--r--src/radeon_driver.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/radeon_driver.c b/src/radeon_driver.c
index 65f6485c..bf7ef8cb 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). */