DRI XFree86-4_3_99_12-merge importDRI-XFree86-4_3_99_12-merge

29 files changed, 106 insertions, 115 deletions

diff --git a/DRI.txt b/DRI.txt
index 56a87c9..5bac4f3 100644
--- a/DRI.txt
+++ b/DRI.txt
@@ -9,7 +9,7 @@ Permission is granted to make and distribute verbatim copies
 of this document provided the copyright notice and this permission
 notice are preserved on all copies.
 
-$XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/DRI.txt,v 1.1 1999/06/14 07:31:50 dawes Exp $
+$XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/DRI.txt,v 1.2 2000/02/23 04:47:06 martin Exp $
 
 GLINT State Transition Strategy
 
diff --git a/README.pm3 b/README.pm3
index c9de848..4d6972e 100644
--- a/README.pm3
+++ b/README.pm3
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/README.pm3,v 1.12 2001/08/18 11:37:30 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/README.pm3,v 1.13 2002/05/07 23:15:58 alanh Exp $ */
   
 STATUS as of Tue,  8 May 2001 19:01:39 +0200
   
diff --git a/man/glint.man b/man/glint.man
index e24663f..166de51 100644
--- a/man/glint.man
+++ b/man/glint.man
@@ -1,4 +1,4 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/glint.man,v 1.5 2001/12/17 20:52:32 dawes Exp $ 
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/glint.man,v 1.6 2003/02/14 12:03:09 alanh Exp $ 
 .\" shorthand for double quote that works everywhere.
 .ds q \N'34'
 .TH GLINT __drivermansuffix__ __vendorversion__
@@ -14,7 +14,7 @@ glint \- GLINT/Permedia video driver
 .fi
 .SH DESCRIPTION
 .B glint 
-is an __xservername__ driver for 3Dlabs & Texas Instruments GLINT/Permedia based video
+is an XFree86 driver for 3Dlabs & Texas Instruments GLINT/Permedia based video
 cards. The driver is rather fully accelerated, and provides support for the
 following framebuffer depths: 8, 15 (may give bad results with FBDev support),
 16, 24 (32 bpp recommended, 24 bpp has problems), 30, and an 8+24 overlay mode.
@@ -25,7 +25,7 @@ driver supports 3Dlabs (GLINT MX, GLINT 500TX, GLINT 300SX, GLINT GAMMA,
 GLINT DELTA, GLINT GAMMA2, Permedia, Permedia 2, Permedia 2v, Permedia 3, R3, 
 R4) and Texas Instruments (Permedia, Permedia 2) chips.
 .SH CONFIGURATION DETAILS
-Please refer to __xconfigfile__(__filemansuffix__) for general configuration
+Please refer to XF86Config(__filemansuffix__) for general configuration
 details.  This section only covers configuration details specific to this
 driver.
 .PP
@@ -104,7 +104,7 @@ acceleration in general, but disables it for some special cases.  Default: off.
 If you have a card of the same name, turn this on.  Default: off.
 .TP
 .SH "SEE ALSO"
-__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), xorgconfig(__appmansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__)
+XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
 .SH AUTHORS
 Authors include: Alan Hourihane, Dirk Hohndel, Stefan Dirsch, Michel Dänzer,
 Sven Luther
diff --git a/src/IBMramdac.c b/src/IBMramdac.c
index b3728b9..2a41fab 100644
--- a/src/IBMramdac.c
+++ b/src/IBMramdac.c
@@ -24,7 +24,7 @@
  * glintOutIBMRGBIndReg() and glintInIBMRGBIndReg() are used to access 
  * the indirect IBM RAMDAC registers only.
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/IBMramdac.c,v 1.5 1998/08/29 14:34:34 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/IBMramdac.c,v 1.6 1999/02/12 22:52:02 hohndel Exp $ */
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
diff --git a/src/TIramdac.c b/src/TIramdac.c
index 92b357d..e471c01 100644
--- a/src/TIramdac.c
+++ b/src/TIramdac.c
@@ -27,7 +27,7 @@
  * glintOutTIIndReg() and glintInTIIndReg() are used to access 
  * the indirect TI RAMDAC registers only.
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/TIramdac.c,v 1.4 2001/01/31 16:14:52 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/TIramdac.c,v 1.5 2002/10/30 12:52:15 alanh Exp $ */
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
diff --git a/src/glint.h b/src/glint.h
index 4cf8d2f..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.58tsi 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>
  *
diff --git a/src/glint_common.h b/src/glint_common.h
index 0670c4c..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 $
  *
  */
 
diff --git a/src/glint_dga.c b/src/glint_dga.c
index 2937145..ece7657 100644
--- a/src/glint_dga.c
+++ b/src/glint_dga.c
@@ -21,7 +21,7 @@
  *
  * Authors:  Alan Hourihane, <alanh@fairlite.demon.co.uk>
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/glint_dga.c,v 1.3 2001/04/10 20:33:30 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/glint_dga.c,v 1.4 2001/12/16 21:36:50 alanh Exp $ */
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
diff --git a/src/glint_dri.c b/src/glint_dri.c
index 7b34f2a..5ff871b 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.37 2003/11/10 18:22:20 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/glint_dri.c,v 1.34 2003/07/09 01:45:22 dawes 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%08lx\n",
+	       "[agp] %d kB allocated with handle 0x%08x\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 %p\n", pGlint->buffers.map);
+	       "[agp] DMA buffers mapped at 0x%08lx\n", pGlint->buffers.map);
 
    count = drmAddBufs( pGlint->drmSubFD,
 		       GLINT_DRI_BUF_COUNT, GLINT_DRI_BUF_SIZE,
@@ -761,7 +761,7 @@ GLINTDRIScreenInit(ScreenPtr pScreen)
 	    return FALSE;
     	}
     	xf86DrvMsg(pScrn->scrnIndex, X_INFO, "[drm] buffers mapped with %p\n",
-	       (void *)pGlint->drmBufs);
+	       pGlint->drmBufs);
     	xf86DrvMsg(pScrn->scrnIndex, X_INFO, "[drm] %d DMA buffers mapped\n",
 	       pGlint->drmBufs->count);
     } /* PCIMODE */
@@ -966,7 +966,7 @@ GLINTDRIFinishScreenInit(ScreenPtr pScreen)
 		return FALSE;
     	}
     	xf86DrvMsg(pScrn->scrnIndex, X_INFO, "[agp] buffers mapped with %p\n",
-	       (void *)pGlint->drmBufs);
+	       pGlint->drmBufs);
     	xf86DrvMsg(pScrn->scrnIndex, X_INFO, "[agp] %d DMA buffers mapped\n",
 	       pGlint->drmBufs->count);
     }
@@ -1915,8 +1915,8 @@ GLINTDRIMoveBuffers(
     RegionPtr prgnSrc,
     CARD32 index)
 {
-    ScreenPtr pScreen = pParent->drawable.pScreen;
 #if 0
+    ScreenPtr pScreen = pParent->drawable.pScreen;
     ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
 #endif
     int dx, dy;
@@ -1928,8 +1928,8 @@ GLINTDRIMoveBuffers(
      * and stencil, they just get redrawn for the next frame(s).
      */
 
-    REGION_NULL(pScreen, &rgnSubWindow);
-    REGION_NULL(pScreen, &rgnTranslateSrc);
+    REGION_INIT(pScreen, &rgnSubWindow, NullBox, 0);
+    REGION_INIT(pScreen, &rgnTranslateSrc, NullBox, 0);
     REGION_COPY(pScreen, &rgnTranslateSrc, prgnSrc);
     dx = ptOldOrg.x - pParent->drawable.x;
     dy = ptOldOrg.y - pParent->drawable.y;
diff --git a/src/glint_dri.h b/src/glint_dri.h
index 7b00143..3952759 100644
--- a/src/glint_dri.h
+++ b/src/glint_dri.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/glint_dri.h,v 1.6 2002/02/22 21:45:16 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/glint_dri.h,v 1.7 2002/10/30 12:52:16 alanh Exp $ */
 /**************************************************************************
 
 Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
diff --git a/src/glint_dripriv.h b/src/glint_dripriv.h
index 7803c4b..15d5e48 100644
--- a/src/glint_dripriv.h
+++ b/src/glint_dripriv.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/glint_dripriv.h,v 1.5 2000/06/17 10:00:13 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/glint_dripriv.h,v 1.6 2002/10/30 12:52:16 alanh Exp $ */
 /**************************************************************************
 
 Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
diff --git a/src/glint_driver.c b/src/glint_driver.c
index 2106d48..2160982 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.162 2003/11/03 05:11:11 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/glint_driver.c,v 1.159 2003/08/26 15:22:17 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 ModeStatus GLINTValidMode(int scrnIndex, DisplayModePtr mode,
-				 Bool verbose, int flags);
+static int	GLINTValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose,
+			     int flags);
 
 /* Internally used functions */
 static Bool	GLINTMapMem(ScrnInfoPtr pScrn);
@@ -386,7 +386,7 @@ static XF86ModuleVersionInfo glintVersRec =
 	MODULEVENDORSTRING,
 	MODINFOSTRING1,
 	MODINFOSTRING2,
-	XORG_VERSION_CURRENT,
+	XF86_VERSION_CURRENT,
 	GLINT_MAJOR_VERSION, GLINT_MINOR_VERSION, GLINT_PATCHLEVEL,
 	ABI_CLASS_VIDEODRV,			/* This is a video driver */
 	ABI_VIDEODRV_VERSION,
@@ -1377,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%lx\n", 
+		"FrameBuffer used from first rasterizer chip at 0x%x\n", 
 				pGlint->MultiPciInfo[0]->memBase[2]);
 	} else {
 	    xf86DrvMsg(pScrn->scrnIndex, X_PROBED, 	
@@ -1484,7 +1484,7 @@ GLINTPreInit(ScrnInfoPtr pScrn, int flags)
         	    int glintcopro = pciTag(pGlint->MultiPciInfo[0]->bus, 
 						pGlint->MultiPciInfo[0]->device,
 			    			pGlint->MultiPciInfo[0]->func);
-		    int base3copro, offset;
+		    int temp, base3copro, offset;
 
     		    if( (basedelta & 0x20000) ^ (basecopro & 0x20000) ) {
  			if ((pGlint->MultiChip == PCI_CHIP_PERMEDIA) ||
@@ -1509,18 +1509,18 @@ GLINTPreInit(ScrnInfoPtr pScrn, int flags)
 	 		 * read value
 	 		 * write new value
 	 		 */
-			(void) pciReadLong(glintdelta, 0x10);
+			temp = pciReadLong(glintdelta, 0x10);
 			pciWriteLong(glintdelta, 0x10, 0xffffffff);
-			(void) pciReadLong(glintdelta, 0x10);
+			temp = 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
 	 		 */
-			(void) pciReadLong(glintcopro, 0x30);
+			temp = pciReadLong(glintcopro, 0x30);
 			pciWriteLong(glintcopro, 0x30, 0xffffffff);
-			(void) pciReadLong(glintcopro, 0x30);
+			temp = pciReadLong(glintcopro, 0x30);
 			pciWriteLong(glintcopro, 0x30, 0);
 
 			/*
@@ -1632,10 +1632,11 @@ GLINTPreInit(ScrnInfoPtr pScrn, int flags)
          (pGlint->numMultiDevices == 2) ) {
 	CARD32 chipconfig;
 	CARD32 size = 0;
+	CARD32 temp;
 
 	GLINTMapMem(pScrn);
 
-	(void) GLINT_READ_REG(GCSRAperture);
+	temp = GLINT_READ_REG(GCSRAperture);
 	GLINT_SLOW_WRITE_REG(GCSRSecondaryGLINTMapEn, GCSRAperture);
 
 	chipconfig = GLINT_READ_REG(GChipConfig);
@@ -1668,7 +1669,7 @@ GLINTPreInit(ScrnInfoPtr pScrn, int flags)
 	}
     }
 
-    xf86DrvMsg(pScrn->scrnIndex, from, "VideoRAM: %ld kByte\n",
+    xf86DrvMsg(pScrn->scrnIndex, from, "VideoRAM: %d kByte\n",
 		   pGlint->FbMapSize / 1024);
 
     /* The ramdac module should be loaded here when needed */
@@ -3527,7 +3528,7 @@ GLINTFreeScreen(int scrnIndex, int flags)
 /* Checks if a mode is suitable for the selected chipset. */
 
 /* Optional */
-static ModeStatus
+static int
 GLINTValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags)
 {
     ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
@@ -3674,8 +3675,7 @@ void
 GLINT_VERB_WRITE_REG(GLINTPtr pGlint, CARD32 v, int r, char *file, int line)
 {
     if (xf86GetVerbosity() > 2)
-	ErrorF("[0x%04x] <- 0x%08lx (%s, %d)\n",
-		r, (unsigned long)v, file, line);
+	ErrorF("[0x%04x] <- 0x%08x (%s, %d)\n",	r, v, file, line);
     *(volatile CARD32 *)((char *) pGlint->IOBase + pGlint->IOOffset + r) = v;
 }
 
@@ -3686,8 +3686,7 @@ 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%04lx] -> 0x%08lx (%s, %d)\n", (unsigned long)r,
-		(unsigned long)v, file, line);
+	ErrorF("[0x%04x] -> 0x%08x (%s, %d)\n", r, v, file, line);
     return v;
 }
 #endif
diff --git a/src/glint_regs.h b/src/glint_regs.h
index e3cb87e..122832d 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.36tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/glint_regs.h,v 1.36 2003/01/12 03:55:47 tsi Exp $ */
 
 /*
  * glint register file 
@@ -1248,7 +1248,8 @@ do{								\
 
 #define GLINTDACDelay(x) do {                                   \
         int delay = x;                                          \
-	while(delay--){(void)GLINT_READ_REG(InFIFOSpace);};     \
+        unsigned char tmp;                                      \
+	while(delay--){tmp = GLINT_READ_REG(InFIFOSpace);};     \
 	} while(0)
         
 #define GLINT_MASK_WRITE_REG(v,m,r)				\
diff --git a/src/glint_shadow.c b/src/glint_shadow.c
index 12a5ee6..2dfcef8 100644
--- a/src/glint_shadow.c
+++ b/src/glint_shadow.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/glint_shadow.c,v 1.0 1999/08/22 05:57:35 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/glint_shadow.c,v 1.1 1999/11/19 13:54:32 hohndel Exp $ */
 
 /*
    Copyright (c) 1999,  The XFree86 Project Inc. 
diff --git a/src/pm2_accel.c b/src/pm2_accel.c
index b093bcc..583fbc1 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.30 2001/05/30 11:41:53 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/pm2_accel.c,v 1.31 2001/10/28 03:33:30 tsi 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,7 +409,6 @@ 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);
@@ -431,7 +430,6 @@ 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;
@@ -463,7 +461,6 @@ 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);
@@ -476,8 +473,8 @@ Permedia2SetupForScreenToScreenCopy(ScrnInfoPtr pScrn,
 				unsigned int planemask, int transparency_color)
 {
     GLINTPtr pGlint = GLINTPTR(pScrn);
-
     TRACE_ENTER("Permedia2SetupForScreenToScreenCopy");
+
     pGlint->BltScanDirection = 0;
     if (xdir == 1) pGlint->BltScanDirection |= XPositive;
     if (ydir == 1) pGlint->BltScanDirection |= YPositive;
@@ -539,7 +536,6 @@ 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);
@@ -555,7 +551,6 @@ 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);
@@ -568,7 +563,6 @@ Permedia2SetupForSolidLine(ScrnInfoPtr pScrn, int color,
 {
     GLINTPtr pGlint = GLINTPTR(pScrn);
 
-    TRACE_ENTER("Permedia2SetupForSolidLine");
     GLINT_WAIT(6);
     DO_PLANEMASK(planemask);
     GLINT_WRITE_REG(UNIT_DISABLE, ColorDDAMode);
@@ -585,8 +579,7 @@ 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);
@@ -608,7 +601,6 @@ Permedia2SubsequentSolidBresenhamLine( ScrnInfoPtr pScrn,
 {
     GLINTPtr pGlint = GLINTPTR(pScrn);
 
-    TRACE_ENTER("Permedia2SubsequentSolidBresenhamLine");
     if(dmaj == dmin) {
 	GLINT_WAIT(6);
 	if(octant & YDECREASING) {
@@ -629,12 +621,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, e, dmin, -dmaj, len);
+                x, y, dmin + e, dmin, -dmaj, len);
 }
 
 static void
@@ -644,7 +636,6 @@ 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);
@@ -685,7 +676,6 @@ 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);
@@ -696,8 +686,8 @@ Permedia2SubsequentFillRectSolid(ScrnInfoPtr pScrn, int x, int y, int w, int h)
 {
     GLINTPtr pGlint = GLINTPTR(pScrn);
     int speed = 0;
-
     TRACE_ENTER("Permedia2SubsequentFillRectSolid");
+
     if (pGlint->ROP == GXcopy) {
 	GLINT_WAIT(3);
         Permedia2LoadCoord(pScrn, x, y, w, h);
@@ -721,7 +711,6 @@ Permedia2SetupForMono8x8PatternFill24bpp(ScrnInfoPtr pScrn,
 {
     GLINTPtr pGlint = GLINTPTR(pScrn);
 
-    TRACE_ENTER("Permedia2SetupForMono8x8PatternFill24bpp");
     if (bg == -1) pGlint->FrameBufferReadMode = -1;
 	else    pGlint->FrameBufferReadMode = 0;
 
@@ -756,8 +745,8 @@ Permedia2SetupForMono8x8PatternFill(ScrnInfoPtr pScrn,
 					   unsigned int planemask)
 {
     GLINTPtr pGlint = GLINTPTR(pScrn);
-
     TRACE_ENTER("Permedia2SetupForMono8x8PatternFill");
+
     if (bg == -1) pGlint->FrameBufferReadMode = -1;
 	else    pGlint->FrameBufferReadMode = 0;
 
@@ -799,8 +788,7 @@ Permedia2SubsequentMono8x8PatternFillRect24bpp(ScrnInfoPtr pScrn,
 				   int w, int h)
 {
     GLINTPtr pGlint = GLINTPTR(pScrn);
-
-    TRACE_ENTER("Permedia2SubsequentMono8x8PatternFillRect24bpp");
+  
     GLINT_WAIT(8);
     Permedia2LoadCoord(pScrn, x, y, w, h);
 
@@ -935,7 +923,6 @@ Permedia2SubsequentColorExpandScanline(ScrnInfoPtr pScrn, int bufno)
 {
     GLINTPtr pGlint = GLINTPTR(pScrn);
 
-    TRACE_ENTER("Permedia2SubsequentColorExpandScanline");
     if (pGlint->cpucount--)
     	GLINT_WAIT(pGlint->dwords);
 }
@@ -1069,7 +1056,6 @@ Permedia2WritePixmap8bpp(
     unsigned char *srcpbyte;
     Bool FastTexLoad = FALSE;
 
-    TRACE_ENTER("Permedia2SubsequentMono8x8PatternFillRect24bpp");
     GLINT_WAIT(3);
     DO_PLANEMASK(planemask);
     GLINT_WRITE_REG(pGlint->RasterizerSwap,RasterizerMode);
@@ -1400,8 +1386,7 @@ 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 08c8141..6df6e08 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.26tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/pm2_dac.c,v 1.26 2001/12/06 15:16:40 tsi Exp $ */
 
 #include "Xarch.h"
 #include "xf86.h"
@@ -153,8 +153,9 @@ Permedia2Init(ScrnInfoPtr pScrn, DisplayModePtr mode)
     {
 	/* Get the programmable clock values */
     	unsigned char m,n,p;
+    	unsigned long clockused;
 	
-	(void) PM2DAC_CalculateMNPCForClock(mode->Clock,pGlint->RefClock,
+    	clockused = 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 45918d6..edf8a04 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.25tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/pm2_video.c,v 1.24 2003/04/23 21:51:36 tsi Exp $ */
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
@@ -737,9 +737,8 @@ AllocateBuffers(PortPrivPtr pPPriv,
 	    j = pPPriv->BufferStride / bytespp;
 
 	    if (j <= w && j <= 2048 && (j & 31) == 0 &&
-		partprodPermedia[j >> 5] >= 0)
+		(pPPriv->BufferPProd = partprodPermedia[j >> 5]) >= 0)
 	    {
-		pPPriv->BufferPProd = partprodPermedia[j >> 5];
 		pPPriv->pFBArea[i] = xf86AllocateOffscreenArea(pScrn->pScreen,
     		    w, h, 8 >> BPPSHIFT(pGlint), NULL, NULL, (pointer) pPPriv);
 
@@ -982,7 +981,6 @@ static void
 BlackOut(PortPrivPtr pPPriv, RegionPtr pRegion)
 {
     ScrnInfoPtr pScrn = pPPriv->pAdaptor->pScrn;
-    ScreenPtr pScreen = pScrn->pScreen;
     GLINTPtr pGlint = GLINTPTR(pScrn);
     RegionRec DRegion;
     BoxRec DBox;
diff --git a/src/pm2ramdac.c b/src/pm2ramdac.c
index 61cfb9a..dddfcaa 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.10 1999/07/18 03:26:57 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/pm2ramdac.c,v 1.11 2000/12/22 10:39:24 alanh Exp $ */
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
@@ -58,7 +58,6 @@ 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 0bd2d9e..0fd10ca 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.29tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/pm2v_dac.c,v 1.29 2002/05/07 23:15:59 alanh Exp $ */
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
@@ -218,8 +218,9 @@ Permedia2VInit(ScrnInfoPtr pScrn, DisplayModePtr mode)
     {
 	/* Get the programmable clock values */
     	unsigned char m,n,p;
+    	unsigned long clockused;
 	
-	(void) PM2VDAC_CalculateClock(mode->Clock/2,pGlint->RefClock,
+    	clockused = PM2VDAC_CalculateClock(mode->Clock/2,pGlint->RefClock,
 								&m,&n,&p);
 	pReg->DacRegs[PM2VDACRDDClk0PreScale] = m;
 	pReg->DacRegs[PM2VDACRDDClk0FeedbackScale] = n;
diff --git a/src/pm2vramdac.c b/src/pm2vramdac.c
index 4b55d78..ae5b1d0 100644
--- a/src/pm2vramdac.c
+++ b/src/pm2vramdac.c
@@ -24,7 +24,7 @@
  * Permedia2vOutIndReg() and Permedia2vInIndReg() are used to access 
  * the indirect Permedia2v RAMDAC registers only.
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/pm2vramdac.c,v 1.5 2001/01/30 10:06:35 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/pm2vramdac.c,v 1.6 2001/01/31 16:15:00 alanh Exp $ */
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
diff --git a/src/pm3_accel.c b/src/pm3_accel.c
index 9036f3e..9599590 100644
--- a/src/pm3_accel.c
+++ b/src/pm3_accel.c
@@ -1,4 +1,3 @@
-/* $XdotOrg$ */
 /*
  * Copyright 2000-2001 by Sven Luther <luther@dpt-info.u-strasbg.fr>.
  *
@@ -27,7 +26,7 @@
  * 
  * Permedia 3 accelerated options.
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/pm3_accel.c,v 1.30 2002/05/21 14:38:04 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/pm3_accel.c,v 1.31 2003/01/06 00:04:54 alanh Exp $ */
 
 #include "Xarch.h"
 #include "xf86.h"
@@ -385,7 +384,7 @@ Permedia3InitializeEngine(ScrnInfoPtr pScrn)
     GLINT_SLOW_WRITE_REG(0, StartXSub);
     GLINT_SLOW_WRITE_REG(0, StartY);
     GLINT_SLOW_WRITE_REG(0, GLINTCount);
-    if (*pGlint->AccelInfoRec->Sync != NULL)
+    if (*pGlint->AccelInfoRec->Sync)
     	(*pGlint->AccelInfoRec->Sync)(pScrn);
     TRACE_EXIT("Permedia3InitializeEngine");
 }
diff --git a/src/pm3_dac.c b/src/pm3_dac.c
index 435fff5..f848094 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.33tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/pm3_dac.c,v 1.33 2002/07/19 15:33:45 alanh Exp $ */
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
@@ -365,6 +365,7 @@ 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);
@@ -385,7 +386,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.
 	 */
-	(void) PM3DAC_CalculateClock(2*105000, 14318, &m,&n,&p);
+	clockused = 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);
@@ -535,24 +536,27 @@ 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:
-	  (void) PM4DAC_CalculateClock(mode->Clock, pGlint->RefClock, &m,&n,&p);
+	  clockused = PM4DAC_CalculateClock(mode->Clock,
+					    pGlint->RefClock, &m,&n,&p);
 	  break;
 	case PCI_VENDOR_3DLABS_CHIP_PERMEDIA3:
-	  (void) PM3DAC_CalculateClock(mode->Clock, pGlint->RefClock, &m,&n,&p);
+	  clockused = PM3DAC_CalculateClock(mode->Clock,
+					    pGlint->RefClock, &m,&n,&p);
 	  break;
 	case PCI_VENDOR_3DLABS_CHIP_GAMMA:
 	  switch (pGlint->MultiChip) {
 	    case PCI_CHIP_PERMEDIA3:
-		(void) PM3DAC_CalculateClock(mode->Clock,
+	  	clockused = PM3DAC_CalculateClock(mode->Clock,
 					    pGlint->RefClock, &m,&n,&p);
 		break;
 	    case PCI_CHIP_R4:
-		(void) PM4DAC_CalculateClock(mode->Clock,
+	  	clockused = PM4DAC_CalculateClock(mode->Clock,
 					    pGlint->RefClock, &m,&n,&p);
 		break;
 	  }
diff --git a/src/pm3_regs.h b/src/pm3_regs.h
index b029155..be9fc51 100644
--- a/src/pm3_regs.h
+++ b/src/pm3_regs.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/pm3_regs.h,v 1.9tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/pm3_regs.h,v 1.10 2003/01/12 03:55:47 tsi Exp $ */
 
 /*
  * glint register file 
diff --git a/src/pm3_video.c b/src/pm3_video.c
index e16eea8..311f5b4 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.14tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/pm3_video.c,v 1.13 2003/05/09 02:12:56 dawes Exp $ */
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
@@ -325,7 +325,7 @@ Permedia3SetupImageVideo(ScreenPtr pScreen)
     pPriv->Filter = PM3VideoOverlayMode_FILTER_FULL;
     
     /* gotta uninit this someplace */
-    REGION_NULL(pScreen, &pPriv->clip);
+    REGION_INIT(pScreen, &pPriv->clip, NullBox, 0); 
 
     pGlint->adaptor = adapt;
 
@@ -700,7 +700,7 @@ Permedia3DisplayVideo(
     GLINTPtr pGlint = GLINTPTR(pScrn);
     GLINTPortPrivPtr portPriv = pGlint->adaptor->pPortPrivates[0].ptr;
     unsigned int shrink, zoom;
-    unsigned int newx2;
+    unsigned int newx1, newx2;
 
     /* Let's overlay only to visible parts of the screen */
     if (dstBox->x1 == 0) {
@@ -718,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. */
-    newx2 = drw_w;
+    newx1 = src_w; newx2 = drw_w;
     compute_scale_factor(&src_w, &drw_w, &shrink, &zoom);
     dstBox->x2 -= (newx2 - drw_w);
 
diff --git a/src/pm_accel.c b/src/pm_accel.c
index 127a06f..f999006 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.24tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/pm_accel.c,v 1.23 2001/05/29 11:23:38 alanh 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 dwords, count;
+    int skipleft, dwords, count;
     CARD32* srcp;
     unsigned char *srcpbyte;
     Bool FastTexLoad = FALSE;
@@ -755,9 +755,9 @@ PermediaWritePixmap8bpp(
 	FastTexLoad = FALSE;
 
 #if 0
-    if (rop != GXcopy) {
-	int skipleft;
-
+    if (rop == GXcopy) {
+	skipleft = 0;
+    } else {
 	if((skipleft = (long)src & 0x03)) {
 	    	skipleft /= (bpp>>3);
 
@@ -768,6 +768,7 @@ PermediaWritePixmap8bpp(
 	}
     }
 #endif
+    skipleft = 0;
 	
         if(FastTexLoad) {
 	  int address;
@@ -865,7 +866,7 @@ PermediaWritePixmap16bpp(
 {
     XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn);
     GLINTPtr pGlint = GLINTPTR(pScrn);
-    int dwords, count;
+    int skipleft, dwords, count;
     CARD32* srcp;
     unsigned short* srcpword;
     Bool FastTexLoad;
@@ -881,9 +882,9 @@ PermediaWritePixmap16bpp(
 		FastTexLoad = FALSE;
 
 #if 0
-	if (rop != GXcopy) {
-	  int skipleft;
-
+	if (rop == GXcopy) {
+	  skipleft = 0;
+	} else {
 	  if((skipleft = (long)src & 0x03L)) {
 	    		skipleft /= (bpp>>3);
 
@@ -894,6 +895,7 @@ PermediaWritePixmap16bpp(
 	  }
 	}
 #endif
+	skipleft = 0;
 	
         if(FastTexLoad) {
 	  int address;
@@ -991,7 +993,7 @@ PermediaWritePixmap32bpp(
 {
     XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn);
     GLINTPtr pGlint = GLINTPTR(pScrn);
-    int dwords, count;
+    int skipleft, dwords, count;
     CARD32* srcp;
     Bool FastTexLoad;
 
@@ -1011,8 +1013,6 @@ PermediaWritePixmap32bpp(
 	
 #if 0
 	if (!FastTexLoad) {
-	  int skipleft;
-
 	  if((skipleft = (long)src & 0x03L)) {
 	    		skipleft /= (bpp>>3);
 
@@ -1023,6 +1023,7 @@ PermediaWritePixmap32bpp(
 	  }
 	}
 #endif
+	skipleft = 0;
 	
         if(FastTexLoad) {
 	  int address;
@@ -1194,5 +1195,5 @@ PermediaSubsequentSolidBresenhamLine( ScrnInfoPtr pScrn,
                 (octant & XDECREASING) ? -1 : 1, 
                 (octant & YDECREASING) ? -1 : 1, 
                 (octant & YMAJOR) ? Y_AXIS : X_AXIS,
-                x, y,  e, dmin, -dmaj, len);
+                x, y, dmin + e, dmin, -dmaj, len);
 }
diff --git a/src/pm_dac.c b/src/pm_dac.c
index a25f113..fed0c38 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.11tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/pm_dac.c,v 1.11 2002/02/27 18:41:04 alanh Exp $ */
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
@@ -96,8 +96,9 @@ PermediaInit(ScrnInfoPtr pScrn, DisplayModePtr mode)
     {
 	/* Get the programmable clock values */
     	unsigned long m=0,n=0,p=0,c=0;
+    	unsigned long clock;
 	
-	(void) IBMramdac526CalculateMNPCForClock(pGlint->RefClock, mode->Clock,
+    	clock = IBMramdac526CalculateMNPCForClock(pGlint->RefClock, mode->Clock,
 			1, pGlint->MinClock, pGlint->MaxClock, &m, &n, &p, &c);
 			
 	ramdacReg->DacRegs[IBMRGB_m0] = m;
@@ -109,7 +110,7 @@ PermediaInit(ScrnInfoPtr pScrn, DisplayModePtr mode)
 	ramdacReg->DacRegs[IBMRGB_pll_ctrl2] = 0x00;
 
 	p = 1;
-	(void) IBMramdac526CalculateMNPCForClock(pGlint->RefClock, mode->Clock,
+    	clock = 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 975602d..36ecd4b 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.7 2001/05/29 11:23:38 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/sx_accel.c,v 1.8 2001/10/28 03:33:30 tsi 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,  e, dmin, -dmaj, len);
+                x, y, dmin + e, dmin, -dmaj, len);
 }
diff --git a/src/tx_accel.c b/src/tx_accel.c
index 9c0ff1e..9e30ec3 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.27 2001/05/29 11:23:38 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/tx_accel.c,v 1.28 2001/05/30 10:07:56 alanh 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,  e, dmin, -dmaj, len);
+                x, y, dmin + e, dmin, -dmaj, len);
 }
diff --git a/src/tx_dac.c b/src/tx_dac.c
index 8704abf..8924e96 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.15tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/tx_dac.c,v 1.15 2001/05/29 11:23:38 alanh Exp $ */
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
@@ -184,8 +184,9 @@ 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;
 
-	(void) IBMramdac526CalculateMNPCForClock(pGlint->RefClock, mode->Clock,
+    	clock = IBMramdac526CalculateMNPCForClock(pGlint->RefClock, mode->Clock,
 			1, pGlint->MinClock, pGlint->MaxClock, &m, &n, &p, &c);
 			
 	STORERAMDAC(IBMRGB_m0, m);
@@ -197,7 +198,7 @@ TXInit(ScrnInfoPtr pScrn, DisplayModePtr mode, GLINTRegPtr pReg)
 	STORERAMDAC(IBMRGB_pll_ctrl2, 0x00);
 
 	p = 1;
-	(void) IBMramdac526CalculateMNPCForClock(pGlint->RefClock, mode->Clock,
+    	clock = IBMramdac526CalculateMNPCForClock(pGlint->RefClock, mode->Clock,
 			0, pGlint->MinClock, pGlint->MaxClock, &m, &n, &p, &c);
 
 	STORERAMDAC(IBMRGB_sysclk, 0x05);
@@ -221,8 +222,9 @@ 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;
 
-	(void) IBMramdac640CalculateMNPCForClock(pGlint->RefClock, mode->Clock,
+    	clock = IBMramdac640CalculateMNPCForClock(pGlint->RefClock, mode->Clock,
 			1, pGlint->MinClock, pGlint->MaxClock, &m, &n, &p, &c);
 
 	STORERAMDAC(RGB640_PLL_N, n);