xf86-video-intel: Branch 'modesetting' - src/i830_driver.c

[Eric Anholt]

 src/i830_driver.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

New commits:
diff-tree c7083a267209c93b2a91ef00dea2ca840400d160 (from 49b827605628d3e1a6d4d41447cf46c5f38cc0c2)
Author: Eric Anholt <anholt at FreeBSD.org>
Date:   Fri Jul 14 13:23:40 2006 -0700

    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.

diff --git a/src/i830_driver.c b/src/i830_driver.c
index 396685a..8464b39 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 */