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

12 files changed, 40 insertions, 27 deletions

diff --git a/man/i740.man b/man/i740.man
index 96fd1d1..9db6041 100644
--- a/man/i740.man
+++ b/man/i740.man
@@ -1,4 +1,4 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i740/i740.man,v 1.1 2001/01/24 00:06:19 dawes Exp $ 
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i740/i740.man,v 1.2 2001/01/27 18:20:48 dawes Exp $ 
 .\" shorthand for double quote that works everywhere.
 .ds q \N'34'
 .TH I740 __drivermansuffix__ __vendorversion__
@@ -14,17 +14,17 @@ i740 \- Intel i740 video driver
 .fi
 .SH DESCRIPTION
 .B i740
-is an __xservername__ driver for Intel i740 video cards.
+is an XFree86 driver for Intel i740 video cards.
 THIS MAN PAGE NEEDS TO BE FILLED IN.
 .SH SUPPORTED HARDWARE
 The
 .B i740
 driver supports...
 .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.
 .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: ...
diff --git a/src/i740.h b/src/i740.h
index 6db0515..267c13c 100644
--- a/src/i740.h
+++ b/src/i740.h
@@ -25,7 +25,7 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 **************************************************************************/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i740/i740.h,v 1.7 2002/10/23 16:08:36 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i740/i740.h,v 1.8 2003/08/23 16:09:17 dawes Exp $ */
 
 /*
  * Authors:
diff --git a/src/i740_accel.c b/src/i740_accel.c
index 83ee0c0..78c9644 100644
--- a/src/i740_accel.c
+++ b/src/i740_accel.c
@@ -25,7 +25,7 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 **************************************************************************/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i740/i740_accel.c,v 1.6 2002/01/25 21:56:02 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i740/i740_accel.c,v 1.7 2002/10/21 13:32:58 alanh Exp $ */
 
 /*
  * Authors:
diff --git a/src/i740_cursor.c b/src/i740_cursor.c
index a783a85..6f62660 100644
--- a/src/i740_cursor.c
+++ b/src/i740_cursor.c
@@ -25,7 +25,7 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 **************************************************************************/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i740/i740_cursor.c,v 1.4 2000/02/23 04:47:13 martin Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i740/i740_cursor.c,v 1.5 2002/10/21 13:32:58 alanh Exp $ */
 
 /*
  * Authors:
diff --git a/src/i740_dga.c b/src/i740_dga.c
index 2741e0d..0edc0b9 100644
--- a/src/i740_dga.c
+++ b/src/i740_dga.c
@@ -21,7 +21,7 @@
  *
  * Authors:  Patrick LERDA
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i740/i740_dga.c,v 1.1tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i740/i740_dga.c,v 1.2 2003/02/12 21:46:42 tsi Exp $ */
 
 
 #include "xf86.h"
diff --git a/src/i740_dga.h b/src/i740_dga.h
index 4f64ac3..ea00de2 100644
--- a/src/i740_dga.h
+++ b/src/i740_dga.h
@@ -21,6 +21,6 @@
  *
  * Authors:  Patrick LERDA
  */
-/* $XFree86$ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i740/i740_dga.h,v 1.1 2002/10/21 13:32:58 alanh Exp $ */
 
 Bool I740DGAInit(ScreenPtr pScreen);
diff --git a/src/i740_driver.c b/src/i740_driver.c
index 7af3c83..39a18f1 100644
--- a/src/i740_driver.c
+++ b/src/i740_driver.c
@@ -25,7 +25,7 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 **************************************************************************/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i740/i740_driver.c,v 1.49tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i740/i740_driver.c,v 1.47 2003/08/23 16:09:17 dawes Exp $ */
 
 /*
  * Authors:
@@ -137,8 +137,8 @@ static Bool I740SaveScreen(ScreenPtr pScreen, int mode);
 static void I740FreeScreen(int scrnIndex, int flags);
 
 /* Check if a mode is valid on the hardware */
-static ModeStatus I740ValidMode(int scrnIndex, DisplayModePtr mode,
-				Bool verbose, int flags);
+static int I740ValidMode(int scrnIndex, DisplayModePtr mode, Bool
+		       verbose, int flags);
 
 /* Switch to various Display Power Management System levels */
 static void I740DisplayPowerManagementSet(ScrnInfoPtr pScrn, 
@@ -241,6 +241,10 @@ static const char *xaaSymbols[] = {
     "XAADestroyInfoRec",
     "XAACreateInfoRec",
     "XAAInit",
+    "XAAStippleScanlineFuncLSBFirst",
+    "XAAOverlayFBfuncs",
+    "XAACachePlanarMonoStipple",
+    "XAAScreenIndex",
     NULL
 };
 
@@ -286,7 +290,7 @@ static XF86ModuleVersionInfo i740VersRec =
   MODULEVENDORSTRING,
   MODINFOSTRING1,
   MODINFOSTRING2,
-  XORG_VERSION_CURRENT,
+  XF86_VERSION_CURRENT,
   I740_MAJOR_VERSION, I740_MINOR_VERSION, I740_PATCHLEVEL,
   ABI_CLASS_VIDEODRV,
   ABI_VIDEODRV_VERSION,
@@ -493,6 +497,7 @@ I740ProbeDDC(ScrnInfoPtr pScrn, int index)
  */
 static Bool
 I740PreInit(ScrnInfoPtr pScrn, int flags) {
+  vgaHWPtr hwp;
   I740Ptr pI740;
   ClockRangePtr clockRanges;
   int i;
@@ -582,6 +587,7 @@ I740PreInit(ScrnInfoPtr pScrn, int flags) {
   /* We use a programamble clock */
   pScrn->progClock = TRUE;
 
+  hwp = VGAHWPTR(pScrn);
   pI740->cpp = pScrn->bitsPerPixel/8;
 
   /* Process the options */
@@ -1489,10 +1495,12 @@ I740ModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode_src)
 
 static void I740LoadPalette15(ScrnInfoPtr pScrn, int numColors, int *indices, LOCO *colors, VisualPtr pVisual)
 {
+  I740Ptr pI740;
   vgaHWPtr hwp;
   int i, index;
   unsigned char r, g, b;
 
+  pI740 = I740PTR(pScrn);
   hwp = VGAHWPTR(pScrn);
 
   for (i=0; i<numColors; i++)
@@ -1517,10 +1525,12 @@ static void I740LoadPalette15(ScrnInfoPtr pScrn, int numColors, int *indices, LO
 
 static void I740LoadPalette16(ScrnInfoPtr pScrn, int numColors, int *indices, LOCO *colors, VisualPtr pVisual)
 {
+  I740Ptr pI740;
   vgaHWPtr hwp;
   int i, index;
   unsigned char r, g, b;
 
+  pI740 = I740PTR(pScrn);
   hwp = VGAHWPTR(pScrn);
   for (i=0; i<numColors; i++) {
     index=indices[i/2];
@@ -1545,10 +1555,12 @@ static void I740LoadPalette16(ScrnInfoPtr pScrn, int numColors, int *indices, LO
 static void
 I740LoadPalette24(ScrnInfoPtr pScrn, int numColors, int *indices, LOCO *colors,
 		  VisualPtr pVisual) {
+  I740Ptr pI740;
   vgaHWPtr hwp;
   int i, index;
   unsigned char r, g, b;
 
+  pI740 = I740PTR(pScrn);
   hwp = VGAHWPTR(pScrn);
   for (i=0; i<numColors; i++) {
     index=indices[i];
@@ -1746,10 +1758,12 @@ I740SwitchMode(int scrnIndex, DisplayModePtr mode, int flags) {
 void
 I740AdjustFrame(int scrnIndex, int x, int y, int flags) {
   ScrnInfoPtr pScrn;
+  I740Ptr pI740;
   int Base;
   vgaHWPtr hwp;
 
   pScrn = xf86Screens[scrnIndex];
+  pI740 = I740PTR(pScrn);
   hwp = VGAHWPTR(pScrn);
 
   Base = (y * pScrn->displayWidth + x) >> 2;
@@ -1837,7 +1851,7 @@ I740FreeScreen(int scrnIndex, int flags) {
     vgaHWFreeHWRec(xf86Screens[scrnIndex]);
 }
 
-static ModeStatus
+static int
 I740ValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags) {
   if (mode->Flags & V_INTERLACE) {
     if (verbose) {
diff --git a/src/i740_i2c.c b/src/i740_i2c.c
index 92e2fdc..174a578 100644
--- a/src/i740_i2c.c
+++ b/src/i740_i2c.c
@@ -21,7 +21,7 @@
  *
  * Authors:  Patrick LERDA
  */
-/* $XFree86$ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i740/i740_i2c.c,v 1.1 2002/10/21 13:32:58 alanh Exp $ */
 
 /* not working at this time */
 
diff --git a/src/i740_io.c b/src/i740_io.c
index d70aad3..0195862 100644
--- a/src/i740_io.c
+++ b/src/i740_io.c
@@ -24,7 +24,7 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 **************************************************************************/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i740/i740_io.c,v 1.4 2002/01/25 21:56:03 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i740/i740_io.c,v 1.5 2002/10/21 13:32:58 alanh Exp $ */
 
 /*
  * Authors:
diff --git a/src/i740_macros.h b/src/i740_macros.h
index 84b4c19..797b89f 100644
--- a/src/i740_macros.h
+++ b/src/i740_macros.h
@@ -25,7 +25,7 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 **************************************************************************/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i740/i740_macros.h,v 1.3 2002/01/25 21:56:03 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i740/i740_macros.h,v 1.4 2002/10/21 13:32:58 alanh Exp $ */
 
 /*
  * Authors:
diff --git a/src/i740_reg.h b/src/i740_reg.h
index 28f6a16..0366d7e 100644
--- a/src/i740_reg.h
+++ b/src/i740_reg.h
@@ -25,7 +25,7 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 **************************************************************************/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i740/i740_reg.h,v 1.1 1999/08/29 12:20:59 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i740/i740_reg.h,v 1.2 2000/02/23 04:47:14 martin Exp $ */
 
 /*
  * Authors:
diff --git a/src/i740_video.c b/src/i740_video.c
index 1a28b91..be1712c 100644
--- a/src/i740_video.c
+++ b/src/i740_video.c
@@ -44,7 +44,7 @@
  *   12 September 2002 - Better software scaling with some averaging, giving a
  *     nicer picture.
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i740/i740_video.c,v 1.5tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i740/i740_video.c,v 1.4 2003/04/23 21:51:37 tsi Exp $ */
 
 
 /*
@@ -588,11 +588,11 @@ static FBLinearPtr I740AllocateMemory(ScrnInfoPtr pScrn, FBLinearPtr linear, int
 	return linear;
 
       if(xf86ResizeOffscreenLinear(linear, size)) {
-        xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "I740AllocateMemory resized to %d - %p\n", (int) size, (void *)linear);  /* ### */
+        xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "I740AllocateMemory resized to %d - %p\n", (int) size, linear);  /* ### */
 	return linear;
       }
 
-      xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "I740AllocateMemory free %p - %d < %d\n", (void *)linear, (int) linear->size, (int) size);  /* ### */
+      xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "I740AllocateMemory free %p - %d < %d\n", linear, (int) linear->size, (int) size);  /* ### */
       xf86FreeOffscreenLinear(linear);
     }
 
@@ -616,7 +616,7 @@ static FBLinearPtr I740AllocateMemory(ScrnInfoPtr pScrn, FBLinearPtr linear, int
       new_linear = xf86AllocateOffscreenLinear(pScreen, size, 4, 
 					       NULL, NULL, NULL);
     } 
-  xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "I740AllocateMemory allocated %d - %p\n", (int) size, (void *)new_linear);  /* ### */
+  xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "I740AllocateMemory allocated %d - %p\n", (int) size, new_linear);  /* ### */
 
   return new_linear;
 }
@@ -629,7 +629,6 @@ static int I740PutImage(ScrnInfoPtr pScrn,
 			Bool sync, RegionPtr clipBoxes, pointer data
 			)
 {
-  ScreenPtr pScreen = pScrn->pScreen;
   I740Ptr pI740 = I740PTR(pScrn);
   I740PortPrivPtr pPriv = (I740PortPrivPtr)data;
   INT32 x1, x2, y1, y2;
@@ -759,11 +758,11 @@ static int I740PutImage(ScrnInfoPtr pScrn,
   }
 
   /* update cliplist */
-  if(!REGION_EQUAL(pScreen, &pPriv->clip, clipBoxes))
+  if(!REGION_EQUAL(pScrn->pScreen, &pPriv->clip, clipBoxes))
     {
-      REGION_COPY(pScreen, &pPriv->clip, clipBoxes);
+      REGION_COPY(pScrn->pScreen, &pPriv->clip, clipBoxes);
       /* draw these */
-      xf86XVFillKeyHelper(pScreen, pPriv->colorKey, clipBoxes);
+      xf86XVFillKeyHelper(pScrn->pScreen, pPriv->colorKey, clipBoxes);
     }
 
   {
@@ -1217,7 +1216,7 @@ static XF86VideoAdaptorPtr I740SetupImageVideo(ScreenPtr pScreen)
   pPriv->currentBuf  = 0;
 
   /* gotta uninit this someplace */
-  REGION_NULL(pScreen, &pPriv->clip);
+  REGION_INIT(pScreen, &pPriv->clip, NullBox, 0); 
 
   pI740->adaptor = adapt;