Author: branden
Date: 2004-08-10 18:52:25 -0500 (Tue, 10 Aug 2004)
New Revision: 1723
Modified:
trunk/debian/CHANGESETS
trunk/debian/changelog
trunk/debian/patches/030_Xserver_and_driver_region_primitive_fixups.diff
trunk/debian/patches/911_debian_XF86Config_to_XF86Config-4.diff
Log:
Grab from XFree86 CVS (2003-07-16) more updates to the nv driver. Fixes
several bugs as well as adding support for several chipsets, including
GeForce FX 5600SE, GeForce FX Go5600, GeForce FX Go5650, Quadro FX Go700,
GeForce FX Go5100, GeForce FX 5900 Ultra, GeForce FX 5900, Quadro FX 3000,
and the "mystery" TNT2 card with a PCI model ID of 0x002a. Extend
reversion of REGION_EQUAL macro implementation to nv driver in patch #030.
Resync patch #911.
Modified: trunk/debian/CHANGESETS
===================================================================
--- trunk/debian/CHANGESETS 2004-08-10 22:48:07 UTC (rev 1722)
+++ trunk/debian/CHANGESETS 2004-08-10 23:52:25 UTC (rev 1723)
@@ -272,4 +272,13 @@
Resync patches #032, #099e, #911.
1722
+Grab from XFree86 CVS (2003-07-16) more updates to the nv driver. Fixes
+several bugs as well as adding support for several chipsets, including
+GeForce FX 5600SE, GeForce FX Go5600, GeForce FX Go5650, Quadro FX Go700,
+GeForce FX Go5100, GeForce FX 5900 Ultra, GeForce FX 5900, Quadro FX 3000,
+and the "mystery" TNT2 card with a PCI model ID of 0x002a. Extend
+reversion of REGION_EQUAL macro implementation to nv driver in patch #030.
+Resync patch #911.
+ 1723
+
vim:set ai et sts=4 sw=4 tw=80:
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2004-08-10 22:48:07 UTC (rev 1722)
+++ trunk/debian/changelog 2004-08-10 23:52:25 UTC (rev 1723)
@@ -194,6 +194,14 @@
#026 (appres, ico) and #051 (setxkbmap, xkbcomp, xkbevd, xkbprint).
Resync patches #032, #099e, #911.
+ * Grab from XFree86 CVS (2003-07-16) more updates to the nv driver. Fixes
+ several bugs as well as adding support for several chipsets, including
+ GeForce FX 5600SE, GeForce FX Go5600, GeForce FX Go5650, Quadro FX Go700,
+ GeForce FX Go5100, GeForce FX 5900 Ultra, GeForce FX 5900, Quadro FX 3000,
+ and the "mystery" TNT2 card with a PCI model ID of 0x002a. Extend
+ reversion of REGION_EQUAL macro implementation to nv driver in patch #030.
+ Resync patch #911.
+
Changes by Fabio M. Di Nitto and Branden Robinson:
* Support building only the parts of the source tree needed by
@@ -234,7 +242,7 @@
* Add checks to NSERVERS and NDRIVERS to avoid an "unknown" card to be
counted as a supported one if the user choose to autodetected.
- -- Branden Robinson <[EMAIL PROTECTED]> Tue, 10 Aug 2004 17:39:54 -0500
+ -- Branden Robinson <[EMAIL PROTECTED]> Tue, 10 Aug 2004 17:56:17 -0500
xfree86 (4.3.0.dfsg.1-6) unstable; urgency=low
Modified:
trunk/debian/patches/030_Xserver_and_driver_region_primitive_fixups.diff
===================================================================
--- trunk/debian/patches/030_Xserver_and_driver_region_primitive_fixups.diff
2004-08-10 22:48:07 UTC (rev 1722)
+++ trunk/debian/patches/030_Xserver_and_driver_region_primitive_fixups.diff
2004-08-10 23:52:25 UTC (rev 1723)
@@ -7,6 +7,8 @@
implements it, and the rest of the changes from 2003-11-10, were very
disruptive, affecting the mi layer and many drivers.
+Revert same REGION_EQUAL change in nv driver.
+
--- xc/programs/Xserver/hw/xfree86/drivers/ati/atimach64xv.c~ 2004-05-05
17:08:17.000000000 -0500
+++ xc/programs/Xserver/hw/xfree86/drivers/ati/atimach64xv.c 2004-05-07
12:43:34.000000000 -0500
@@ -34,6 +34,38 @@
@@ -157,6 +159,59 @@
{
REGION_COPY(pScrn->pScreen, &pPriv->clip, clipBoxes);
/* draw these */
+--- xc/programs/Xserver/hw/xfree86/drivers/nv/nv_video.c~ 2004-08-09
20:23:49.000000000 -0500
++++ xc/programs/Xserver/hw/xfree86/drivers/nv/nv_video.c 2004-08-09
20:28:27.000000000 -0500
+@@ -345,6 +345,41 @@
+ return adapt;
+ }
+
++/*
++ * RegionsEqual
++ */
++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
+ NVPutOverlayImage (
+ ScrnInfoPtr pScrnInfo,
+@@ -373,7 +408,7 @@
+ /* paint the color key */
+ if(pPriv->autopaintColorKey &&
+ (pPriv->grabbedByV4L ||
+- !REGION_EQUAL(pScrnInfo->pScreen, &pPriv->clip, clipBoxes)))
++ RegionsEqual(&pPriv->clip, clipBoxes)))
+ {
+ /* we always paint V4L's color key */
+ if(!pPriv->grabbedByV4L)
--- xc/programs/Xserver/include/regionstr.h~ 2004-05-05 17:21:32.000000000
-0500
+++ xc/programs/Xserver/include/regionstr.h 2004-05-05 17:22:02.000000000
-0500
@@ -285,10 +285,21 @@
Modified: trunk/debian/patches/911_debian_XF86Config_to_XF86Config-4.diff
===================================================================
--- trunk/debian/patches/911_debian_XF86Config_to_XF86Config-4.diff
2004-08-10 22:48:07 UTC (rev 1722)
+++ trunk/debian/patches/911_debian_XF86Config_to_XF86Config-4.diff
2004-08-10 23:52:25 UTC (rev 1723)
@@ -643,18 +643,18 @@
.SH AUTHOR
Author: Sarma V. Kolluru
diff -urN xc/programs/Xserver/hw/xfree86~/drivers/nv/nv.man
xc/programs/Xserver/hw/xfree86/drivers/nv/nv.man
---- xc/programs/Xserver/hw/xfree86~/drivers/nv/nv.man 2004-08-02
16:45:58.000000000 -0500
-+++ xc/programs/Xserver/hw/xfree86/drivers/nv/nv.man 2004-08-02
17:24:09.000000000 -0500
+--- xc/programs/Xserver/hw/xfree86~/drivers/nv/nv.man 2004-08-10
17:18:39.000000000 -0500
++++ xc/programs/Xserver/hw/xfree86/drivers/nv/nv.man 2004-08-10
17:19:26.000000000 -0500
@@ -53,7 +53,7 @@
.B GeForce FX, QUADRO FX
- NV30, NV31, NV34
+ NV30, NV31, NV34, NV35
.SH CONFIGURATION DETAILS
-Please refer to XF86Config(__filemansuffix__) for general configuration
+Please refer to XF86Config-4(__filemansuffix__) for general configuration
details. This section only covers configuration details specific to this
driver.
.PP
-@@ -113,7 +113,7 @@
+@@ -114,7 +114,7 @@
.BI "Option \*qShadowFB\*q \*q" boolean \*q
Enable or disable use of the shadow framebuffer layer. Default: off.
.SH "SEE ALSO"
