fix for xf86-video-vesa with xserver 1.7

Matthieu Herrb matthieu.herrb at laas.fr
Mon Sep 28 14:18:45 PDT 2009


I need those 2 fixes to run the vesa driver with xserver 1.7. ok?

commit 9829de7a1b2a9734d20a239d3ed84a73ddaf70f1
Author: Matthieu Herrb <matthieu.herrb at laas.fr>
Date:   Mon Sep 28 23:00:27 2009 +0200

    fix vesa for xserver 1.7 branch.
    
    - convert slowbcopy_frombus() to xf86SlowBcopy().
    - add missing shadowRemove() in VESACloseScreen().

diff --git a/src/vesa.c b/src/vesa.c
index 1912c4d..c5f0394 100644
--- a/src/vesa.c
+++ b/src/vesa.c
@@ -1098,8 +1098,10 @@ VESACloseScreen(int scrnIndex, ScreenPtr pScreen)
 				 pVesa->savedPal, FALSE, TRUE);
 	VESAUnmapVidMem(pScrn);
     }
-    if (pVesa->shadowFB && pVesa->shadow)
+    if (pVesa->shadowFB && pVesa->shadow) {
+	shadowRemove(pScreen, pScreen->GetScreenPixmap(pScreen));
 	xfree(pVesa->shadow);
+    }
     if (pVesa->pDGAMode) {
 	xfree(pVesa->pDGAMode);
 	pVesa->pDGAMode = NULL;
@@ -1450,7 +1452,7 @@ SaveFonts(ScrnInfoPtr pScrn)
     WriteGr(0x04, 0x02);	/* read plane 2 */
     WriteGr(0x05, 0x00);	/* write mode 0, read mode 0 */
     WriteGr(0x06, 0x05);	/* set graphics */
-    slowbcopy_frombus(pVesa->VGAbase, pVesa->fonts, 8192);
+    xf86SlowBcopy(pVesa->VGAbase, pVesa->fonts, 8192);
 
     /* font2 */
     WriteSeq(0x02, 0x08);	/* write to plane 3 */
@@ -1458,7 +1460,7 @@ SaveFonts(ScrnInfoPtr pScrn)
     WriteGr(0x04, 0x03);	/* read plane 3 */
     WriteGr(0x05, 0x00);	/* write mode 0, read mode 0 */
     WriteGr(0x06, 0x05);	/* set graphics */
-    slowbcopy_frombus(pVesa->VGAbase, pVesa->fonts + 8192, 8192);
+    xf86SlowBcopy(pVesa->VGAbase, pVesa->fonts + 8192, 8192);
 
     scrn = ReadSeq(pVesa, 0x01) & ~0x20;
     SeqReset(pVesa, TRUE);
@@ -1520,14 +1522,14 @@ RestoreFonts(ScrnInfoPtr pScrn)
     WriteGr(0x04, 0x02);    /* read plane 2 */
     WriteGr(0x05, 0x00);    /* write mode 0, read mode 0 */
     WriteGr(0x06, 0x05);    /* set graphics */
-    slowbcopy_tobus(pVesa->fonts, pVesa->VGAbase, 8192);
+    xf86SlowBcopy(pVesa->fonts, pVesa->VGAbase, 8192);
 
     WriteSeq(0x02, 0x08);   /* write to plane 3 */
     WriteSeq(0x04, 0x06);   /* enable plane graphics */
     WriteGr(0x04, 0x03);    /* read plane 3 */
     WriteGr(0x05, 0x00);    /* write mode 0, read mode 0 */
     WriteGr(0x06, 0x05);    /* set graphics */
-    slowbcopy_tobus(pVesa->fonts + 8192, pVesa->VGAbase, 8192);
+    xf86SlowBcopy(pVesa->fonts + 8192, pVesa->VGAbase, 8192);
 
     scrn = ReadSeq(pVesa, 0x01) & ~0x20;
     SeqReset(pVesa, TRUE);


More information about the xorg-devel mailing list