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.
This commit is contained in:
parent
49b8276056
commit
c7083a2672
|
|
@ -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 */
|
||||
|
|
|
|||
Loading…
Reference in New Issue