components/x11/xf86-video-vesa/patches/01.vesa_xorg72.patch

   1 Fixes Sun bug 6526933: Matrox MGA chip (embedded in ServerEngines "Pilot" BSC)
   2 does not work with vesa driver
   3
   4 diff --git a/src/vesa.c b/src/vesa.c
   5 index 23d9e14..709d791 100644
   6 --- a/src/vesa.c
   7 +++ b/src/vesa.c
   8 @@ -1488,19 +1488,19 @@ SaveFonts(ScrnInfoPtr pScrn)
   9      WriteGr(0x06, 0x05);       /* set graphics */
  10      slowbcopy_frombus(pVesa->VGAbase, pVesa->fonts + 8192, 8192);
  11
  12 -    scrn = ReadSeq(pVesa, 0x01) & ~0x20;
  13 -    SeqReset(pVesa, TRUE);
  14 -    WriteSeq(0x01, scrn);
  15 -    SeqReset(pVesa, FALSE);
  16 -
  17      /* Restore clobbered registers */
  18      WriteAttr(pVesa, 0x10, attr10);
  19 -    WriteSeq(0x02, seq2);
  20 -    WriteSeq(0x04, seq4);
  21      WriteGr(0x04, gr4);
  22      WriteGr(0x05, gr5);
  23      WriteGr(0x06, gr6);
  24 +    WriteSeq(0x02, seq2);
  25 +    WriteSeq(0x04, seq4);
  26      WriteMiscOut(miscOut);
  27 +
  28 +    scrn = ReadSeq(pVesa, 0x01) & ~0x20;
  29 +    SeqReset(pVesa, TRUE);
  30 +    WriteSeq(0x01, scrn);
  31 +    SeqReset(pVesa, FALSE);
  32  }
  33
  34  static void
  35 @@ -1557,11 +1557,6 @@ RestoreFonts(ScrnInfoPtr pScrn)
  36      WriteGr(0x06, 0x05);    /* set graphics */
  37      slowbcopy_tobus(pVesa->fonts + 8192, pVesa->VGAbase, 8192);
  38
  39 -    scrn = ReadSeq(pVesa, 0x01) & ~0x20;
  40 -    SeqReset(pVesa, TRUE);
  41 -    WriteSeq(0x01, scrn);
  42 -    SeqReset(pVesa, FALSE);
  43 -
  44      /* restore the registers that were changed */
  45      WriteMiscOut(miscOut);
  46      WriteAttr(pVesa, 0x10, attr10);
  47 @@ -1573,6 +1568,11 @@ RestoreFonts(ScrnInfoPtr pScrn)
  48      WriteGr(0x08, gr8);
  49      WriteSeq(0x02, seq2);
  50      WriteSeq(0x04, seq4);
  51 +
  52 +    scrn = ReadSeq(pVesa, 0x01) & ~0x20;
  53 +    SeqReset(pVesa, TRUE);
  54 +    WriteSeq(0x01, scrn);
  55 +    SeqReset(pVesa, FALSE);
  56  }
  57
  58  static Bool