DRI XFree86-4_3_99_12-merge importDRI-trunk-20040721DRI-trunk-20040613DRI-XFree86-4_3_99_12-merge

18 files changed, 50 insertions, 78 deletions

diff --git a/README b/README
index 3d7f200..b5b4730 100644
--- a/README
+++ b/README
@@ -147,4 +147,4 @@
 
 
 
-$XFree86: xc/programs/Xserver/hw/xfree86/drivers/neomagic/README,v 1.1 1999/04/17 07:06:15 dawes Exp $
+$XFree86: xc/programs/Xserver/hw/xfree86/drivers/neomagic/README,v 1.2 2002/10/30 12:52:20 alanh Exp $
diff --git a/TODO b/TODO
index d2a68e8..ab255c1 100644
--- a/TODO
+++ b/TODO
@@ -17,4 +17,4 @@
 
 
 
-$XFree86$
+$XFree86: xc/programs/Xserver/hw/xfree86/drivers/neomagic/TODO,v 1.1 1999/04/17 07:06:16 dawes Exp $
diff --git a/man/neomagic.man b/man/neomagic.man
index 040e0eb..6e5ae34 100644
--- a/man/neomagic.man
+++ b/man/neomagic.man
@@ -1,4 +1,4 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/neomagic/neomagic.man,v 1.4 2003/02/20 03:22:52 dawes Exp $ 
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/neomagic/neomagic.man,v 1.5 2003/05/29 21:48:09 herrb Exp $ 
 .\" shorthand for double quote that works everywhere.
 .ds q \N'34'
 .TH NEOMAGIC __drivermansuffix__ __vendorversion__
@@ -14,7 +14,7 @@ neomagic \- Neomagic video driver
 .fi
 .SH DESCRIPTION
 .B neomagic 
-is an __xservername__ driver for the Neomagic graphics chipsets found in many
+is an XFree86 driver for the Neomagic graphics chipsets found in many
 laptop computers.  
 .SH SUPPORTED HARDWARE
 .B neomagic
@@ -46,7 +46,7 @@ and newer models.  All visuals are supported in depth 8.  TrueColor and
 DirectColor visuals are supported in the other depths.
 
 .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
@@ -90,7 +90,7 @@ following options are needed to avoid a lock-up of the graphic engine:
 .fi
 
 .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: Jens Owen, Kevin E. Martin, and also Egbert Eich,  
 Mark Vojkovich, Alan Hourihane.
diff --git a/src/neo.h b/src/neo.h
index 3987796..b2b86b6 100644
--- a/src/neo.h
+++ b/src/neo.h
@@ -22,7 +22,7 @@ RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF
 CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
 CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 **********************************************************************/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/neomagic/neo.h,v 1.23tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/neomagic/neo.h,v 1.24 2003/04/23 21:51:40 tsi Exp $ */
 
 /*
  * The original Precision Insight driver for
diff --git a/src/neo_2070.c b/src/neo_2070.c
index a67b891..55fd637 100644
--- a/src/neo_2070.c
+++ b/src/neo_2070.c
@@ -22,7 +22,7 @@ RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF
 CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
 CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 **********************************************************************/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/neomagic/neo_2070.c,v 1.4 2002/04/04 14:05:44 eich Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/neomagic/neo_2070.c,v 1.5 2002/10/30 12:52:21 alanh Exp $ */
 
 /*
  * The original Precision Insight driver for
diff --git a/src/neo_2090.c b/src/neo_2090.c
index 2b75757..e424a93 100644
--- a/src/neo_2090.c
+++ b/src/neo_2090.c
@@ -22,7 +22,7 @@ RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF
 CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
 CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 **********************************************************************/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/neomagic/neo_2090.c,v 1.6 2002/04/04 14:05:44 eich Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/neomagic/neo_2090.c,v 1.7 2002/10/30 12:52:21 alanh Exp $ */
 
 /*
  * The original Precision Insight driver for
diff --git a/src/neo_2097.c b/src/neo_2097.c
index 1ddfc91..ce9b35b 100644
--- a/src/neo_2097.c
+++ b/src/neo_2097.c
@@ -22,7 +22,7 @@ RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF
 CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
 CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 **********************************************************************/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/neomagic/neo_2097.c,v 1.11 2002/10/30 12:52:21 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/neomagic/neo_2097.c,v 1.12 2002/12/10 17:36:29 dawes Exp $ */
 
 /*
  * The original Precision Insight driver for
diff --git a/src/neo_2200.c b/src/neo_2200.c
index 845aa32..04bb5ad 100644
--- a/src/neo_2200.c
+++ b/src/neo_2200.c
@@ -22,7 +22,7 @@ RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF
 CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
 CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 **********************************************************************/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/neomagic/neo_2200.c,v 1.19tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/neomagic/neo_2200.c,v 1.20 2003/01/12 03:55:48 tsi Exp $ */
 /*
  * The original Precision Insight driver for
  * XFree86 v.3.3 has been sponsored by Red Hat.
diff --git a/src/neo_bank.c b/src/neo_bank.c
index 668aad0..8c40f4f 100644
--- a/src/neo_bank.c
+++ b/src/neo_bank.c
@@ -22,7 +22,7 @@ RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF
 CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
 CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 **********************************************************************/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/neomagic/neo_bank.c,v 1.3 2002/01/25 21:56:05 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/neomagic/neo_bank.c,v 1.4 2002/10/30 12:52:21 alanh Exp $ */
 
 /*
  * The original Precision Insight driver for
diff --git a/src/neo_cursor.c b/src/neo_cursor.c
index 4f17a36..1863fe5 100644
--- a/src/neo_cursor.c
+++ b/src/neo_cursor.c
@@ -22,7 +22,7 @@ RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF
 CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
 CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 **********************************************************************/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/neomagic/neo_cursor.c,v 1.8 2001/10/28 03:33:42 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/neomagic/neo_cursor.c,v 1.9 2002/10/30 12:52:21 alanh Exp $ */
 
 /*
  * The original Precision Insight driver for
diff --git a/src/neo_dga.c b/src/neo_dga.c
index dd81e42..4fb97c2 100644
--- a/src/neo_dga.c
+++ b/src/neo_dga.c
@@ -21,7 +21,7 @@
  *
  * Authors:  Alan Hourihane, <alanh@fairlite.demon.co.uk>
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/neomagic/neo_dga.c,v 1.4 2001/10/01 13:44:07 eich Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/neomagic/neo_dga.c,v 1.5 2002/04/04 14:05:44 eich Exp $ */
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
diff --git a/src/neo_driver.c b/src/neo_driver.c
index 4d7de10..e1a3393 100644
--- a/src/neo_driver.c
+++ b/src/neo_driver.c
@@ -30,7 +30,7 @@ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  * Copyright 2002 Shigehiro Nomura
  */
 
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/neomagic/neo_driver.c,v 1.74 2003/12/31 05:07:30 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/neomagic/neo_driver.c,v 1.69 2003/08/23 15:03:03 dawes Exp $ */
 
 /*
  * The original Precision Insight driver for
@@ -123,8 +123,8 @@ static Bool     NEOEnterVT(int scrnIndex, int flags);
 static void     NEOLeaveVT(int scrnIndex, int flags);
 static Bool     NEOCloseScreen(int scrnIndex, ScreenPtr pScreen);
 static void     NEOFreeScreen(int scrnIndex, int flags);
-static ModeStatus NEOValidMode(int scrnIndex, DisplayModePtr mode,
-                               Bool verbose, int flags);
+static int      NEOValidMode(int scrnIndex, DisplayModePtr mode,
+                                 Bool verbose, int flags);
 
 /* Internally used functions */
 static int      neoFindIsaDevice(GDevPtr dev);
@@ -492,7 +492,7 @@ static XF86ModuleVersionInfo neoVersRec =
 	MODULEVENDORSTRING,
 	MODINFOSTRING1,
 	MODINFOSTRING2,
-	XORG_VERSION_CURRENT,
+	XF86_VERSION_CURRENT,
 	NEO_MAJOR_VERSION, NEO_MINOR_VERSION, NEO_PATCHLEVEL,
 	ABI_CLASS_VIDEODRV,
 	ABI_VIDEODRV_VERSION,
@@ -1195,7 +1195,7 @@ NEOPreInit(ScrnInfoPtr pScrn, int flags)
 	/* XXX Check this matches a PCI base address */
 	nPtr->NeoLinearAddr = nPtr->pEnt->device->MemBase;
 	xf86DrvMsg(pScrn->scrnIndex, X_CONFIG,
-		   "FB base address is set at 0x%lX.\n",
+		   "FB base address is set at 0x%X.\n",
 		   nPtr->NeoLinearAddr);
     } else {
 	nPtr->NeoLinearAddr = 0;
@@ -1207,7 +1207,7 @@ NEOPreInit(ScrnInfoPtr pScrn, int flags)
 	/* XXX Check this matches a PCI base address */
 	nPtr->NeoMMIOAddr = nPtr->pEnt->device->IOBase;
 	xf86DrvMsg(pScrn->scrnIndex, X_CONFIG,
-		   "MMIO base address is set at 0x%lX.\n",
+		   "MMIO base address is set at 0x%X.\n",
 		   nPtr->NeoMMIOAddr);
     } else {
 	nPtr->NeoMMIOAddr = 0;
@@ -1217,7 +1217,7 @@ NEOPreInit(ScrnInfoPtr pScrn, int flags)
 	if (!nPtr->NeoLinearAddr) {
 	    nPtr->NeoLinearAddr = nPtr->PciInfo->memBase[0];
 	    xf86DrvMsg(pScrn->scrnIndex, X_PROBED,
-		       "FB base address is set at 0x%lX.\n",
+		       "FB base address is set at 0x%X.\n",
 		       nPtr->NeoLinearAddr);
 	}
 	if (!nPtr->NeoMMIOAddr && !nPtr->noMMIO) {
@@ -1240,11 +1240,11 @@ NEOPreInit(ScrnInfoPtr pScrn, int flags)
 		break;
 	    }
 	    xf86DrvMsg(pScrn->scrnIndex, X_PROBED,
-		       "MMIO base address is set at 0x%lX.\n",
+		       "MMIO base address is set at 0x%X.\n",
 		       nPtr->NeoMMIOAddr);
 	    if (nPtr->NeoMMIOAddr2 != 0){
 	        xf86DrvMsg(pScrn->scrnIndex, X_PROBED,
-		           "MMIO base address2 is set at 0x%lX.\n",
+		           "MMIO base address2 is set at 0x%X.\n",
 		           nPtr->NeoMMIOAddr2);
 	    }
 	}
@@ -1262,13 +1262,13 @@ NEOPreInit(ScrnInfoPtr pScrn, int flags)
 	    VGAwGR(0x09,0x00);
 	    nPtr->NeoLinearAddr = addr << 20;
 	    xf86DrvMsg(pScrn->scrnIndex, X_PROBED,
-		       "FB base address is set at 0x%lX.\n",
+		       "FB base address is set at 0x%X.\n",
 		       nPtr->NeoLinearAddr);
 	}
 	if (!nPtr->NeoMMIOAddr && !nPtr->noMMIO) {
 	    nPtr->NeoMMIOAddr = nPtr->NeoLinearAddr + 0x100000;
 	    xf86DrvMsg(pScrn->scrnIndex, X_PROBED,
-		       "MMIO base address is set at 0x%lX.\n",
+		       "MMIO base address is set at 0x%X.\n",
 		       nPtr->NeoMMIOAddr);
 	}
 	linearRes[0].rBegin = nPtr->NeoLinearAddr;
@@ -1322,41 +1322,14 @@ NEOPreInit(ScrnInfoPtr pScrn, int flags)
 	nPtr->NeoCursorMem = 0;
     apertureSize = (pScrn->videoRam * 1024) - nPtr->NeoCursorMem;
 
-    if ((nPtr->NeoPanelWidth == 800) && (nPtr->NeoPanelHeight == 480)) {
-	neo800x480Mode.next = pScrn->monitor->Modes;
-	pScrn->monitor->Modes = &neo800x480Mode;
-    }
-    if ((nPtr->NeoPanelWidth == 1024) && (nPtr->NeoPanelHeight == 480)) {
-	neo1024x480Mode.next = pScrn->monitor->Modes;
-	pScrn->monitor->Modes = &neo1024x480Mode;
-    }
-
-    if (!pScrn->monitor->DDC) {
-	/*
-	 * If the monitor parameters are not specified explicitly, set them
-	 * so that 60Hz modes up to the panel size are allowed.
-	 */
-	if (pScrn->monitor->nHsync == 0) {
-	    pScrn->monitor->nHsync = 1;
-	    pScrn->monitor->hsync[0].lo = 28;
-	    pScrn->monitor->hsync[0].hi =
-				60.0 * 1.07 * nPtr->NeoPanelHeight / 1000.0;
-	    xf86DrvMsg(pScrn->scrnIndex, X_PROBED,
-		       "Using hsync range matching panel size: %.2f-%.2f kHz\n",
-		       pScrn->monitor->hsync[0].lo,
-		       pScrn->monitor->hsync[0].hi);
-	}
-	if (pScrn->monitor->nVrefresh == 0) {
-	    pScrn->monitor->nVrefresh = 1;
-	    pScrn->monitor->vrefresh[0].lo = 55.0;
-	    pScrn->monitor->vrefresh[0].hi = 65.0;
-	    xf86DrvMsg(pScrn->scrnIndex, X_PROBED,
-		       "Using vsync range for panel: %.2f-%.2f kHz\n",
-		       pScrn->monitor->vrefresh[0].lo,
-		       pScrn->monitor->vrefresh[0].hi);
-	}
-    }
-
+   if ((nPtr->NeoPanelWidth == 800) && (nPtr->NeoPanelHeight == 480)) {
+       neo800x480Mode.next = pScrn->monitor->Modes;
+       pScrn->monitor->Modes = &neo800x480Mode;
+   }
+   if ((nPtr->NeoPanelWidth == 1024) && (nPtr->NeoPanelHeight == 480)) {
+       neo1024x480Mode.next = pScrn->monitor->Modes;
+       pScrn->monitor->Modes = &neo1024x480Mode;
+   }
     /*
      * For external displays, limit the width to 1024 pixels or less.
      */
@@ -1818,7 +1791,7 @@ NEOScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
 		     0);
 
     if (!nPtr->noLinear) {
-	pScrn->memPhysBase = (unsigned long)nPtr->NeoLinearAddr;
+        pScrn->memPhysBase = (unsigned long)nPtr->NeoFbBase;
 	pScrn->fbOffset = 0;
     }
     
@@ -1941,13 +1914,12 @@ NEOFreeScreen(int scrnIndex, int flags)
 }
 
 /* Optional */
-static ModeStatus
+static int
 NEOValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags)
 {
     ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
     NEOPtr nPtr = NEOPTR(pScrn);
-    int vDisplay = mode->VDisplay * ((mode->Flags & V_DBLSCAN) ? 2 : 1);
-    
+
     /*
      * Limit the modes to just those allowed by the various NeoMagic
      * chips.  
@@ -1964,7 +1936,7 @@ NEOValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags)
 	if (nPtr->internDisp || !nPtr->externDisp) {
 	    /* Is the mode larger than the LCD panel? */
 	    if ((mode->HDisplay > nPtr->NeoPanelWidth) ||
-		(vDisplay > nPtr->NeoPanelHeight)) {
+		(mode->VDisplay > nPtr->NeoPanelHeight)) {
 		xf86DrvMsg(scrnIndex,X_INFO, "Removing mode (%dx%d) "
 			   "larger than the LCD panel (%dx%d)\n",
 			   mode->HDisplay,
@@ -2176,7 +2148,7 @@ neoSave(ScrnInfoPtr pScrn)
         save->reg = (regSavePtr)xnfcalloc(sizeof(regSaveRec), 1);
     else
         xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
-		   "Non-NULL reg in NeoSave: reg=%p\n", (void *)save->reg);
+		   "Non-NULL reg in NeoSave: reg=0x%08X\n", save->reg);
 
     save->reg->CR[0x23] = VGArCR(0x23);
     save->reg->CR[0x25] = VGArCR(0x25);
@@ -2942,7 +2914,7 @@ neoModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode)
      */
     if (NeoNew->reg) {
 	xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
-		   "Non-NULL reg in NeoInit: reg=%p\n", (void *)NeoNew->reg);
+		   "Non-NULL reg in NeoInit: reg=0x%08X\n", NeoNew->reg);
 	xfree(NeoNew->reg);
 	NeoNew->reg = NULL;
     }
@@ -3104,7 +3076,7 @@ neo_ddc1(int scrnIndex)
     /* initialize chipset */
     reg1 = VGArCR(0x21);
     reg2 = VGArCR(0x1D); 
-    reg3 = VGArCR(0xA1);
+    reg3 = VGArCR(0x1A);
     VGAwCR(0x21,0x00);
     VGAwCR(0x1D,0x01);  /* some Voodoo */ 
     VGAwGR(0xA1,0x2F);
@@ -3112,7 +3084,6 @@ neo_ddc1(int scrnIndex)
     /* undo initialization */
     VGAwCR(0x21,reg1);
     VGAwCR(0x1D,reg2);
-    VGAwGR(0xA1,reg3);
     return ret;
 }
 
diff --git a/src/neo_i2c.c b/src/neo_i2c.c
index 8a29786..e97c723 100644
--- a/src/neo_i2c.c
+++ b/src/neo_i2c.c
@@ -22,7 +22,7 @@ RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF
 CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
 CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 **********************************************************************/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/neomagic/neo_i2c.c,v 1.4 2002/09/16 18:05:58 eich Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/neomagic/neo_i2c.c,v 1.5 2002/10/30 12:52:22 alanh Exp $ */
 
 /*
  * The original Precision Insight driver for
diff --git a/src/neo_macros.h b/src/neo_macros.h
index abc08f1..7e53519 100644
--- a/src/neo_macros.h
+++ b/src/neo_macros.h
@@ -22,7 +22,7 @@ RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF
 CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
 CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 **********************************************************************/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/neomagic/neo_macros.h,v 1.1 1999/04/17 07:06:27 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/neomagic/neo_macros.h,v 1.2 2002/10/30 12:52:22 alanh Exp $ */
 
 /*
  * The original Precision Insight driver for
diff --git a/src/neo_reg.h b/src/neo_reg.h
index fddc016..389323d 100644
--- a/src/neo_reg.h
+++ b/src/neo_reg.h
@@ -22,7 +22,7 @@ RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF
 CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
 CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 **********************************************************************/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/neomagic/neo_reg.h,v 1.1 1999/04/17 07:06:29 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/neomagic/neo_reg.h,v 1.2 2002/10/30 12:52:22 alanh Exp $ */
 
 /*
  * The original Precision Insight driver for
diff --git a/src/neo_shadow.c b/src/neo_shadow.c
index d5c0bf3..c067830 100644
--- a/src/neo_shadow.c
+++ b/src/neo_shadow.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/neomagic/neo_shadow.c,v 1.2 2000/11/03 18:46:11 eich Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/neomagic/neo_shadow.c,v 1.3 2001/06/14 02:23:49 keithp Exp $ */
 
 /*
    Copyright (c) 1999, 2000 The XFree86 Project Inc. 
diff --git a/src/neo_video.c b/src/neo_video.c
index 292957b..7fc76b5 100644
--- a/src/neo_video.c
+++ b/src/neo_video.c
@@ -26,7 +26,7 @@ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 /*
  * Copyright 2002 SuSE Linux AG, Author: Egbert Eich
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/neomagic/neo_video.c,v 1.6tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/neomagic/neo_video.c,v 1.5 2003/04/23 21:51:40 tsi Exp $ */
 
 #include "neo.h"
 #include "neo_video.h"
@@ -252,7 +252,7 @@ NEOSetupVideo(ScreenPtr pScreen)
     pPriv->interlace = nPtr->interlace;
     pPriv->videoStatus = 0;
     pPriv->brightness = 0;
-    REGION_NULL(pScreen, &pPriv->clip);
+    REGION_INIT(pScreen, &pPriv->clip, NullBox, 0);
     nPtr->overlayAdaptor = overlayAdaptor;
 
     xvBrightness = MAKE_ATOM("XV_BRIGHTNESS");
@@ -986,7 +986,7 @@ NEOAllocSurface(ScrnInfoPtr pScrn, int id,
 		unsigned short width, unsigned short height,
 		XF86SurfacePtr surface)
 {
-    int pitch, size;
+    int pitch, bpp, size;
     NEOOffscreenPtr pPriv;
     FBLinearPtr linear;
 
@@ -998,6 +998,7 @@ NEOAllocSurface(ScrnInfoPtr pScrn, int id,
     }
 
     width = (width + 1) & ~1;
+    bpp = ((pScrn->bitsPerPixel + 1) >> 3);
     pitch = ((width << 1) + 15) & ~15;
     size = pitch * height;
 
@@ -1096,7 +1097,7 @@ NEODisplaySurface(XF86SurfacePtr surface,
     
     pPriv->isOn = TRUE;
     if (portPriv->videoStatus & CLIENT_VIDEO_ON){
-	REGION_EMPTY(surface->pScrn->pScreen, &portPriv->clip);
+	REGION_EMPTY(pScrn->pScreen, &portPriv->clip);
 	UpdateCurrentTime();
 	portPriv->videoStatus = FREE_TIMER;
 	portPriv->freeTime = currentTime.milliseconds + FREE_DELAY;
diff --git a/src/neo_video.h b/src/neo_video.h
index 2bc244e..dfdaa47 100644
--- a/src/neo_video.h
+++ b/src/neo_video.h
@@ -22,7 +22,7 @@ RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF
 CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
 CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 **********************************************************************/
-/* $XFree86$ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/neomagic/neo_video.h,v 1.2 2002/07/01 02:25:58 tsi Exp $ */
 
 #ifndef _NEO_VIDEO_H
 #define _NEO_VIDEO_H