summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Romanick <idr@us.ibm.com>2008-04-30 10:49:35 -0700
committerIan Romanick <idr@us.ibm.com>2008-04-30 10:49:35 -0700
commit9aa97d2195eb74b83c4f0c5785bba1177e1c0373 (patch)
treed24788c7f8597ddb997c2f10fc1fa77dd82da3fe
parent6c3cda87113775458e14aad714d17c075e0dd024 (diff)
Fix font restore problem on server exitrandr-1.2
-rw-r--r--src/xg47_native_mode.c2
-rw-r--r--src/xgi_driver.c1
2 files changed, 2 insertions, 1 deletions
diff --git a/src/xg47_native_mode.c b/src/xg47_native_mode.c
index d71f926..c900574 100644
--- a/src/xg47_native_mode.c
+++ b/src/xg47_native_mode.c
@@ -396,7 +396,7 @@ void xg47_mode_restore(ScrnInfoPtr pScrn, vgaRegPtr pVgaReg, XGIRegPtr regs)
uint8_t v3x5_2f;
- vgaHWRestore(pScrn, pVgaReg, VGA_SR_ALL);
+ vgaHWRestore(pScrn, pVgaReg, VGA_SR_MODE);
OUT3CFB(0x0f, regs->gra[0x0f]);
diff --git a/src/xgi_driver.c b/src/xgi_driver.c
index 03bc1af..14596bf 100644
--- a/src/xgi_driver.c
+++ b/src/xgi_driver.c
@@ -1850,6 +1850,7 @@ static void XGIRestore(ScrnInfoPtr pScrn)
vgaRegPtr pVgaReg = &VGAHWPTR(pScrn)->SavedReg;
xg47_mode_restore(pScrn, pVgaReg, pXGIReg);
+ vgaHWRestore(pScrn, pVgaReg, VGA_SR_FONTS);
}
Bool XGIFBManagerInit(ScreenPtr pScreen)