606N/AFixes Sun bug 6526933: Matrox MGA chip (embedded in ServerEngines "Pilot" BSC)

606N/Adoes not work with vesa driver

606N/A

1265N/Adiff --git a/src/vesa.c b/src/vesa.c

1265N/Aindex 23d9e14..709d791 100644

1265N/A--- a/src/vesa.c

1265N/A+++ b/src/vesa.c

1265N/A@@ -1488,19 +1488,19 @@ SaveFonts(ScrnInfoPtr pScrn)

301N/A WriteGr(0x06, 0x05); /* set graphics */

301N/A slowbcopy_frombus(pVesa->VGAbase, pVesa->fonts + 8192, 8192);

301N/A

301N/A- scrn = ReadSeq(pVesa, 0x01) & ~0x20;

301N/A- SeqReset(pVesa, TRUE);

301N/A- WriteSeq(0x01, scrn);

301N/A- SeqReset(pVesa, FALSE);

301N/A-

301N/A /* Restore clobbered registers */

301N/A WriteAttr(pVesa, 0x10, attr10);

301N/A- WriteSeq(0x02, seq2);

301N/A- WriteSeq(0x04, seq4);

301N/A WriteGr(0x04, gr4);

301N/A WriteGr(0x05, gr5);

301N/A WriteGr(0x06, gr6);

301N/A+ WriteSeq(0x02, seq2);

301N/A+ WriteSeq(0x04, seq4);

301N/A WriteMiscOut(miscOut);

301N/A+

301N/A+ scrn = ReadSeq(pVesa, 0x01) & ~0x20;

301N/A+ SeqReset(pVesa, TRUE);

301N/A+ WriteSeq(0x01, scrn);

301N/A+ SeqReset(pVesa, FALSE);

301N/A }

301N/A

301N/A static void

1265N/A@@ -1557,11 +1557,6 @@ RestoreFonts(ScrnInfoPtr pScrn)

301N/A WriteGr(0x06, 0x05); /* set graphics */

301N/A slowbcopy_tobus(pVesa->fonts + 8192, pVesa->VGAbase, 8192);

301N/A

301N/A- scrn = ReadSeq(pVesa, 0x01) & ~0x20;

301N/A- SeqReset(pVesa, TRUE);

301N/A- WriteSeq(0x01, scrn);

301N/A- SeqReset(pVesa, FALSE);

301N/A-

301N/A /* restore the registers that were changed */

301N/A WriteMiscOut(miscOut);

301N/A WriteAttr(pVesa, 0x10, attr10);

1265N/A@@ -1573,6 +1568,11 @@ RestoreFonts(ScrnInfoPtr pScrn)

301N/A WriteGr(0x08, gr8);

301N/A WriteSeq(0x02, seq2);

301N/A WriteSeq(0x04, seq4);

301N/A+

301N/A+ scrn = ReadSeq(pVesa, 0x01) & ~0x20;

301N/A+ SeqReset(pVesa, TRUE);

301N/A+ WriteSeq(0x01, scrn);

301N/A+ SeqReset(pVesa, FALSE);

301N/A }

301N/A

301N/A static Bool