merge latest (4.3.99.16) from XFree86 (vendor) branchXORG-RELEASE-1-BASEXEVIE-MERGEXEVIE-BASEXINERAMA_2XEVIE

17 files changed, 116 insertions, 145 deletions

diff --git a/src/glint.h b/src/glint.h
index 58c1a8c..0721786 100644
--- a/src/glint.h
+++ b/src/glint.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/glint.h,v 1.58 2003/02/17 16:08:28 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/glint.h,v 1.59 2003/04/23 21:51:36 tsi Exp $ */
 /*
  * Copyright 1997-2001 by Alan Hourihane <alanh@fairlite.demon.co.uk>
  *
@@ -164,11 +164,9 @@ typedef struct {
     CARD32		PM3_VideoControl;
     int			FIFOSize;
     int			InFifoSpace;
-#ifdef XvExtension
     void		(*VideoTimerCallback)(ScrnInfoPtr, Time);
     XF86VideoAdaptorPtr adaptor;
     int                 videoKey;
-#endif
 #ifdef XF86DRI
     Bool		directRenderingEnabled;
     Bool		PCIMode;
diff --git a/src/glint_common.h b/src/glint_common.h
index 4845be7..ec601f9 100644
--- a/src/glint_common.h
+++ b/src/glint_common.h
@@ -25,7 +25,7 @@
  * Converted to common header format:
  *   Jens Owen <jens@tungstengraphics.com>
  *
- * $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/glint_common.h,v 1.1 2002/10/30 12:52:15 alanh Exp $
+ * $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/glint_common.h,v 1.2 2003/04/03 16:52:18 dawes Exp $
  *
  */
 
@@ -55,6 +55,7 @@ typedef struct {
    unsigned int mmio2;
    unsigned int mmio3;
    unsigned int buffers_offset;
+   int num_rast;
 } drmGAMMAInit;
 
 extern int drmGAMMAInitDMA( int fd, drmGAMMAInit *info );
diff --git a/src/glint_dri.c b/src/glint_dri.c
index 506fb7e..dd88527 100644
--- a/src/glint_dri.c
+++ b/src/glint_dri.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/glint_dri.c,v 1.32 2003/02/10 13:20:10 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/glint_dri.c,v 1.38 2003/11/12 17:56:35 tsi Exp $ */
 /**************************************************************************
 
 Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
@@ -328,7 +328,7 @@ static Bool GLINTDRIAgpInit(ScreenPtr pScreen)
       return FALSE;
    }
    xf86DrvMsg( pScreen->myNum, X_INFO,
-	       "[agp] %d kB allocated with handle 0x%08x\n",
+	       "[agp] %d kB allocated with handle 0x%08lx\n",
 	       pGlint->agp.size/1024, pGlint->agp.handle );
 
    if ( drmAgpBind( pGlint->drmSubFD, pGlint->agp.handle, 0 ) < 0 ) {
@@ -358,7 +358,7 @@ static Bool GLINTDRIAgpInit(ScreenPtr pScreen)
       return FALSE;
    }
    xf86DrvMsg( pScreen->myNum, X_INFO,
-	       "[agp] DMA buffers mapped at 0x%08lx\n", pGlint->buffers.map);
+	       "[agp] DMA buffers mapped at %p\n", pGlint->buffers.map);
 
    count = drmAddBufs( pGlint->drmSubFD,
 		       GLINT_DRI_BUF_COUNT, GLINT_DRI_BUF_SIZE,
@@ -413,6 +413,7 @@ static Bool GLINTDRIKernelInit( ScreenPtr pScreen )
    init.mmio1 = pGlintDRI->registers1.handle;
    init.mmio2 = pGlintDRI->registers2.handle;
    init.mmio3 = pGlintDRI->registers3.handle;
+   init.num_rast = pGlint->numMultiDevices;
 
    if (!pGlint->PCIMode) {
        init.pcimode = 0;
@@ -547,7 +548,7 @@ GLINTDRIScreenInit(ScreenPtr pScreen)
 
     /* So DRICloseScreen does the right thing if we abort */
     pGlint->buffers.map = 0;
-    pGlint->agp.handle = 0;
+    pGlint->agp.handle = DRM_AGP_NO_HANDLE;
 
     if (!DRIScreenInit(pScreen, pDRIInfo, &(pGlint->drmSubFD))) {
 	DRIDestroyInfoRec(pGlint->pDRIInfo);
@@ -760,7 +761,7 @@ GLINTDRIScreenInit(ScreenPtr pScreen)
 	    return FALSE;
     	}
     	xf86DrvMsg(pScrn->scrnIndex, X_INFO, "[drm] buffers mapped with %p\n",
-	       pGlint->drmBufs);
+	       (void *)pGlint->drmBufs);
     	xf86DrvMsg(pScrn->scrnIndex, X_INFO, "[drm] %d DMA buffers mapped\n",
 	       pGlint->drmBufs->count);
     } /* PCIMODE */
@@ -789,7 +790,7 @@ GLINTDRICloseScreen(ScreenPtr pScreen)
 	pGlint->buffers.map = NULL;
     }
 
-    if (pGlint->agp.handle) {
+    if (pGlint->agp.handle != DRM_AGP_NO_HANDLE) {
 	drmAgpUnbind( pGlint->drmSubFD, pGlint->agp.handle );
 	drmAgpFree( pGlint->drmSubFD, pGlint->agp.handle );
 	pGlint->agp.handle = 0;
@@ -965,7 +966,7 @@ GLINTDRIFinishScreenInit(ScreenPtr pScreen)
 		return FALSE;
     	}
     	xf86DrvMsg(pScrn->scrnIndex, X_INFO, "[agp] buffers mapped with %p\n",
-	       pGlint->drmBufs);
+	       (void *)pGlint->drmBufs);
     	xf86DrvMsg(pScrn->scrnIndex, X_INFO, "[agp] %d DMA buffers mapped\n",
 	       pGlint->drmBufs->count);
     }
@@ -1914,8 +1915,8 @@ GLINTDRIMoveBuffers(
     RegionPtr prgnSrc,
     CARD32 index)
 {
-#if 0
     ScreenPtr pScreen = pParent->drawable.pScreen;
+#if 0
     ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
 #endif
     int dx, dy;
@@ -1927,8 +1928,8 @@ GLINTDRIMoveBuffers(
      * and stencil, they just get redrawn for the next frame(s).
      */
 
-    REGION_INIT(pScreen, &rgnSubWindow, NullBox, 0);
-    REGION_INIT(pScreen, &rgnTranslateSrc, NullBox, 0);
+    REGION_NULL(pScreen, &rgnSubWindow);
+    REGION_NULL(pScreen, &rgnTranslateSrc);
     REGION_COPY(pScreen, &rgnTranslateSrc, prgnSrc);
     dx = ptOldOrg.x - pParent->drawable.x;
     dy = ptOldOrg.y - pParent->drawable.y;
diff --git a/src/glint_driver.c b/src/glint_driver.c
index de0c992..fb0d34b 100644
--- a/src/glint_driver.c
+++ b/src/glint_driver.c
@@ -28,7 +28,7 @@
  * this work is sponsored by S.u.S.E. GmbH, Fuerth, Elsa GmbH, Aachen, 
  * Siemens Nixdorf Informationssysteme and Appian Graphics.
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/glint_driver.c,v 1.156 2003/02/17 16:08:28 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/glint_driver.c,v 1.163 2003/11/03 22:17:21 tsi Exp $ */
 
 #include "fb.h"
 #include "cfb8_32.h"
@@ -91,8 +91,8 @@ static Bool	GLINTSaveScreen(ScreenPtr pScreen, int mode);
 
 /* Optional functions */
 static void	GLINTFreeScreen(int scrnIndex, int flags);
-static int	GLINTValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose,
-			     int flags);
+static ModeStatus GLINTValidMode(int scrnIndex, DisplayModePtr mode,
+				 Bool verbose, int flags);
 
 /* Internally used functions */
 static Bool	GLINTMapMem(ScrnInfoPtr pScrn);
@@ -236,11 +236,9 @@ static const char *xf8_32bppSymbols[] = {
 static const char *xaaSymbols[] = {
     "XAACreateInfoRec",
     "XAADestroyInfoRec",
-    "XAAFillSolidRects",
     "XAAInit",
     "XAAPolyLines",
     "XAAPolySegment",
-    "XAAScreenIndex",
     NULL
 };
 
@@ -339,17 +337,30 @@ const char *GLINTint10Symbols[] = {
     NULL
 };
 
+#ifdef XFree86LOADER
+
 #ifdef XF86DRI
 static const char *drmSymbols[] = {
     "drmAddBufs",
     "drmAddMap",
+    "drmAgpAcquire",
+    "drmAgpAlloc",
+    "drmAgpBind",
+    "drmAgpEnable",
+    "drmAgpFree",
+    "drmAgpGetMode",
+    "drmAgpRelease",
+    "drmAgpUnbind",
     "drmCommandWrite",
     "drmCtlInstHandler",
+    "drmFreeBufs",
     "drmFreeVersion",
     "drmGetInterruptFromBusID",
     "drmGetLibVersion",
     "drmGetVersion",
+    "drmMap",
     "drmMapBufs",
+    "drmUnmap",
     "drmUnmapBufs",
     NULL
 };
@@ -367,8 +378,6 @@ static const char *driSymbols[] = {
 };
 #endif
 
-#ifdef XFree86LOADER
-
 static MODULESETUPPROTO(glintSetup);
 
 static XF86ModuleVersionInfo glintVersRec =
@@ -1368,7 +1377,7 @@ GLINTPreInit(ScrnInfoPtr pScrn, int flags)
 	if (pGlint->MultiPciInfo[0]->memBase[2]) {
 	    pGlint->FbAddress = pGlint->MultiPciInfo[0]->memBase[2];
 	    xf86DrvMsg(pScrn->scrnIndex, X_PROBED, 
-		"FrameBuffer used from first rasterizer chip at 0x%x\n", 
+		"FrameBuffer used from first rasterizer chip at 0x%lx\n", 
 				pGlint->MultiPciInfo[0]->memBase[2]);
 	} else {
 	    xf86DrvMsg(pScrn->scrnIndex, X_PROBED, 	
@@ -1475,7 +1484,7 @@ GLINTPreInit(ScrnInfoPtr pScrn, int flags)
         	    int glintcopro = pciTag(pGlint->MultiPciInfo[0]->bus, 
 						pGlint->MultiPciInfo[0]->device,
 			    			pGlint->MultiPciInfo[0]->func);
-		    int temp, base3copro, offset;
+		    int base3copro, offset;
 
     		    if( (basedelta & 0x20000) ^ (basecopro & 0x20000) ) {
  			if ((pGlint->MultiChip == PCI_CHIP_PERMEDIA) ||
@@ -1500,18 +1509,18 @@ GLINTPreInit(ScrnInfoPtr pScrn, int flags)
 	 		 * read value
 	 		 * write new value
 	 		 */
-			temp = pciReadLong(glintdelta, 0x10);
+			(void) pciReadLong(glintdelta, 0x10);
 			pciWriteLong(glintdelta, 0x10, 0xffffffff);
-			temp = pciReadLong(glintdelta, 0x10);
+			(void) pciReadLong(glintdelta, 0x10);
 			pciWriteLong(glintdelta, 0x10, base3copro);
 
 			/*
 	 		 * additionally,sometimes we see the baserom which might
 	 		 * confuse the chip, so let's make sure that is disabled
 	 		 */
-			temp = pciReadLong(glintcopro, 0x30);
+			(void) pciReadLong(glintcopro, 0x30);
 			pciWriteLong(glintcopro, 0x30, 0xffffffff);
-			temp = pciReadLong(glintcopro, 0x30);
+			(void) pciReadLong(glintcopro, 0x30);
 			pciWriteLong(glintcopro, 0x30, 0);
 
 			/*
@@ -1623,11 +1632,10 @@ GLINTPreInit(ScrnInfoPtr pScrn, int flags)
          (pGlint->numMultiDevices == 2) ) {
 	CARD32 chipconfig;
 	CARD32 size = 0;
-	CARD32 temp;
 
 	GLINTMapMem(pScrn);
 
-	temp = GLINT_READ_REG(GCSRAperture);
+	(void) GLINT_READ_REG(GCSRAperture);
 	GLINT_SLOW_WRITE_REG(GCSRSecondaryGLINTMapEn, GCSRAperture);
 
 	chipconfig = GLINT_READ_REG(GChipConfig);
@@ -1660,7 +1668,7 @@ GLINTPreInit(ScrnInfoPtr pScrn, int flags)
 	}
     }
 
-    xf86DrvMsg(pScrn->scrnIndex, from, "VideoRAM: %d kByte\n",
+    xf86DrvMsg(pScrn->scrnIndex, from, "VideoRAM: %ld kByte\n",
 		   pGlint->FbMapSize / 1024);
 
     /* The ramdac module should be loaded here when needed */
@@ -3519,7 +3527,7 @@ GLINTFreeScreen(int scrnIndex, int flags)
 /* Checks if a mode is suitable for the selected chipset. */
 
 /* Optional */
-static int
+static ModeStatus
 GLINTValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags)
 {
     ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
@@ -3666,7 +3674,8 @@ void
 GLINT_VERB_WRITE_REG(GLINTPtr pGlint, CARD32 v, int r, char *file, int line)
 {
     if (xf86GetVerbosity() > 2)
-	ErrorF("[0x%04x] <- 0x%08x (%s, %d)\n",	r, v, file, line);
+	ErrorF("[0x%04x] <- 0x%08lx (%s, %d)\n",
+		r, (unsigned long)v, file, line);
     *(volatile CARD32 *)((char *) pGlint->IOBase + pGlint->IOOffset + r) = v;
 }
 
@@ -3677,7 +3686,8 @@ GLINT_VERB_READ_REG(GLINTPtr pGlint, CARD32 r, char *file, int line)
 	*(volatile CARD32 *)((char *) pGlint->IOBase + pGlint->IOOffset + r);
 
     if (xf86GetVerbosity() > 2)
-	ErrorF("[0x%04x] -> 0x%08x (%s, %d)\n", r, v, file, line);
+	ErrorF("[0x%04lx] -> 0x%08lx (%s, %d)\n", (unsigned long)r,
+		(unsigned long)v, file, line);
     return v;
 }
 #endif
diff --git a/src/glint_regs.h b/src/glint_regs.h
index 122832d..bac6c46 100644
--- a/src/glint_regs.h
+++ b/src/glint_regs.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/glint_regs.h,v 1.36 2003/01/12 03:55:47 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/glint_regs.h,v 1.37 2003/11/03 05:11:12 tsi Exp $ */
 
 /*
  * glint register file 
@@ -1248,8 +1248,7 @@ do{								\
 
 #define GLINTDACDelay(x) do {                                   \
         int delay = x;                                          \
-        unsigned char tmp;                                      \
-	while(delay--){tmp = GLINT_READ_REG(InFIFOSpace);};     \
+	while(delay--){(void)GLINT_READ_REG(InFIFOSpace);};     \
 	} while(0)
         
 #define GLINT_MASK_WRITE_REG(v,m,r)				\
diff --git a/src/pm2_accel.c b/src/pm2_accel.c
index 583fbc1..addc92e 100644
--- a/src/pm2_accel.c
+++ b/src/pm2_accel.c
@@ -30,7 +30,7 @@
  * 
  * Permedia 2 accelerated options.
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/pm2_accel.c,v 1.31 2001/10/28 03:33:30 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/pm2_accel.c,v 1.32 2003/10/08 15:48:39 eich Exp $ */
 
 #include "Xarch.h"
 #include "xf86.h"
@@ -283,7 +283,7 @@ Permedia2AccelInit(ScreenPtr pScreen)
         	infoPtr->SubsequentSolidBresenhamLine = 
 				Permedia2SubsequentSolidBresenhamLine;
         }
-	infoPtr->PolySegmentThinSolid = Permedia2PolySegmentThinSolidWrapper;
+ 	infoPtr->PolySegmentThinSolid = Permedia2PolySegmentThinSolidWrapper;
 	infoPtr->PolylinesThinSolid = Permedia2PolylinesThinSolidWrapper;
     	infoPtr->SetupForSolidFill = Permedia2SetupForFillRectSolid;
     	infoPtr->SubsequentSolidFillRect = Permedia2SubsequentFillRectSolid;
@@ -409,6 +409,7 @@ static void
 Permedia2SetClippingRectangle(ScrnInfoPtr pScrn, int x1, int y1, int x2, int y2)
 {
     GLINTPtr pGlint = GLINTPTR(pScrn);
+    TRACE_ENTER("Permedia2SetClippingRectangle");
     GLINT_WAIT(3);
     GLINT_WRITE_REG(((y1&0x0fff)<<16)|(x1&0x0fff), ScissorMinXY);
     GLINT_WRITE_REG(((y2&0x0fff)<<16)|(x2&0x0fff), ScissorMaxXY);
@@ -430,6 +431,7 @@ Permedia2SetupForScreenToScreenCopy2432bpp(ScrnInfoPtr pScrn,
 {
     GLINTPtr pGlint = GLINTPTR(pScrn);
 
+    TRACE_ENTER("Permedia2SetupForScreenToScreenCopy2432bpp");
     pGlint->BltScanDirection = 0;
     if (xdir == 1) pGlint->BltScanDirection |= XPositive;
     if (ydir == 1) pGlint->BltScanDirection |= YPositive;
@@ -461,6 +463,7 @@ Permedia2SubsequentScreenToScreenCopy2432bpp(ScrnInfoPtr pScrn, int x1,
 {
     GLINTPtr pGlint = GLINTPTR(pScrn);
 
+    TRACE_ENTER("Permedia2SubsequentScreenToScreenCopy2432bpp");
     GLINT_WAIT(4);
     Permedia2LoadCoord(pScrn, x2, y2, w, h);
     GLINT_WRITE_REG(((y1-y2)&0x0FFF)<<16 | ((x1-x2)&0x0FFF), FBSourceDelta);
@@ -473,8 +476,8 @@ Permedia2SetupForScreenToScreenCopy(ScrnInfoPtr pScrn,
 				unsigned int planemask, int transparency_color)
 {
     GLINTPtr pGlint = GLINTPTR(pScrn);
-    TRACE_ENTER("Permedia2SetupForScreenToScreenCopy");
 
+    TRACE_ENTER("Permedia2SetupForScreenToScreenCopy");
     pGlint->BltScanDirection = 0;
     if (xdir == 1) pGlint->BltScanDirection |= XPositive;
     if (ydir == 1) pGlint->BltScanDirection |= YPositive;
@@ -536,6 +539,7 @@ Permedia2PolylinesThinSolidWrapper(
 ){
     XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);
     GLINTPtr pGlint = GLINTPTR(infoRec->pScrn);
+    TRACE("Permedia2PolylinesThinSolidWrapper");
     pGlint->CurrentGC = pGC;
     pGlint->CurrentDrawable = pDraw;
     if(infoRec->NeedToSync) (*infoRec->Sync)(infoRec->pScrn);
@@ -551,6 +555,7 @@ Permedia2PolySegmentThinSolidWrapper(
 ){
     XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);
     GLINTPtr pGlint = GLINTPTR(infoRec->pScrn);
+    TRACE("Permedia2PolySegmentThinSolidWrapper");
     pGlint->CurrentGC = pGC;
     pGlint->CurrentDrawable = pDraw;
     if(infoRec->NeedToSync) (*infoRec->Sync)(infoRec->pScrn);
@@ -563,6 +568,7 @@ Permedia2SetupForSolidLine(ScrnInfoPtr pScrn, int color,
 {
     GLINTPtr pGlint = GLINTPTR(pScrn);
 
+    TRACE_ENTER("Permedia2SetupForSolidLine");
     GLINT_WAIT(6);
     DO_PLANEMASK(planemask);
     GLINT_WRITE_REG(UNIT_DISABLE, ColorDDAMode);
@@ -579,7 +585,8 @@ static void
 Permedia2SubsequentHorVertLine(ScrnInfoPtr pScrn,int x,int y,int len,int dir)
 {
     GLINTPtr pGlint = GLINTPTR(pScrn);
-  
+    
+    TRACE_ENTER("Permedia2SubsequentHorVertLine");
     GLINT_WAIT(6);
     GLINT_WRITE_REG(x<<16, StartXDom);
     GLINT_WRITE_REG(y<<16, StartY);
@@ -601,6 +608,7 @@ Permedia2SubsequentSolidBresenhamLine( ScrnInfoPtr pScrn,
 {
     GLINTPtr pGlint = GLINTPTR(pScrn);
 
+    TRACE_ENTER("Permedia2SubsequentSolidBresenhamLine");
     if(dmaj == dmin) {
 	GLINT_WAIT(6);
 	if(octant & YDECREASING) {
@@ -621,12 +629,12 @@ Permedia2SubsequentSolidBresenhamLine( ScrnInfoPtr pScrn,
 	GLINT_WRITE_REG(PrimitiveLine, Render);
 	return;
     }
-
+    
     fbBres(pGlint->CurrentDrawable, pGlint->CurrentGC, 0,
                 (octant & XDECREASING) ? -1 : 1, 
                 (octant & YDECREASING) ? -1 : 1, 
                 (octant & YMAJOR) ? Y_AXIS : X_AXIS,
-                x, y, dmin + e, dmin, -dmaj, len);
+                x, y, e, dmin, -dmaj, len);
 }
 
 static void
@@ -636,6 +644,7 @@ Permedia2SetupForFillRectSolid24bpp(ScrnInfoPtr pScrn, int color,
     GLINTPtr pGlint = GLINTPTR(pScrn);
     pGlint->ForeGroundColor = color;
 
+    TRACE_ENTER("Permedia2SetupForFillRectSolid24bpp");
     GLINT_WAIT(5);
     GLINT_WRITE_REG(UNIT_ENABLE, ColorDDAMode);
     GLINT_WRITE_REG(color, ConstantColor);
@@ -676,6 +685,7 @@ static void
 Permedia2SubsequentFillRectSolid24bpp(ScrnInfoPtr pScrn, int x, int y, int w, int h)
 {
     GLINTPtr pGlint = GLINTPTR(pScrn);
+    TRACE_ENTER("Permedia2SubsequentFillRectSolid24bpp");
     GLINT_WAIT(3);
     Permedia2LoadCoord(pScrn, x, y, w, h);
     GLINT_WRITE_REG(PrimitiveRectangle | XPositive | YPositive, Render);
@@ -686,8 +696,8 @@ Permedia2SubsequentFillRectSolid(ScrnInfoPtr pScrn, int x, int y, int w, int h)
 {
     GLINTPtr pGlint = GLINTPTR(pScrn);
     int speed = 0;
-    TRACE_ENTER("Permedia2SubsequentFillRectSolid");
 
+    TRACE_ENTER("Permedia2SubsequentFillRectSolid");
     if (pGlint->ROP == GXcopy) {
 	GLINT_WAIT(3);
         Permedia2LoadCoord(pScrn, x, y, w, h);
@@ -711,6 +721,7 @@ Permedia2SetupForMono8x8PatternFill24bpp(ScrnInfoPtr pScrn,
 {
     GLINTPtr pGlint = GLINTPTR(pScrn);
 
+    TRACE_ENTER("Permedia2SetupForMono8x8PatternFill24bpp");
     if (bg == -1) pGlint->FrameBufferReadMode = -1;
 	else    pGlint->FrameBufferReadMode = 0;
 
@@ -745,8 +756,8 @@ Permedia2SetupForMono8x8PatternFill(ScrnInfoPtr pScrn,
 					   unsigned int planemask)
 {
     GLINTPtr pGlint = GLINTPTR(pScrn);
-    TRACE_ENTER("Permedia2SetupForMono8x8PatternFill");
 
+    TRACE_ENTER("Permedia2SetupForMono8x8PatternFill");
     if (bg == -1) pGlint->FrameBufferReadMode = -1;
 	else    pGlint->FrameBufferReadMode = 0;
 
@@ -788,7 +799,8 @@ Permedia2SubsequentMono8x8PatternFillRect24bpp(ScrnInfoPtr pScrn,
 				   int w, int h)
 {
     GLINTPtr pGlint = GLINTPTR(pScrn);
-  
+
+    TRACE_ENTER("Permedia2SubsequentMono8x8PatternFillRect24bpp");
     GLINT_WAIT(8);
     Permedia2LoadCoord(pScrn, x, y, w, h);
 
@@ -923,6 +935,7 @@ Permedia2SubsequentColorExpandScanline(ScrnInfoPtr pScrn, int bufno)
 {
     GLINTPtr pGlint = GLINTPTR(pScrn);
 
+    TRACE_ENTER("Permedia2SubsequentColorExpandScanline");
     if (pGlint->cpucount--)
     	GLINT_WAIT(pGlint->dwords);
 }
@@ -1056,6 +1069,7 @@ Permedia2WritePixmap8bpp(
     unsigned char *srcpbyte;
     Bool FastTexLoad = FALSE;
 
+    TRACE_ENTER("Permedia2SubsequentMono8x8PatternFillRect24bpp");
     GLINT_WAIT(3);
     DO_PLANEMASK(planemask);
     GLINT_WRITE_REG(pGlint->RasterizerSwap,RasterizerMode);
@@ -1386,7 +1400,8 @@ Permedia2WritePixmap32bpp(
     GLINTPtr pGlint = GLINTPTR(pScrn);
     int skipleft, dwords, count;
     CARD32* srcp;
-
+    
+    TRACE_ENTER("Permedia2WritePixmap32bpp");
     GLINT_WAIT(3);
     DO_PLANEMASK(planemask);
     GLINT_WRITE_REG(pGlint->RasterizerSwap,RasterizerMode);
diff --git a/src/pm2_dac.c b/src/pm2_dac.c
index 6df6e08..14f0bec 100644
--- a/src/pm2_dac.c
+++ b/src/pm2_dac.c
@@ -28,7 +28,7 @@
  * this work is sponsored by S.u.S.E. GmbH, Fuerth, Elsa GmbH, Aachen and
  * Siemens Nixdorf Informationssysteme
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/pm2_dac.c,v 1.26 2001/12/06 15:16:40 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/pm2_dac.c,v 1.27 2003/11/03 05:11:13 tsi Exp $ */
 
 #include "Xarch.h"
 #include "xf86.h"
@@ -153,9 +153,8 @@ Permedia2Init(ScrnInfoPtr pScrn, DisplayModePtr mode)
     {
 	/* Get the programmable clock values */
     	unsigned char m,n,p;
-    	unsigned long clockused;
 	
-    	clockused = PM2DAC_CalculateMNPCForClock(mode->Clock,pGlint->RefClock,
+	(void) PM2DAC_CalculateMNPCForClock(mode->Clock,pGlint->RefClock,
 								&m,&n,&p);
 	pReg->DacRegs[PM2DACIndexClockAM] = m;
 	pReg->DacRegs[PM2DACIndexClockAN] = n;
diff --git a/src/pm2_video.c b/src/pm2_video.c
index 869906e..e64cdda 100644
--- a/src/pm2_video.c
+++ b/src/pm2_video.c
@@ -21,7 +21,7 @@
  *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  */
  
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/pm2_video.c,v 1.23 2002/12/02 22:52:30 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/pm2_video.c,v 1.26 2003/11/10 18:22:20 tsi Exp $ */
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
@@ -36,15 +36,6 @@
 #include "glint_regs.h"
 #include "glint.h"
 
-#ifndef XvExtension
-
-void Permedia2VideoInit(ScreenPtr pScreen) {}
-void Permedia2VideoUninit(ScrnInfoPtr pScrn) {}
-void Permedia2VideoEnterVT(ScrnInfoPtr pScrn) {}
-void Permedia2VideoLeaveVT(ScrnInfoPtr pScrn) {}
-
-#else
-
 #undef MIN
 #undef ABS
 #undef CLAMP
@@ -746,8 +737,9 @@ AllocateBuffers(PortPrivPtr pPPriv,
 	    j = pPPriv->BufferStride / bytespp;
 
 	    if (j <= w && j <= 2048 && (j & 31) == 0 &&
-		(pPPriv->BufferPProd = partprodPermedia[j >> 5]) >= 0)
+		partprodPermedia[j >> 5] >= 0)
 	    {
+		pPPriv->BufferPProd = partprodPermedia[j >> 5];
 		pPPriv->pFBArea[i] = xf86AllocateOffscreenArea(pScrn->pScreen,
     		    w, h, 8 >> BPPSHIFT(pGlint), NULL, NULL, (pointer) pPPriv);
 
@@ -990,6 +982,7 @@ static void
 BlackOut(PortPrivPtr pPPriv, RegionPtr pRegion)
 {
     ScrnInfoPtr pScrn = pPPriv->pAdaptor->pScrn;
+    ScreenPtr pScreen = pScrn->pScreen;
     GLINTPtr pGlint = GLINTPTR(pScrn);
     RegionRec DRegion;
     BoxRec DBox;
@@ -3200,5 +3193,3 @@ Permedia2VideoInit(ScreenPtr pScreen)
 	DeleteAdaptorPriv(pAPriv);
     }
 }
-
-#endif /* XvExtension */
diff --git a/src/pm2ramdac.c b/src/pm2ramdac.c
index dddfcaa..26f6467 100644
--- a/src/pm2ramdac.c
+++ b/src/pm2ramdac.c
@@ -24,7 +24,7 @@
  * Permedia2OutIndReg() and Permedia2InIndReg() are used to access 
  * the indirect Permedia2 RAMDAC registers only.
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/pm2ramdac.c,v 1.11 2000/12/22 10:39:24 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/pm2ramdac.c,v 1.12 2003/10/08 15:48:40 eich Exp $ */
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
@@ -58,6 +58,7 @@ Permedia2InIndReg (ScrnInfoPtr pScrn, CARD32 reg)
   unsigned char ret;
 
   GLINT_SLOW_WRITE_REG (reg, PM2DACIndexReg);
+  GLINTDACDelay(5);
   ret = GLINT_READ_REG (PM2DACIndexData);
 
   return (ret);
diff --git a/src/pm2v_dac.c b/src/pm2v_dac.c
index 0fd10ca..e152816 100644
--- a/src/pm2v_dac.c
+++ b/src/pm2v_dac.c
@@ -27,7 +27,7 @@
  * this work is sponsored by S.u.S.E. GmbH, Fuerth, Elsa GmbH, Aachen and
  * Siemens Nixdorf Informationssysteme
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/pm2v_dac.c,v 1.29 2002/05/07 23:15:59 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/pm2v_dac.c,v 1.30 2003/11/03 05:11:13 tsi Exp $ */
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
@@ -218,9 +218,8 @@ Permedia2VInit(ScrnInfoPtr pScrn, DisplayModePtr mode)
     {
 	/* Get the programmable clock values */
     	unsigned char m,n,p;
-    	unsigned long clockused;
 	
-    	clockused = PM2VDAC_CalculateClock(mode->Clock/2,pGlint->RefClock,
+	(void) PM2VDAC_CalculateClock(mode->Clock/2,pGlint->RefClock,
 								&m,&n,&p);
 	pReg->DacRegs[PM2VDACRDDClk0PreScale] = m;
 	pReg->DacRegs[PM2VDACRDDClk0FeedbackScale] = n;
diff --git a/src/pm3_dac.c b/src/pm3_dac.c
index f848094..c724df6 100644
--- a/src/pm3_dac.c
+++ b/src/pm3_dac.c
@@ -26,7 +26,7 @@
  * this work is sponsored by Appian Graphics.
  * 
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/pm3_dac.c,v 1.33 2002/07/19 15:33:45 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/pm3_dac.c,v 1.34 2003/11/03 05:11:14 tsi Exp $ */
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
@@ -365,7 +365,6 @@ Permedia3PreInit(ScrnInfoPtr pScrn)
 
     if (IS_J2000) {
     	unsigned char m,n,p;
-    	unsigned long clockused;
 
 	if (pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_GAMMA)
 	    GLINT_SLOW_WRITE_REG(GCSRSecondaryGLINTMapEn, GCSRAperture);
@@ -386,7 +385,7 @@ Permedia3PreInit(ScrnInfoPtr pScrn)
 	 * Note 1 : pGlint->RefClock is not set yet, so use 14318 instead.
 	 * Note 2 : KClk gets internally halved, so we need to double it.
 	 */
-	clockused = PM3DAC_CalculateClock(2*105000, 14318, &m,&n,&p);
+	(void) PM3DAC_CalculateClock(2*105000, 14318, &m,&n,&p);
         Permedia2vOutIndReg(pScrn, PM3RD_KClkPreScale, 0x00, m);
         Permedia2vOutIndReg(pScrn, PM3RD_KClkFeedbackScale, 0x00, n);
         Permedia2vOutIndReg(pScrn, PM3RD_KClkPostScale, 0x00, p);
@@ -536,27 +535,24 @@ Permedia3Init(ScrnInfoPtr pScrn, DisplayModePtr mode, GLINTRegPtr pReg)
     {
 	/* Get the programmable clock values */
     	unsigned char m,n,p;
-    	unsigned long clockused;
 	
 	/* Let's program the dot clock */
 	switch (pGlint->Chipset) {
 	case PCI_VENDOR_3DLABS_CHIP_PERMEDIA4:
 	case PCI_VENDOR_3DLABS_CHIP_R4:
-	  clockused = PM4DAC_CalculateClock(mode->Clock,
-					    pGlint->RefClock, &m,&n,&p);
+	  (void) PM4DAC_CalculateClock(mode->Clock, pGlint->RefClock, &m,&n,&p);
 	  break;
 	case PCI_VENDOR_3DLABS_CHIP_PERMEDIA3:
-	  clockused = PM3DAC_CalculateClock(mode->Clock,
-					    pGlint->RefClock, &m,&n,&p);
+	  (void) PM3DAC_CalculateClock(mode->Clock, pGlint->RefClock, &m,&n,&p);
 	  break;
 	case PCI_VENDOR_3DLABS_CHIP_GAMMA:
 	  switch (pGlint->MultiChip) {
 	    case PCI_CHIP_PERMEDIA3:
-	  	clockused = PM3DAC_CalculateClock(mode->Clock,
+		(void) PM3DAC_CalculateClock(mode->Clock,
 					    pGlint->RefClock, &m,&n,&p);
 		break;
 	    case PCI_CHIP_R4:
-	  	clockused = PM4DAC_CalculateClock(mode->Clock,
+		(void) PM4DAC_CalculateClock(mode->Clock,
 					    pGlint->RefClock, &m,&n,&p);
 		break;
 	  }
diff --git a/src/pm3_video.c b/src/pm3_video.c
index 0a42417..35f0e05 100644
--- a/src/pm3_video.c
+++ b/src/pm3_video.c
@@ -22,7 +22,7 @@
  * Authors: Alan Hourihane, alanh@fairlite.demon.co.uk
  *          Sven Luther <luther@dpt-info.u-strasbg.fr>
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/pm3_video.c,v 1.11.2.1 2003/05/09 02:10:18 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/pm3_video.c,v 1.15 2003/11/10 18:22:21 tsi Exp $ */
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
@@ -52,11 +52,6 @@
 
 #define TIMER_MASK      (OFF_TIMER | FREE_TIMER)
 
-#ifndef XvExtension
-void Permedia3InitVideo(ScreenPtr pScreen) {}
-void Permedia3ResetVideo(ScrnInfoPtr pScrn) {}
-#else
-
 static XF86VideoAdaptorPtr Permedia3SetupImageVideo(ScreenPtr);
 static void Permedia3InitOffscreenImages(ScreenPtr);
 static void Permedia3StopVideo(ScrnInfoPtr, pointer, Bool);
@@ -330,7 +325,7 @@ Permedia3SetupImageVideo(ScreenPtr pScreen)
     pPriv->Filter = PM3VideoOverlayMode_FILTER_FULL;
     
     /* gotta uninit this someplace */
-    REGION_INIT(pScreen, &pPriv->clip, NullBox, 0); 
+    REGION_NULL(pScreen, &pPriv->clip);
 
     pGlint->adaptor = adapt;
 
@@ -345,35 +340,6 @@ Permedia3SetupImageVideo(ScreenPtr pScreen)
 }
 
 
-static Bool
-RegionsEqual(RegionPtr A, RegionPtr B)
-{
-    int *dataA, *dataB;
-    int num;
-
-    num = REGION_NUM_RECTS(A);
-    if(num != REGION_NUM_RECTS(B))
-	return FALSE;
-
-    if((A->extents.x1 != B->extents.x1) ||
-       (A->extents.x2 != B->extents.x2) ||
-       (A->extents.y1 != B->extents.y1) ||
-       (A->extents.y2 != B->extents.y2))
-	return FALSE;
-
-    dataA = (int*)REGION_RECTS(A);
-    dataB = (int*)REGION_RECTS(B);
-
-    while(num--) {
-	if((dataA[0] != dataB[0]) || (dataA[1] != dataB[1]))
-	   return FALSE;
-	dataA += 2; 
-	dataB += 2;
-    }
-
-    return TRUE;
-}
-
 static void 
 Permedia3StopVideo(ScrnInfoPtr pScrn, pointer data, Bool shutdown)
 {
@@ -734,7 +700,7 @@ Permedia3DisplayVideo(
     GLINTPtr pGlint = GLINTPTR(pScrn);
     GLINTPortPrivPtr portPriv = pGlint->adaptor->pPortPrivates[0].ptr;
     unsigned int shrink, zoom;
-    unsigned int newx1, newx2;
+    unsigned int newx2;
 
     /* Let's overlay only to visible parts of the screen */
     if (dstBox->x1 == 0) {
@@ -752,7 +718,7 @@ Permedia3DisplayVideo(
 
     /* Let's adjust the width of source and dest to be compliant with 
      * the Permedia3 overlay unit requirement, and compute the X deltas. */
-    newx1 = src_w; newx2 = drw_w;
+    newx2 = drw_w;
     compute_scale_factor(&src_w, &drw_w, &shrink, &zoom);
     dstBox->x2 -= (newx2 - drw_w);
 
@@ -955,7 +921,8 @@ Permedia3PutImage(
 	HWCopyYV12(pScrn, buf, width, height);
 
     /* paint the color key */
-    if(pPriv->autopaintColorKey && !RegionsEqual(&pPriv->clip, clipBoxes)) {
+    if(pPriv->autopaintColorKey &&
+       !REGION_EQUAL(pScrn->pScreen, &pPriv->clip, clipBoxes)) {
     	/* update cliplist */
         REGION_COPY(pScrn->pScreen, &pPriv->clip, clipBoxes);
 #if 0
@@ -1318,5 +1285,3 @@ Permedia3VideoTimerCallback(ScrnInfoPtr pScrn, Time time)
     } else  /* shouldn't get here */
 	pGlint->VideoTimerCallback = NULL;
 }
-
-#endif  /* !XvExtension */
diff --git a/src/pm_accel.c b/src/pm_accel.c
index f999006..8f00d98 100644
--- a/src/pm_accel.c
+++ b/src/pm_accel.c
@@ -28,7 +28,7 @@
  * 
  * Permedia accelerated options.
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/pm_accel.c,v 1.23 2001/05/29 11:23:38 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/pm_accel.c,v 1.25 2003/11/03 05:11:14 tsi Exp $ */
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
@@ -740,7 +740,7 @@ PermediaWritePixmap8bpp(
 {
     XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn);
     GLINTPtr pGlint = GLINTPTR(pScrn);
-    int skipleft, dwords, count;
+    int dwords, count;
     CARD32* srcp;
     unsigned char *srcpbyte;
     Bool FastTexLoad = FALSE;
@@ -755,9 +755,9 @@ PermediaWritePixmap8bpp(
 	FastTexLoad = FALSE;
 
 #if 0
-    if (rop == GXcopy) {
-	skipleft = 0;
-    } else {
+    if (rop != GXcopy) {
+	int skipleft;
+
 	if((skipleft = (long)src & 0x03)) {
 	    	skipleft /= (bpp>>3);
 
@@ -768,7 +768,6 @@ PermediaWritePixmap8bpp(
 	}
     }
 #endif
-    skipleft = 0;
 	
         if(FastTexLoad) {
 	  int address;
@@ -866,7 +865,7 @@ PermediaWritePixmap16bpp(
 {
     XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn);
     GLINTPtr pGlint = GLINTPTR(pScrn);
-    int skipleft, dwords, count;
+    int dwords, count;
     CARD32* srcp;
     unsigned short* srcpword;
     Bool FastTexLoad;
@@ -882,9 +881,9 @@ PermediaWritePixmap16bpp(
 		FastTexLoad = FALSE;
 
 #if 0
-	if (rop == GXcopy) {
-	  skipleft = 0;
-	} else {
+	if (rop != GXcopy) {
+	  int skipleft;
+
 	  if((skipleft = (long)src & 0x03L)) {
 	    		skipleft /= (bpp>>3);
 
@@ -895,7 +894,6 @@ PermediaWritePixmap16bpp(
 	  }
 	}
 #endif
-	skipleft = 0;
 	
         if(FastTexLoad) {
 	  int address;
@@ -993,7 +991,7 @@ PermediaWritePixmap32bpp(
 {
     XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn);
     GLINTPtr pGlint = GLINTPTR(pScrn);
-    int skipleft, dwords, count;
+    int dwords, count;
     CARD32* srcp;
     Bool FastTexLoad;
 
@@ -1013,6 +1011,8 @@ PermediaWritePixmap32bpp(
 	
 #if 0
 	if (!FastTexLoad) {
+	  int skipleft;
+
 	  if((skipleft = (long)src & 0x03L)) {
 	    		skipleft /= (bpp>>3);
 
@@ -1023,7 +1023,6 @@ PermediaWritePixmap32bpp(
 	  }
 	}
 #endif
-	skipleft = 0;
 	
         if(FastTexLoad) {
 	  int address;
@@ -1195,5 +1194,5 @@ PermediaSubsequentSolidBresenhamLine( ScrnInfoPtr pScrn,
                 (octant & XDECREASING) ? -1 : 1, 
                 (octant & YDECREASING) ? -1 : 1, 
                 (octant & YMAJOR) ? Y_AXIS : X_AXIS,
-                x, y, dmin + e, dmin, -dmaj, len);
+                x, y,  e, dmin, -dmaj, len);
 }
diff --git a/src/pm_dac.c b/src/pm_dac.c
index fed0c38..73980b8 100644
--- a/src/pm_dac.c
+++ b/src/pm_dac.c
@@ -27,7 +27,7 @@
  * this work is sponsored by S.u.S.E. GmbH, Fuerth, Elsa GmbH, Aachen and
  * Siemens Nixdorf Informationssysteme
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/pm_dac.c,v 1.11 2002/02/27 18:41:04 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/pm_dac.c,v 1.12 2003/11/03 05:11:14 tsi Exp $ */
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
@@ -96,9 +96,8 @@ PermediaInit(ScrnInfoPtr pScrn, DisplayModePtr mode)
     {
 	/* Get the programmable clock values */
     	unsigned long m=0,n=0,p=0,c=0;
-    	unsigned long clock;
 	
-    	clock = IBMramdac526CalculateMNPCForClock(pGlint->RefClock, mode->Clock,
+	(void) IBMramdac526CalculateMNPCForClock(pGlint->RefClock, mode->Clock,
 			1, pGlint->MinClock, pGlint->MaxClock, &m, &n, &p, &c);
 			
 	ramdacReg->DacRegs[IBMRGB_m0] = m;
@@ -110,7 +109,7 @@ PermediaInit(ScrnInfoPtr pScrn, DisplayModePtr mode)
 	ramdacReg->DacRegs[IBMRGB_pll_ctrl2] = 0x00;
 
 	p = 1;
-    	clock = IBMramdac526CalculateMNPCForClock(pGlint->RefClock, mode->Clock,
+	(void) IBMramdac526CalculateMNPCForClock(pGlint->RefClock, mode->Clock,
 			0, pGlint->MinClock, pGlint->MaxClock, &m, &n, &p, &c);
 
 	ramdacReg->DacRegs[IBMRGB_sysclk] = 0x05;
diff --git a/src/sx_accel.c b/src/sx_accel.c
index 36ecd4b..e972de6 100644
--- a/src/sx_accel.c
+++ b/src/sx_accel.c
@@ -28,7 +28,7 @@
  * 
  * GLINT 300SX accelerated options.
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/sx_accel.c,v 1.8 2001/10/28 03:33:30 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/sx_accel.c,v 1.9 2003/10/08 15:48:40 eich Exp $ */
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
@@ -868,5 +868,5 @@ SXSubsequentSolidBresenhamLine( ScrnInfoPtr pScrn,
                 (octant & XDECREASING) ? -1 : 1, 
                 (octant & YDECREASING) ? -1 : 1, 
                 (octant & YMAJOR) ? Y_AXIS : X_AXIS,
-                x, y, dmin + e, dmin, -dmaj, len);
+                x, y,  e, dmin, -dmaj, len);
 }
diff --git a/src/tx_accel.c b/src/tx_accel.c
index 9e30ec3..609cee9 100644
--- a/src/tx_accel.c
+++ b/src/tx_accel.c
@@ -28,7 +28,7 @@
  * 
  * GLINT 500TX / MX accelerated options.
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/tx_accel.c,v 1.28 2001/05/30 10:07:56 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/tx_accel.c,v 1.29 2003/10/08 15:48:40 eich Exp $ */
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
@@ -957,5 +957,5 @@ TXSubsequentSolidBresenhamLine( ScrnInfoPtr pScrn,
                 (octant & XDECREASING) ? -1 : 1, 
                 (octant & YDECREASING) ? -1 : 1, 
                 (octant & YMAJOR) ? Y_AXIS : X_AXIS,
-                x, y, dmin + e, dmin, -dmaj, len);
+                x, y,  e, dmin, -dmaj, len);
 }
diff --git a/src/tx_dac.c b/src/tx_dac.c
index 8924e96..36f5ec4 100644
--- a/src/tx_dac.c
+++ b/src/tx_dac.c
@@ -27,7 +27,7 @@
  * this work is sponsored by S.u.S.E. GmbH, Fuerth, Elsa GmbH, Aachen and
  * Siemens Nixdorf Informationssysteme
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/tx_dac.c,v 1.15 2001/05/29 11:23:38 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/tx_dac.c,v 1.16 2003/11/03 05:11:14 tsi Exp $ */
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
@@ -184,9 +184,8 @@ TXInit(ScrnInfoPtr pScrn, DisplayModePtr mode, GLINTRegPtr pReg)
     {
 	/* Get the programmable clock values */
     	unsigned long m=0,n=0,p=0,c=0;
-    	unsigned long clock;
 
-    	clock = IBMramdac526CalculateMNPCForClock(pGlint->RefClock, mode->Clock,
+	(void) IBMramdac526CalculateMNPCForClock(pGlint->RefClock, mode->Clock,
 			1, pGlint->MinClock, pGlint->MaxClock, &m, &n, &p, &c);
 			
 	STORERAMDAC(IBMRGB_m0, m);
@@ -198,7 +197,7 @@ TXInit(ScrnInfoPtr pScrn, DisplayModePtr mode, GLINTRegPtr pReg)
 	STORERAMDAC(IBMRGB_pll_ctrl2, 0x00);
 
 	p = 1;
-    	clock = IBMramdac526CalculateMNPCForClock(pGlint->RefClock, mode->Clock,
+	(void) IBMramdac526CalculateMNPCForClock(pGlint->RefClock, mode->Clock,
 			0, pGlint->MinClock, pGlint->MaxClock, &m, &n, &p, &c);
 
 	STORERAMDAC(IBMRGB_sysclk, 0x05);
@@ -222,9 +221,8 @@ TXInit(ScrnInfoPtr pScrn, DisplayModePtr mode, GLINTRegPtr pReg)
     {
 	/* Get the programmable clock values */
     	unsigned long m=0,n=0,p=0,c=0;
-    	unsigned long clock;
 
-    	clock = IBMramdac640CalculateMNPCForClock(pGlint->RefClock, mode->Clock,
+	(void) IBMramdac640CalculateMNPCForClock(pGlint->RefClock, mode->Clock,
 			1, pGlint->MinClock, pGlint->MaxClock, &m, &n, &p, &c);
 
 	STORERAMDAC(RGB640_PLL_N, n);