From c7083a267209c93b2a91ef00dea2ca840400d160 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Fri, 14 Jul 2006 13:23:40 -0700 Subject: [PATCH] Bug #7404: Only save/restore VGA fonts and not other VGA regs. This fixes a hang on the i945 during restore. It appears that saving/restoring the VGA registers is not important, as we're correctly saving/restoring the registers we touch within the driver anyway. --- src/i830_driver.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/i830_driver.c b/src/i830_driver.c index 396685a0..8464b39f 100644 --- a/src/i830_driver.c +++ b/src/i830_driver.c @@ -2754,7 +2754,7 @@ SaveHWState(ScrnInfoPtr pScrn) } vgaHWUnlock(hwp); - vgaHWSave(pScrn, vgaReg, VGA_SR_ALL); + vgaHWSave(pScrn, vgaReg, VGA_SR_FONTS); return TRUE; } @@ -2773,7 +2773,7 @@ RestoreHWState(ScrnInfoPtr pScrn) #ifdef XF86DRI I830DRISetVBlankInterrupt (pScrn, FALSE); #endif - vgaHWRestore(pScrn, vgaReg, VGA_SR_ALL); + vgaHWRestore(pScrn, vgaReg, VGA_SR_FONTS); vgaHWLock(hwp); /* First, disable display planes */