CVS commit: xsrc/external/mit/xf86-video-nv/dist/src

2021-05-21 Thread Roland Illig 
Module Name:xsrc
Committed By:   rillig
Date:   Fri May 21 19:09:50 UTC 2021

Modified Files:
xsrc/external/mit/xf86-video-nv/dist/src: nv_setup.c

Log Message:
xf86-video-nv: fix Clang build on amd64, i386, macppc

xsrc/external/mit/xf86-video-nv/dist/src/nv_setup.c:258:49: error:
passing 'char *' to parameter of type 'Uchar *' (aka 'unsigned char *')
converts between pointers to integer types with different sign
[-Werror,-Wpointer-sign]

tmp = xf86InterpretEEDID(pScrn->scrnIndex, buffer);
   ^~


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/xf86-video-nv/dist/src/nv_setup.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xf86-video-nv/dist/src/nv_setup.c
diff -u xsrc/external/mit/xf86-video-nv/dist/src/nv_setup.c:1.2 xsrc/external/mit/xf86-video-nv/dist/src/nv_setup.c:1.3
--- xsrc/external/mit/xf86-video-nv/dist/src/nv_setup.c:1.2	Thu Mar 25 17:22:02 2021
+++ xsrc/external/mit/xf86-video-nv/dist/src/nv_setup.c	Fri May 21 19:09:50 2021
@@ -246,10 +246,10 @@ NVProbeDDC (ScrnInfoPtr pScrn, int bus)
 if (!MonInfo) {
 	/* ask wsdisplay */
 	struct wsdisplayio_edid_info ei;
-	char *buffer;
+	Uchar *buffer;
 	xf86MonPtr tmp;
 
-	buffer = malloc(1024);
+	buffer = malloc(1024);	/* XXX: missing null check */
 	ei.edid_data = buffer;
 	ei.buffer_size = 1024;
 	if (ioctl(xf86Info.consoleFd, WSDISPLAYIO_GET_EDID, ) != -1) {

CVS commit: xsrc/external/mit/xf86-video-nv/dist/src

2021-03-25 Thread Michael Lorenz 
Module Name:xsrc
Committed By:   macallan
Date:   Thu Mar 25 17:22:02 UTC 2021

Modified Files:
xsrc/external/mit/xf86-video-nv/dist/src: nv_setup.c

Log Message:
try WSDISPLAYIO_GET_EDID if DDC2 fails
now my iMac G5 correctly identifies its display


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.5 -r1.2 \
xsrc/external/mit/xf86-video-nv/dist/src/nv_setup.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xf86-video-nv/dist/src/nv_setup.c
diff -u xsrc/external/mit/xf86-video-nv/dist/src/nv_setup.c:1.1.1.5 xsrc/external/mit/xf86-video-nv/dist/src/nv_setup.c:1.2
--- xsrc/external/mit/xf86-video-nv/dist/src/nv_setup.c:1.1.1.5	Sun Mar  5 01:55:42 2017
+++ xsrc/external/mit/xf86-video-nv/dist/src/nv_setup.c	Thu Mar 25 17:22:02 2021
@@ -25,8 +25,16 @@
 #include "config.h"
 #endif
 
+#include "xf86Priv.h"
+#include "xf86Privstr.h"
 #include "nv_include.h"
 
+#ifdef __NetBSD__
+#include 
+#include 
+#include 
+#endif
+
 /*
  * Override VGA I/O routines.
  */
@@ -234,6 +242,26 @@ NVProbeDDC (ScrnInfoPtr pScrn, int bus)
 #else
 MonInfo = xf86DoEDID_DDC2(XF86_SCRN_ARG(pScrn), pNv->I2C);
 #endif
+#ifdef __NetBSD__
+if (!MonInfo) {
+	/* ask wsdisplay */
+	struct wsdisplayio_edid_info ei;
+	char *buffer;
+	xf86MonPtr tmp;
+
+	buffer = malloc(1024);
+	ei.edid_data = buffer;
+	ei.buffer_size = 1024;
+	if (ioctl(xf86Info.consoleFd, WSDISPLAYIO_GET_EDID, ) != -1) {
+	xf86Msg(X_INFO, "got %d bytes worth of EDID from wsdisplay\n",
+		ei.data_size);
+	tmp = xf86InterpretEEDID(pScrn->scrnIndex, buffer);
+	tmp->flags |= MONITOR_EDID_COMPLETE_RAWDATA;
+	MonInfo = tmp;
+	}
+	free(buffer);
+}
+#endif
 if (MonInfo) {
xf86DrvMsg(pScrn->scrnIndex, X_PROBED,
   "DDC detected a %s:\n", MonInfo->features.input_type ?

CVS commit: xsrc/external/mit/xf86-video-nv/dist/src

2018-10-04 Thread Michael Lorenz 
Module Name:xsrc
Committed By:   macallan
Date:   Fri Oct  5 01:53:54 UTC 2018

Modified Files:
xsrc/external/mit/xf86-video-nv/dist/src: nv_exa.c

Log Message:
for some reason my 6800 Ultra stalls when drawing *some* off-screen rectangles
as a workaround, draw them by software until I figure out what's going on


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/xf86-video-nv/dist/src/nv_exa.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xf86-video-nv/dist/src/nv_exa.c
diff -u xsrc/external/mit/xf86-video-nv/dist/src/nv_exa.c:1.4 xsrc/external/mit/xf86-video-nv/dist/src/nv_exa.c:1.5
--- xsrc/external/mit/xf86-video-nv/dist/src/nv_exa.c:1.4	Thu Jul 26 21:29:16 2018
+++ xsrc/external/mit/xf86-video-nv/dist/src/nv_exa.c	Fri Oct  5 01:53:54 2018
@@ -21,7 +21,7 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-/* $NetBSD: nv_exa.c,v 1.4 2018/07/26 21:29:16 macallan Exp $ */
+/* $NetBSD: nv_exa.c,v 1.5 2018/10/05 01:53:54 macallan Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -114,7 +114,7 @@ NvCopy
 	NVDmaNext (pNv, (h  << 16) | w);
 
 	if((w * h) >= 512)
-		NVDmaKickoff(pNv); 
+		NVDmaKickoff(pNv);
 
 	LEAVE;
 }
@@ -141,9 +141,19 @@ NvPrepareSolid(
 	if (pPixmap->drawable.bitsPerPixel != 32)
 		xf86Msg(X_ERROR, "%s %d bpp\n", __func__, pPixmap->drawable.bitsPerPixel);
 	planemask |= ~0 << pNv->CurrentLayout.depth;
+	off = exaGetPixmapOffset(pPixmap);
+
+	/* 
+	 * XXX
+	 * on my 6800 Ultra the drawing engine stalls when drawing at least
+	 * rectangles into off-screen memory. Draw them by software until I figure out
+	 * what's going on
+	 */
+	if (off != 0) return FALSE;
+	
+	NVSetRopSolid(pScrn, rop, planemask);
 
 	pitch = exaGetPixmapPitch(pPixmap);
-	off = exaGetPixmapOffset(pPixmap);
 
 	NVDmaStart(pNv, SURFACE_FORMAT, 4);
 	NVDmaNext (pNv, pNv->surfaceFormat);
@@ -154,8 +164,6 @@ NvPrepareSolid(
 	NVDmaStart(pNv, RECT_FORMAT, 1);
 	NVDmaNext (pNv, pNv->rectFormat);
 
-	NVSetRopSolid(pScrn, rop, planemask);
-
 	NVDmaStart(pNv, RECT_SOLID_COLOR, 1);
 	NVDmaNext (pNv, color);
 
@@ -324,6 +332,12 @@ NvInitExa(ScreenPtr pScreen)
 	NVDmaStart(pNv, RECT_FORMAT, 1);
 	NVDmaNext (pNv, pNv->rectFormat);
 
+	NVDmaStart(pNv, PATTERN_COLOR_0, 4);
+	NVDmaNext (pNv, 0x);
+	NVDmaNext (pNv, 0x);
+	NVDmaNext (pNv, 0x);
+	NVDmaNext (pNv, 0x);
+
 	pNv->currentRop = ~0;  /* set to something invalid */
 	NVSetRopSolid(pScrn, GXcopy, ~0);

CVS commit: xsrc/external/mit/xf86-video-nv/dist/src

2018-07-26 Thread Michael Lorenz 
Module Name:xsrc
Committed By:   macallan
Date:   Thu Jul 26 21:29:16 UTC 2018

Modified Files:
xsrc/external/mit/xf86-video-nv/dist/src: nv_exa.c nv_local.h nv_type.h
nv_xaa.c

Log Message:
- increase offscreen pixmap alignment
- don't pretend to support overlapping pixmaps
- reshuffle some register writes
- set surface formats every time we Prepare*()
-> less garbage, almost works correctly now


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xf86-video-nv/dist/src/nv_exa.c \
xsrc/external/mit/xf86-video-nv/dist/src/nv_type.h
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/xf86-video-nv/dist/src/nv_local.h \
xsrc/external/mit/xf86-video-nv/dist/src/nv_xaa.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xf86-video-nv/dist/src/nv_exa.c
diff -u xsrc/external/mit/xf86-video-nv/dist/src/nv_exa.c:1.3 xsrc/external/mit/xf86-video-nv/dist/src/nv_exa.c:1.4
--- xsrc/external/mit/xf86-video-nv/dist/src/nv_exa.c:1.3	Mon Jul 16 16:30:04 2018
+++ xsrc/external/mit/xf86-video-nv/dist/src/nv_exa.c	Thu Jul 26 21:29:16 2018
@@ -21,7 +21,7 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-/* $NetBSD: nv_exa.c,v 1.3 2018/07/16 16:30:04 macallan Exp $ */
+/* $NetBSD: nv_exa.c,v 1.4 2018/07/26 21:29:16 macallan Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -65,24 +65,28 @@ NvPrepareCopy
 {
 	ScrnInfoPtr pScrn = xf86Screens[pDstPixmap->drawable.pScreen->myNum];
 	NVPtr pNv = NVPTR(pScrn);
-	int srcpitch, srcoff, dstpitch, dstoff;
+	uint32_t dstpitch, dstoff, srcpitch, srcoff;
 
 	ENTER;
 	if (pSrcPixmap->drawable.bitsPerPixel != 32)
 		xf86Msg(X_ERROR, "%s %d bpp\n", __func__, pSrcPixmap->drawable.bitsPerPixel);
 	planemask |= ~0 << pNv->CurrentLayout.depth;
 	NVSetRopSolid(pScrn, rop, planemask);
-	pNv->DMAKickoffCallback = NVDMAKickoffCallback;
+
 	dstpitch = exaGetPixmapPitch(pDstPixmap);
 	dstoff = exaGetPixmapOffset(pDstPixmap);
 	srcpitch = exaGetPixmapPitch(pSrcPixmap);
 	srcoff = exaGetPixmapOffset(pSrcPixmap);
 
-	NVDmaStart(pNv, SURFACE_PITCH, 3);
+
+	NVDmaStart(pNv, SURFACE_FORMAT, 4);
+	NVDmaNext (pNv, pNv->surfaceFormat);
 	NVDmaNext (pNv, srcpitch | (dstpitch << 16));
 	NVDmaNext (pNv, srcoff);
 	NVDmaNext (pNv, dstoff);
 
+	pNv->DMAKickoffCallback = NVDMAKickoffCallback;
+
 	LEAVE;
 	return TRUE;
 }
@@ -102,6 +106,8 @@ NvCopy
 	ScrnInfoPtr pScrn = xf86Screens[pDstPixmap->drawable.pScreen->myNum];
 	NVPtr pNv = NVPTR(pScrn);
 
+	ENTER;
+
 	NVDmaStart(pNv, BLIT_POINT_SRC, 3);
 	NVDmaNext (pNv, (srcY << 16) | srcX);
 	NVDmaNext (pNv, (dstY << 16) | dstX);
@@ -129,27 +135,32 @@ NvPrepareSolid(
 {
 	ScrnInfoPtr pScrn = xf86Screens[pPixmap->drawable.pScreen->myNum];
 	NVPtr pNv = NVPTR(pScrn);
-	int pitch, off;
+	uint32_t pitch, off;
 
 	ENTER;
 	if (pPixmap->drawable.bitsPerPixel != 32)
 		xf86Msg(X_ERROR, "%s %d bpp\n", __func__, pPixmap->drawable.bitsPerPixel);
 	planemask |= ~0 << pNv->CurrentLayout.depth;
 
-
 	pitch = exaGetPixmapPitch(pPixmap);
 	off = exaGetPixmapOffset(pPixmap);
 
-	NVDmaStart(pNv, SURFACE_PITCH, 3);
+	NVDmaStart(pNv, SURFACE_FORMAT, 4);
+	NVDmaNext (pNv, pNv->surfaceFormat);
 	NVDmaNext (pNv, pitch | (pitch << 16));
 	NVDmaNext (pNv, off);
 	NVDmaNext (pNv, off);
 
+	NVDmaStart(pNv, RECT_FORMAT, 1);
+	NVDmaNext (pNv, pNv->rectFormat);
+
 	NVSetRopSolid(pScrn, rop, planemask);
-	pNv->DMAKickoffCallback = NVDMAKickoffCallback;
+
 	NVDmaStart(pNv, RECT_SOLID_COLOR, 1);
 	NVDmaNext (pNv, color);
 
+	pNv->DMAKickoffCallback = NVDMAKickoffCallback;
+
 	LEAVE;
 	return TRUE;
 }
@@ -167,6 +178,7 @@ NvSolid(
 	int w = x2 - x1, h = y2 - y1;
 
 	ENTER;
+
 	NVDmaStart(pNv, RECT_SOLID_RECTS(0), 2);
 	NVDmaNext (pNv, (x1 << 16) | y1);
 	NVDmaNext (pNv, (w << 16) | h);
@@ -203,7 +215,7 @@ NvUploadToScreen(PixmapPtr pDst, int x, 
 		src += src_pitch;
 		dst += dst_pitch;
 	}
-	_NV_FENCE()
+
 	LEAVE;
 	return TRUE;
 }
@@ -272,18 +284,17 @@ NvInitExa(ScreenPtr pScreen)
 	pExa->exa_minor = EXA_VERSION_MINOR;
 
 	pExa->memoryBase = pNv->FbStart;
-	pExa->memorySize = pNv->ScratchBufferStart & (~63);
-	pExa->offScreenBase = pScrn->virtualY * 
-pScrn->displayWidth * pScrn->bitsPerPixel >> 3;
-	pExa->pixmapOffsetAlign = 64;
-	pExa->pixmapPitchAlign = 64;
-
-	pExa->flags = EXA_OFFSCREEN_PIXMAPS |
-		  EXA_SUPPORTS_OFFSCREEN_OVERLAPS |
-		  EXA_MIXED_PIXMAPS;
+	pExa->memorySize = pNv->ScratchBufferStart & (~255);
+	pExa->offScreenBase = (((pScrn->virtualY * pScrn->displayWidth *
+			   pScrn->bitsPerPixel >> 3) + 255) & (~255));
+	pExa->pixmapOffsetAlign = 256;
+	pExa->pixmapPitchAlign = 256;
+
+	pExa->flags = EXA_OFFSCREEN_PIXMAPS/* |
+		  EXA_MIXED_PIXMAPS*/;
 
-	pExa->maxX = 8192;
-	pExa->maxY = 8192;	
+	pExa->maxX = 4096;
+	pExa->maxY = 4096;	
 
 	pExa->WaitMarker = NvWaitMarker;
 	pExa->PrepareSolid = NvPrepareSolid;
@@ -295,23 +306,23 @@ NvInitExa(ScreenPtr pScreen)

CVS commit: xsrc/external/mit/xf86-video-nv/dist/src

2018-07-16 Thread Michael Lorenz 
Module Name:xsrc
Committed By:   macallan
Date:   Mon Jul 16 16:30:04 UTC 2018

Modified Files:
xsrc/external/mit/xf86-video-nv/dist/src: nv_exa.c

Log Message:
fill in PrepareAccess() and FinishAcces() methods


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/xf86-video-nv/dist/src/nv_exa.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xf86-video-nv/dist/src/nv_exa.c
diff -u xsrc/external/mit/xf86-video-nv/dist/src/nv_exa.c:1.2 xsrc/external/mit/xf86-video-nv/dist/src/nv_exa.c:1.3
--- xsrc/external/mit/xf86-video-nv/dist/src/nv_exa.c:1.2	Mon Jul 16 09:55:13 2018
+++ xsrc/external/mit/xf86-video-nv/dist/src/nv_exa.c	Mon Jul 16 16:30:04 2018
@@ -21,7 +21,7 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-/* $NetBSD: nv_exa.c,v 1.2 2018/07/16 09:55:13 rjs Exp $ */
+/* $NetBSD: nv_exa.c,v 1.3 2018/07/16 16:30:04 macallan Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -238,6 +238,20 @@ NvDownloadFromScreen(PixmapPtr pSrc, int
 	return TRUE;
 }
 
+static Bool
+NvPrepareAccess(PixmapPtr pPix, int index)
+{
+	ScrnInfoPtr pScrn = xf86Screens[pPix->drawable.pScreen->myNum];
+
+	NVSync(pScrn);
+	return TRUE;	
+}
+
+static void
+NvFinishAccess(PixmapPtr pPix, int index)
+{
+}
+
 Bool
 NvInitExa(ScreenPtr pScreen)
 {
@@ -309,5 +323,8 @@ NvInitExa(ScreenPtr pScreen)
 	 */
 	pExa->UploadToScreen = NvUploadToScreen;
 	pExa->DownloadFromScreen = NvDownloadFromScreen;
+	pExa->PrepareAccess = NvPrepareAccess;
+	pExa->FinishAccess = NvFinishAccess;
+
 	return exaDriverInit(pScreen, pExa);
 }

CVS commit: xsrc/external/mit/xf86-video-nv/dist/src

2018-07-16 Thread Robert Swindells 
Module Name:xsrc
Committed By:   rjs
Date:   Mon Jul 16 09:55:14 UTC 2018

Modified Files:
xsrc/external/mit/xf86-video-nv/dist/src: nv_exa.c

Log Message:
Fix cats build.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 xsrc/external/mit/xf86-video-nv/dist/src/nv_exa.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xf86-video-nv/dist/src/nv_exa.c
diff -u xsrc/external/mit/xf86-video-nv/dist/src/nv_exa.c:1.1 xsrc/external/mit/xf86-video-nv/dist/src/nv_exa.c:1.2
--- xsrc/external/mit/xf86-video-nv/dist/src/nv_exa.c:1.1	Thu Jul 12 21:19:54 2018
+++ xsrc/external/mit/xf86-video-nv/dist/src/nv_exa.c	Mon Jul 16 09:55:13 2018
@@ -21,7 +21,7 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-/* $NetBSD: nv_exa.c,v 1.1 2018/07/12 21:19:54 macallan Exp $ */
+/* $NetBSD: nv_exa.c,v 1.2 2018/07/16 09:55:13 rjs Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -238,23 +238,6 @@ NvDownloadFromScreen(PixmapPtr pSrc, int
 	return TRUE;
 }
 
-#ifdef __arm__
-static Bool
-NvPrepareAccess(PixmapPtr pPix, int index)
-{
-	ScrnInfoPtr pScrn = xf86Screens[pPix->drawable.pScreen->myNum];
-	NVPtr pNv = NVPTR(pScrn);
-
-	IgsWaitReady(fPtr);
-	return TRUE;	
-}
-
-static void
-NvFinishAccess(PixmapPtr pPix, int index)
-{
-}
-#endif
-
 Bool
 NvInitExa(ScreenPtr pScreen)
 {
@@ -326,9 +309,5 @@ NvInitExa(ScreenPtr pScreen)
 	 */
 	pExa->UploadToScreen = NvUploadToScreen;
 	pExa->DownloadFromScreen = NvDownloadFromScreen;
-#ifdef __arm__
-	pExa->PrepareAccess = IgsPrepareAccess;
-	pExa->FinishAccess = IgsFinishAccess;
-#endif
 	return exaDriverInit(pScreen, pExa);
 }

CVS commit: xsrc/external/mit/xf86-video-nv/dist/src

2018-07-13 Thread matthew green 
Module Name:xsrc
Committed By:   mrg
Date:   Fri Jul 13 09:37:13 UTC 2018

Modified Files:
xsrc/external/mit/xf86-video-nv/dist/src: nv_type.h

Log Message:
add what i believe is the missing part from the previous commit to
the old nvidia driver.  fixes my build and appears to match intent.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/xf86-video-nv/dist/src/nv_type.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xf86-video-nv/dist/src/nv_type.h
diff -u xsrc/external/mit/xf86-video-nv/dist/src/nv_type.h:1.2 xsrc/external/mit/xf86-video-nv/dist/src/nv_type.h:1.3
--- xsrc/external/mit/xf86-video-nv/dist/src/nv_type.h:1.2	Thu Jul 12 21:19:54 2018
+++ xsrc/external/mit/xf86-video-nv/dist/src/nv_type.h	Fri Jul 13 09:37:13 2018
@@ -100,6 +100,7 @@ typedef struct {
 BoolHWCursor;
 BoolFpScale;
 BoolShadowFB;
+BoolUseEXA;
 unsigned char * ShadowPtr;
 int ShadowPitch;
 CARD32  MinVClockFreqKHz;

CVS commit: xsrc/external/mit/xf86-video-nv/dist/src

2018-07-12 Thread Michael Lorenz 
Module Name:xsrc
Committed By:   macallan
Date:   Thu Jul 12 21:19:55 UTC 2018

Modified Files:
xsrc/external/mit/xf86-video-nv/dist/src: nv_driver.c nv_proto.h
nv_type.h nv_xaa.c
Added Files:
xsrc/external/mit/xf86-video-nv/dist/src: nv_exa.c

Log Message:
add mostly working EXA support
tested on a GeForce 6800 Ultra in a G5
still produces occasional artifacts but good enough to run a bunch of xterms
and gtk2 applications


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 \
xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c
cvs rdiff -u -r0 -r1.1 xsrc/external/mit/xf86-video-nv/dist/src/nv_exa.c
cvs rdiff -u -r1.1.1.3 -r1.2 \
xsrc/external/mit/xf86-video-nv/dist/src/nv_proto.h
cvs rdiff -u -r1.1.1.4 -r1.2 \
xsrc/external/mit/xf86-video-nv/dist/src/nv_type.h
cvs rdiff -u -r1.1.1.2 -r1.2 \
xsrc/external/mit/xf86-video-nv/dist/src/nv_xaa.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c
diff -u xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c:1.9 xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c:1.10
--- xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c:1.9	Sun Mar  5 01:57:26 2017
+++ xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c	Thu Jul 12 21:19:54 2018
@@ -2058,11 +2058,22 @@ NVPreInit(ScrnInfoPtr pScrn, int flags)
 
 /* Load XAA if needed */
 if (!pNv->NoAccel) {
+	pNv->UseEXA = 1;
+#ifdef HAVE_XAA_H
 	if (!xf86LoadSubModule(pScrn, "xaa")) {
-	xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Falling back to shadwwfb\n");
+	xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Falling back to shadowfb\n");
 	pNv->NoAccel = 1;
 	pNv->ShadowFB = 1;
+	} else
+	pNv->UseEXA = 0;
+#else
+	if (!xf86LoadSubModule(pScrn, "exa")) {
+	xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Falling back to shadowfb\n");
+	pNv->NoAccel = 1;
+	pNv->UseEXA = 0;
+	pNv->ShadowFB = 1;
 	}
+#endif
 }
 
 /* Load ramdac if needed */
@@ -2591,6 +2602,7 @@ NVScreenInit(SCREEN_INIT_ARGS_DECL)
 if(offscreenHeight > 32767)
 offscreenHeight = 32767;
 
+#ifdef HAVE_XAA_H
 AvailFBArea.x1 = 0;
 AvailFBArea.y1 = 0;
 AvailFBArea.x2 = pScrn->displayWidth;
@@ -2599,7 +2611,10 @@ NVScreenInit(SCREEN_INIT_ARGS_DECL)
 
 if (!pNv->NoAccel)
 	NVAccelInit(pScreen);
-
+#endif
+if ((!pNv->NoAccel) && (pNv->UseEXA == 1))
+	NvInitExa(pScreen);
+
 xf86SetBackingStore(pScreen);
 xf86SetSilkenMouse(pScreen);
 

Index: xsrc/external/mit/xf86-video-nv/dist/src/nv_proto.h
diff -u xsrc/external/mit/xf86-video-nv/dist/src/nv_proto.h:1.1.1.3 xsrc/external/mit/xf86-video-nv/dist/src/nv_proto.h:1.2
--- xsrc/external/mit/xf86-video-nv/dist/src/nv_proto.h:1.1.1.3	Sun Mar  5 01:55:42 2017
+++ xsrc/external/mit/xf86-video-nv/dist/src/nv_proto.h	Thu Jul 12 21:19:54 2018
@@ -34,8 +34,13 @@ Bool   NVAccelInit(ScreenPtr pScreen);
 void   NVSync(ScrnInfoPtr pScrn);
 void   NVResetGraphics(ScrnInfoPtr pScrn);
 void   NVDmaKickoff(NVPtr pNv);
+void   NVDMAKickoffCallback(ScrnInfoPtr pScrn);
 void   NVDmaWait(NVPtr pNv, int size);
 void   NVWaitVSync(NVPtr pNv);
+void   NVSetRopSolid(ScrnInfoPtr pScrn, CARD32 rop, CARD32 planemask);
+
+/* in nv_exa.c */
+Bool   NvInitExa(ScreenPtr pScreen);
 
 /* in nv_dga.c */
 Bool   NVDGAInit(ScreenPtr pScreen);

Index: xsrc/external/mit/xf86-video-nv/dist/src/nv_type.h
diff -u xsrc/external/mit/xf86-video-nv/dist/src/nv_type.h:1.1.1.4 xsrc/external/mit/xf86-video-nv/dist/src/nv_type.h:1.2
--- xsrc/external/mit/xf86-video-nv/dist/src/nv_type.h:1.1.1.4	Sun Mar  5 01:55:42 2017
+++ xsrc/external/mit/xf86-video-nv/dist/src/nv_type.h	Thu Jul 12 21:19:54 2018
@@ -5,6 +5,7 @@
 #include "vgaHW.h"
 #include "xf86Cursor.h"
 #include "xf86int10.h"
+#include "exa.h"
 
 #define NV_ARCH_04  0x04
 #define NV_ARCH_10  0x10
@@ -128,6 +129,7 @@ typedef struct {
 #ifdef HAVE_XAA_H
 XAAInfoRecPtr   AccelInfoRec;
 #endif
+ExaDriverPtr 	pExa;
 xf86CursorInfoPtr   CursorInfoRec;
 DGAModePtr  DGAModes;
 int numDGAModes;

Index: xsrc/external/mit/xf86-video-nv/dist/src/nv_xaa.c
diff -u xsrc/external/mit/xf86-video-nv/dist/src/nv_xaa.c:1.1.1.2 xsrc/external/mit/xf86-video-nv/dist/src/nv_xaa.c:1.2
--- xsrc/external/mit/xf86-video-nv/dist/src/nv_xaa.c:1.1.1.2	Sun Jun  2 08:24:14 2013
+++ xsrc/external/mit/xf86-video-nv/dist/src/nv_xaa.c	Thu Jul 12 21:19:54 2018
@@ -106,7 +106,7 @@ NVDmaKickoff(NVPtr pNv)
You can't jump to the location of your put offset.  We write put
at the jump offset + SKIPS dwords with noop padding in between
to solve this problem */
-#define SKIPS  8
+#define SKIPS  16
 
 void 
 NVDmaWait (
@@ -176,7 +176,7 @@ NVSetPattern(
 NVDmaNext (pNv, pat1);
 }
 
-static void 
+void 
 NVSetRopSolid(ScrnInfoPtr pScrn, CARD32 rop, CARD32 planemask)
 {
 NVPtr pNv = NVPTR(pScrn);
@@ -282,16 +282,30 @@

CVS commit: xsrc/external/mit/xf86-video-nv/dist/src

2018-07-12 Thread Michael Lorenz 
Module Name:xsrc
Committed By:   macallan
Date:   Thu Jul 12 21:16:33 UTC 2018

Modified Files:
xsrc/external/mit/xf86-video-nv/dist/src: nv_local.h

Log Message:
add powerpc-specific barrier instructions, use them a bit more
now this mostly works on G5


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 \
xsrc/external/mit/xf86-video-nv/dist/src/nv_local.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xf86-video-nv/dist/src/nv_local.h
diff -u xsrc/external/mit/xf86-video-nv/dist/src/nv_local.h:1.1.1.2 xsrc/external/mit/xf86-video-nv/dist/src/nv_local.h:1.2
--- xsrc/external/mit/xf86-video-nv/dist/src/nv_local.h:1.1.1.2	Sun Mar  5 01:55:42 2017
+++ xsrc/external/mit/xf86-video-nv/dist/src/nv_local.h	Thu Jul 12 21:16:33 2018
@@ -54,8 +54,17 @@ typedef unsigned int   U032;
 #define VGA_WR08(p,i,d) NV_WR08(p,i,d)
 #define VGA_RD08(p,i)   NV_RD08(p,i)
 
-#define NVDmaNext(pNv, data) \
- (pNv)->dmaBase[(pNv)->dmaCurrent++] = (data)
+#if defined(__i386__)
+#define _NV_FENCE() outb(0x3D0, 0);
+#elif defined(__powerpc__)
+#define _NV_FENCE() __asm("eieio; sync;");
+#else
+#define _NV_FENCE() mem_barrier();
+#endif
+
+#define NVDmaNext(pNv, data) { \
+ (pNv)->dmaBase[(pNv)->dmaCurrent++] = (data); \
+ _NV_FENCE() }
 
 #define NVDmaStart(pNv, tag, size) {  \
  if((pNv)->dmaFree <= (size)) \
@@ -64,17 +73,13 @@ typedef unsigned int   U032;
  (pNv)->dmaFree -= ((size) + 1);  \
 }
 
-#if defined(__i386__)
-#define _NV_FENCE() outb(0x3D0, 0);
-#else
-#define _NV_FENCE() mem_barrier();
-#endif
-
 #define WRITE_PUT(pNv, data) {   \
   volatile CARD8 scratch;\
   _NV_FENCE()\
   scratch = (pNv)->FbStart[0];   \
+  _NV_FENCE()			 \
   (pNv)->FIFO[0x0010] = (data) << 2; \
+  _NV_FENCE()			 \
   mem_barrier(); \
 }

CVS commit: xsrc/external/mit/xf86-video-nv/dist/src

2016-09-21 Thread matthew green 
Module Name:xsrc
Committed By:   mrg
Date:   Wed Sep 21 17:59:20 UTC 2016

Modified Files:
xsrc/external/mit/xf86-video-nv/dist/src: riva_xaa.c

Log Message:
hide RivaSetRopPattern() behind HAVE_XAA_H.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 \
xsrc/external/mit/xf86-video-nv/dist/src/riva_xaa.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xf86-video-nv/dist/src/riva_xaa.c
diff -u xsrc/external/mit/xf86-video-nv/dist/src/riva_xaa.c:1.1.1.2 xsrc/external/mit/xf86-video-nv/dist/src/riva_xaa.c:1.2
--- xsrc/external/mit/xf86-video-nv/dist/src/riva_xaa.c:1.1.1.2	Sun Jun  2 08:24:14 2013
+++ xsrc/external/mit/xf86-video-nv/dist/src/riva_xaa.c	Wed Sep 21 17:59:20 2016
@@ -85,6 +85,7 @@ RivaSetRopSolid(RivaPtr pRiva, int rop)
 }
 }
 
+#ifdef HAVE_XAA_H
 static void
 RivaSetRopPattern(RivaPtr pRiva, int rop)
 {
@@ -94,7 +95,7 @@ RivaSetRopPattern(RivaPtr pRiva, int rop
 pRiva->riva.Rop->Rop3 = XAAGetPatternROP(rop);
 }
 }
-#ifdef HAVE_XAA_H
+
 /*
  * Fill solid rectangles.
  */

CVS commit: xsrc/external/mit/xf86-video-nv/dist/src

2016-09-21 Thread matthew green 
Module Name:xsrc
Committed By:   mrg
Date:   Wed Sep 21 17:58:19 UTC 2016

Modified Files:
xsrc/external/mit/xf86-video-nv/dist/src: g80_dma.c g80_dma.h g80_exa.c
g80_xaa.c g80_xaa.h

Log Message:
revert the previous; the XAA files need to just always be built even
without XAA support itself.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/xf86-video-nv/dist/src/g80_dma.c \
xsrc/external/mit/xf86-video-nv/dist/src/g80_dma.h \
xsrc/external/mit/xf86-video-nv/dist/src/g80_exa.c \
xsrc/external/mit/xf86-video-nv/dist/src/g80_xaa.c \
xsrc/external/mit/xf86-video-nv/dist/src/g80_xaa.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xf86-video-nv/dist/src/g80_dma.c
diff -u xsrc/external/mit/xf86-video-nv/dist/src/g80_dma.c:1.2 xsrc/external/mit/xf86-video-nv/dist/src/g80_dma.c:1.3
--- xsrc/external/mit/xf86-video-nv/dist/src/g80_dma.c:1.2	Wed Sep 21 17:48:18 2016
+++ xsrc/external/mit/xf86-video-nv/dist/src/g80_dma.c	Wed Sep 21 17:58:18 2016
@@ -63,12 +63,3 @@ void G80DmaWait(G80Ptr pNv, int size)
 pNv->dmaFree = dmaGet - pNv->dmaCurrent - 1;
 }
 }
-
-void
-G80DmaKickoffCallback(ScrnInfoPtr pScrn)
-{
-G80Ptr pNv = G80PTR(pScrn);
-
-G80DmaKickoff(pNv);
-pNv->DMAKickoffCallback = NULL;
-}
Index: xsrc/external/mit/xf86-video-nv/dist/src/g80_dma.h
diff -u xsrc/external/mit/xf86-video-nv/dist/src/g80_dma.h:1.2 xsrc/external/mit/xf86-video-nv/dist/src/g80_dma.h:1.3
--- xsrc/external/mit/xf86-video-nv/dist/src/g80_dma.h:1.2	Wed Sep 21 17:48:18 2016
+++ xsrc/external/mit/xf86-video-nv/dist/src/g80_dma.h	Wed Sep 21 17:58:18 2016
@@ -12,4 +12,3 @@
 
 void G80DmaKickoff(G80Ptr pNv);
 void G80DmaWait(G80Ptr pNv, int size);
-void G80DmaKickoffCallback(ScrnInfoPtr pScrn);
Index: xsrc/external/mit/xf86-video-nv/dist/src/g80_exa.c
diff -u xsrc/external/mit/xf86-video-nv/dist/src/g80_exa.c:1.2 xsrc/external/mit/xf86-video-nv/dist/src/g80_exa.c:1.3
--- xsrc/external/mit/xf86-video-nv/dist/src/g80_exa.c:1.2	Wed Sep 21 17:48:18 2016
+++ xsrc/external/mit/xf86-video-nv/dist/src/g80_exa.c	Wed Sep 21 17:58:18 2016
@@ -116,7 +116,7 @@ prepareSolid(PixmapPtr  pPixmap,
 G80DmaStart(pNv, 0x588, 1);
 G80DmaNext (pNv, fg);
 
-pNv->DMAKickoffCallback = G80DmaKickoffCallback;
+pNv->DMAKickoffCallback = G80DMAKickoffCallback;
 return TRUE;
 }
 
@@ -163,7 +163,7 @@ prepareCopy(PixmapPtr   pSrcPixmap,
 G80DmaNext (pNv, 4);
 G80SetRopSolid(pNv, alu, planemask);
 }
-pNv->DMAKickoffCallback = G80DmaKickoffCallback;
+pNv->DMAKickoffCallback = G80DMAKickoffCallback;
 return TRUE;
 }
 
@@ -283,7 +283,7 @@ upload(PixmapPtr pDst,
 if(kickoff)
 G80DmaKickoff(pNv);
 else
-pNv->DMAKickoffCallback = G80DmaKickoffCallback;
+pNv->DMAKickoffCallback = G80DMAKickoffCallback;
 
 return TRUE;
 }
Index: xsrc/external/mit/xf86-video-nv/dist/src/g80_xaa.c
diff -u xsrc/external/mit/xf86-video-nv/dist/src/g80_xaa.c:1.2 xsrc/external/mit/xf86-video-nv/dist/src/g80_xaa.c:1.3
--- xsrc/external/mit/xf86-video-nv/dist/src/g80_xaa.c:1.2	Wed Sep 21 17:48:18 2016
+++ xsrc/external/mit/xf86-video-nv/dist/src/g80_xaa.c	Wed Sep 21 17:58:18 2016
@@ -48,6 +48,15 @@ G80Sync(ScrnInfoPtr pScrn)
 }
 
 void
+G80DMAKickoffCallback(ScrnInfoPtr pScrn)
+{
+G80Ptr pNv = G80PTR(pScrn);
+
+G80DmaKickoff(pNv);
+pNv->DMAKickoffCallback = NULL;
+}
+
+void
 G80SetPattern(G80Ptr pNv, int bg, int fg, int pat0, int pat1)
 {
 G80DmaStart(pNv, 0x2f0, 4);
@@ -120,7 +129,7 @@ G80SetupForScreenToScreenCopy(
 G80DmaNext (pNv, 4);
 G80SetRopSolid(pNv, rop, planemask);
 }
-pNv->DMAKickoffCallback = G80DmaKickoffCallback;
+pNv->DMAKickoffCallback = G80DMAKickoffCallback;
 }
 
 static void
@@ -176,7 +185,7 @@ G80SetupForSolidFill(
 G80DmaStart(pNv, 0x588, 1);
 G80DmaNext (pNv, color);
 
-pNv->DMAKickoffCallback = G80DmaKickoffCallback;
+pNv->DMAKickoffCallback = G80DMAKickoffCallback;
 }
 
 static void
@@ -233,7 +242,7 @@ G80SetupForMono8x8PatternFill(
 G80DmaStart(pNv, 0x588, 1);
 G80DmaNext (pNv, fg);
 
-pNv->DMAKickoffCallback = G80DmaKickoffCallback;
+pNv->DMAKickoffCallback = G80DMAKickoffCallback;
 }
 
 static void
@@ -419,7 +428,7 @@ G80SetupForSolidLine(ScrnInfoPtr pScrn, 
 G80DmaStart(pNv, 0x588, 1);
 G80DmaNext (pNv, color);
 
-pNv->DMAKickoffCallback = G80DmaKickoffCallback;
+pNv->DMAKickoffCallback = G80DMAKickoffCallback;
 }
 
 static void
Index: xsrc/external/mit/xf86-video-nv/dist/src/g80_xaa.h
diff -u xsrc/external/mit/xf86-video-nv/dist/src/g80_xaa.h:1.2 xsrc/external/mit/xf86-video-nv/dist/src/g80_xaa.h:1.3
--- xsrc/external/mit/xf86-video-nv/dist/src/g80_xaa.h:1.2	Wed Sep 21 17:48:18 2016
+++ xsrc/external/mit/xf86-video-nv/dist/src/g80_xaa.h	Wed Sep 21 17:58:18 2016
@@ -1,4 +1,5 @@
 void

CVS commit: xsrc/external/mit/xf86-video-nv/dist/src

2016-09-21 Thread matthew green 
Module Name:xsrc
Committed By:   mrg
Date:   Wed Sep 21 17:48:18 UTC 2016

Modified Files:
xsrc/external/mit/xf86-video-nv/dist/src: g80_dma.c g80_dma.h g80_exa.c
g80_xaa.c g80_xaa.h

Log Message:
move G80DmaKickoffCallback into g80_dma.c so that it's visible no
non-XAA builds.  renamed from G80DMAKickoffCallback for consistency.
should fix PR#51480.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
xsrc/external/mit/xf86-video-nv/dist/src/g80_dma.c \
xsrc/external/mit/xf86-video-nv/dist/src/g80_dma.h \
xsrc/external/mit/xf86-video-nv/dist/src/g80_xaa.h
cvs rdiff -u -r1.1.1.3 -r1.2 \
xsrc/external/mit/xf86-video-nv/dist/src/g80_exa.c \
xsrc/external/mit/xf86-video-nv/dist/src/g80_xaa.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xf86-video-nv/dist/src/g80_dma.c
diff -u xsrc/external/mit/xf86-video-nv/dist/src/g80_dma.c:1.1.1.1 xsrc/external/mit/xf86-video-nv/dist/src/g80_dma.c:1.2
--- xsrc/external/mit/xf86-video-nv/dist/src/g80_dma.c:1.1.1.1	Sat Aug  2 05:14:16 2008
+++ xsrc/external/mit/xf86-video-nv/dist/src/g80_dma.c	Wed Sep 21 17:48:18 2016
@@ -63,3 +63,12 @@ void G80DmaWait(G80Ptr pNv, int size)
 pNv->dmaFree = dmaGet - pNv->dmaCurrent - 1;
 }
 }
+
+void
+G80DmaKickoffCallback(ScrnInfoPtr pScrn)
+{
+G80Ptr pNv = G80PTR(pScrn);
+
+G80DmaKickoff(pNv);
+pNv->DMAKickoffCallback = NULL;
+}
Index: xsrc/external/mit/xf86-video-nv/dist/src/g80_dma.h
diff -u xsrc/external/mit/xf86-video-nv/dist/src/g80_dma.h:1.1.1.1 xsrc/external/mit/xf86-video-nv/dist/src/g80_dma.h:1.2
--- xsrc/external/mit/xf86-video-nv/dist/src/g80_dma.h:1.1.1.1	Sat Aug  2 05:14:16 2008
+++ xsrc/external/mit/xf86-video-nv/dist/src/g80_dma.h	Wed Sep 21 17:48:18 2016
@@ -12,3 +12,4 @@
 
 void G80DmaKickoff(G80Ptr pNv);
 void G80DmaWait(G80Ptr pNv, int size);
+void G80DmaKickoffCallback(ScrnInfoPtr pScrn);
Index: xsrc/external/mit/xf86-video-nv/dist/src/g80_xaa.h
diff -u xsrc/external/mit/xf86-video-nv/dist/src/g80_xaa.h:1.1.1.1 xsrc/external/mit/xf86-video-nv/dist/src/g80_xaa.h:1.2
--- xsrc/external/mit/xf86-video-nv/dist/src/g80_xaa.h:1.1.1.1	Sat Aug  2 05:14:16 2008
+++ xsrc/external/mit/xf86-video-nv/dist/src/g80_xaa.h	Wed Sep 21 17:48:18 2016
@@ -1,5 +1,4 @@
 void G80Sync(ScrnInfoPtr pScrn);
-void G80DMAKickoffCallback(ScrnInfoPtr pScrn);
 void G80SetPattern(G80Ptr pNv, int bg, int fg, int pat0, int pat1);
 void G80SetRopSolid(G80Ptr pNv, CARD32 rop, CARD32 planemask);
 void G80SetClip(G80Ptr pNv, int x, int y, int w, int h);

Index: xsrc/external/mit/xf86-video-nv/dist/src/g80_exa.c
diff -u xsrc/external/mit/xf86-video-nv/dist/src/g80_exa.c:1.1.1.3 xsrc/external/mit/xf86-video-nv/dist/src/g80_exa.c:1.2
--- xsrc/external/mit/xf86-video-nv/dist/src/g80_exa.c:1.1.1.3	Sun Jun  2 08:24:14 2013
+++ xsrc/external/mit/xf86-video-nv/dist/src/g80_exa.c	Wed Sep 21 17:48:18 2016
@@ -116,7 +116,7 @@ prepareSolid(PixmapPtr  pPixmap,
 G80DmaStart(pNv, 0x588, 1);
 G80DmaNext (pNv, fg);
 
-pNv->DMAKickoffCallback = G80DMAKickoffCallback;
+pNv->DMAKickoffCallback = G80DmaKickoffCallback;
 return TRUE;
 }
 
@@ -163,7 +163,7 @@ prepareCopy(PixmapPtr   pSrcPixmap,
 G80DmaNext (pNv, 4);
 G80SetRopSolid(pNv, alu, planemask);
 }
-pNv->DMAKickoffCallback = G80DMAKickoffCallback;
+pNv->DMAKickoffCallback = G80DmaKickoffCallback;
 return TRUE;
 }
 
@@ -283,7 +283,7 @@ upload(PixmapPtr pDst,
 if(kickoff)
 G80DmaKickoff(pNv);
 else
-pNv->DMAKickoffCallback = G80DMAKickoffCallback;
+pNv->DMAKickoffCallback = G80DmaKickoffCallback;
 
 return TRUE;
 }
Index: xsrc/external/mit/xf86-video-nv/dist/src/g80_xaa.c
diff -u xsrc/external/mit/xf86-video-nv/dist/src/g80_xaa.c:1.1.1.3 xsrc/external/mit/xf86-video-nv/dist/src/g80_xaa.c:1.2
--- xsrc/external/mit/xf86-video-nv/dist/src/g80_xaa.c:1.1.1.3	Sun Jun  2 08:24:14 2013
+++ xsrc/external/mit/xf86-video-nv/dist/src/g80_xaa.c	Wed Sep 21 17:48:18 2016
@@ -48,15 +48,6 @@ G80Sync(ScrnInfoPtr pScrn)
 }
 
 void
-G80DMAKickoffCallback(ScrnInfoPtr pScrn)
-{
-G80Ptr pNv = G80PTR(pScrn);
-
-G80DmaKickoff(pNv);
-pNv->DMAKickoffCallback = NULL;
-}
-
-void
 G80SetPattern(G80Ptr pNv, int bg, int fg, int pat0, int pat1)
 {
 G80DmaStart(pNv, 0x2f0, 4);
@@ -129,7 +120,7 @@ G80SetupForScreenToScreenCopy(
 G80DmaNext (pNv, 4);
 G80SetRopSolid(pNv, rop, planemask);
 }
-pNv->DMAKickoffCallback = G80DMAKickoffCallback;
+pNv->DMAKickoffCallback = G80DmaKickoffCallback;
 }
 
 static void
@@ -185,7 +176,7 @@ G80SetupForSolidFill(
 G80DmaStart(pNv, 0x588, 1);
 G80DmaNext (pNv, color);
 
-pNv->DMAKickoffCallback = G80DMAKickoffCallback;
+pNv->DMAKickoffCallback = G80DmaKickoffCallback;
 }
 
 static void
@@ -242,7 +233,7 @@ G80SetupForMono8x8PatternFill(
 G80DmaStart(pNv, 0x588, 1);

CVS commit: xsrc/external/mit/xf86-video-nv/dist/src

2016-08-16 Thread matthew green 
Module Name:xsrc
Committed By:   mrg
Date:   Tue Aug 16 08:11:45 UTC 2016

Modified Files:
xsrc/external/mit/xf86-video-nv/dist/src: g80_driver.c g80_type.h
nv_include.h riva_include.h

Log Message:
include xorg-server.h which is normally included by config.h.

(this part of the change isn't a candidate for upstream.)

xf86GetOptValString() returns const char *


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/xf86-video-nv/dist/src/g80_driver.c \
xsrc/external/mit/xf86-video-nv/dist/src/g80_type.h \
xsrc/external/mit/xf86-video-nv/dist/src/riva_include.h
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/xf86-video-nv/dist/src/nv_include.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xf86-video-nv/dist/src/g80_driver.c
diff -u xsrc/external/mit/xf86-video-nv/dist/src/g80_driver.c:1.2 xsrc/external/mit/xf86-video-nv/dist/src/g80_driver.c:1.3
--- xsrc/external/mit/xf86-video-nv/dist/src/g80_driver.c:1.2	Tue Aug 16 01:27:47 2016
+++ xsrc/external/mit/xf86-video-nv/dist/src/g80_driver.c	Tue Aug 16 08:11:45 2016
@@ -28,6 +28,7 @@
 
 #include 
 
+#include "xorg-server.h"
 #include 
 #include 
 #if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
@@ -163,7 +164,7 @@ G80PreInit(ScrnInfoPtr pScrn, int flags)
 Bool primary;
 const rgb zeros = {0, 0, 0};
 const Gamma gzeros = {0.0, 0.0, 0.0};
-char *s;
+const char *s;
 CARD32 tmp;
 memType BAR1sizeKB;
 
Index: xsrc/external/mit/xf86-video-nv/dist/src/g80_type.h
diff -u xsrc/external/mit/xf86-video-nv/dist/src/g80_type.h:1.2 xsrc/external/mit/xf86-video-nv/dist/src/g80_type.h:1.3
--- xsrc/external/mit/xf86-video-nv/dist/src/g80_type.h:1.2	Wed Aug 20 09:54:04 2014
+++ xsrc/external/mit/xf86-video-nv/dist/src/g80_type.h	Tue Aug 16 08:11:45 2016
@@ -1,3 +1,4 @@
+#include "xorg-server.h"
 #include 
 #include 
 #include 
Index: xsrc/external/mit/xf86-video-nv/dist/src/riva_include.h
diff -u xsrc/external/mit/xf86-video-nv/dist/src/riva_include.h:1.2 xsrc/external/mit/xf86-video-nv/dist/src/riva_include.h:1.3
--- xsrc/external/mit/xf86-video-nv/dist/src/riva_include.h:1.2	Tue Aug 16 01:27:47 2016
+++ xsrc/external/mit/xf86-video-nv/dist/src/riva_include.h	Tue Aug 16 08:11:45 2016
@@ -4,6 +4,7 @@
 #include 
 
 /* All drivers should typically include these */
+#include "xorg-server.h"
 #include "xf86.h"
 #include "xf86_OSproc.h"
 

Index: xsrc/external/mit/xf86-video-nv/dist/src/nv_include.h
diff -u xsrc/external/mit/xf86-video-nv/dist/src/nv_include.h:1.3 xsrc/external/mit/xf86-video-nv/dist/src/nv_include.h:1.4
--- xsrc/external/mit/xf86-video-nv/dist/src/nv_include.h:1.3	Tue Aug 16 01:27:47 2016
+++ xsrc/external/mit/xf86-video-nv/dist/src/nv_include.h	Tue Aug 16 08:11:45 2016
@@ -6,6 +6,7 @@
 #include 
 
 /* All drivers should typically include these */
+#include "xorg-server.h"
 #include "xf86.h"
 #include "xf86_OSproc.h"

CVS commit: xsrc/external/mit/xf86-video-nv/dist/src

2014-08-20 Thread Michael Lorenz 
Module Name:xsrc
Committed By:   macallan
Date:   Wed Aug 20 09:54:04 UTC 2014

Modified Files:
xsrc/external/mit/xf86-video-nv/dist/src: g80_type.h

Log Message:
add -1 to enum ORNum to make clang happy


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.3 -r1.2 \
xsrc/external/mit/xf86-video-nv/dist/src/g80_type.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xf86-video-nv/dist/src/g80_type.h
diff -u xsrc/external/mit/xf86-video-nv/dist/src/g80_type.h:1.1.1.3 xsrc/external/mit/xf86-video-nv/dist/src/g80_type.h:1.2
--- xsrc/external/mit/xf86-video-nv/dist/src/g80_type.h:1.1.1.3	Sun Jun  2 08:24:14 2013
+++ xsrc/external/mit/xf86-video-nv/dist/src/g80_type.h	Wed Aug 20 09:54:04 2014
@@ -27,7 +27,8 @@ typedef enum ORNum {
DAC1 = 1,
DAC2 = 2,
SOR0 = 0,
-   SOR1 = 1
+   SOR1 = 1,
+   ORINVALID = -1
 } ORNum;
 
 typedef enum PanelType {

CVS commit: xsrc/external/mit/xf86-video-nv/dist/src

2014-08-17 Thread Joerg Sonnenberger 
Module Name:xsrc
Committed By:   joerg
Date:   Sun Aug 17 22:30:55 UTC 2014

Modified Files:
xsrc/external/mit/xf86-video-nv/dist/src: nv_driver.c

Log Message:
CARD32 uses non-canonical typedefs on i386, so explicitly cast to
uint32_t to fix build with clang.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c
diff -u xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c:1.6 xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c:1.7
--- xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c:1.6	Fri Aug 15 15:14:43 2014
+++ xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c	Sun Aug 17 22:30:55 2014
@@ -935,11 +935,11 @@ NVPciProbe(DriverPtr drv, int entity, st
 if(name)
 xf86DrvMsg(0, X_WARNING,
NV_NAME : Ignoring unsupported device 0x%PRIx32 (%s) at %2.2d@%2.2d:%2.2d:%1.1d\n,
-   id, name, dev-bus, dev-domain, dev-dev, dev-func);
+   (uint32_t)id, name, dev-bus, dev-domain, dev-dev, dev-func);
 else
 xf86DrvMsg(0, X_WARNING,
NV_NAME : Ignoring unsupported device 0x%PRIx32 at %2.2d@%2.2d:%2.2d:%1.1d\n,
-   id, dev-bus, dev-domain, dev-dev, dev-func);
+   (uint32_t)id, dev-bus, dev-domain, dev-dev, dev-func);
 return FALSE;
 }

CVS commit: xsrc/external/mit/xf86-video-nv/dist/src

2014-08-15 Thread Taylor R Campbell 
Module Name:xsrc
Committed By:   riastradh
Date:   Fri Aug 15 15:14:43 UTC 2014

Modified Files:
xsrc/external/mit/xf86-video-nv/dist/src: nv_driver.c

Log Message:
Fix format strings for uint32_t.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c
diff -u xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c:1.5 xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c:1.6
--- xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c:1.5	Wed Aug 13 22:45:12 2014
+++ xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c	Fri Aug 15 15:14:43 2014
@@ -921,7 +921,7 @@ NVPciProbe(DriverPtr drv, int entity, st
 #if NV_TEST_FOR_KERNEL_DRIVER
 if (pci_device_has_kernel_driver(dev)) {
 xf86DrvMsg(0, X_ERROR,
-   NV_NAME : The PCI device 0x%x (%s) at %2.2d@%2.2d:%2.2d:%1.1d has a kernel module claiming it.\n,
+   NV_NAME : The PCI device 0x%PRIx32 (%s) at %2.2d@%2.2d:%2.2d:%1.1d has a kernel module claiming it.\n,
id, name, dev-bus, dev-domain, dev-dev, dev-func);
 xf86DrvMsg(0, X_ERROR,
NV_NAME : This driver cannot operate until it has been unloaded.\n);
@@ -934,11 +934,11 @@ NVPciProbe(DriverPtr drv, int entity, st
 name = pci_device_get_device_name(dev);
 if(name)
 xf86DrvMsg(0, X_WARNING,
-   NV_NAME : Ignoring unsupported device 0x%x (%s) at %2.2d@%2.2d:%2.2d:%1.1d\n,
+   NV_NAME : Ignoring unsupported device 0x%PRIx32 (%s) at %2.2d@%2.2d:%2.2d:%1.1d\n,
id, name, dev-bus, dev-domain, dev-dev, dev-func);
 else
 xf86DrvMsg(0, X_WARNING,
-   NV_NAME : Ignoring unsupported device 0x%x at %2.2d@%2.2d:%2.2d:%1.1d\n,
+   NV_NAME : Ignoring unsupported device 0x%PRIx32 at %2.2d@%2.2d:%2.2d:%1.1d\n,
id, dev-bus, dev-domain, dev-dev, dev-func);
 return FALSE;
 }

CVS commit: xsrc/external/mit/xf86-video-nv/dist/src

2014-08-13 Thread Michael Lorenz 
Module Name:xsrc
Committed By:   macallan
Date:   Wed Aug 13 22:45:12 UTC 2014

Modified Files:
xsrc/external/mit/xf86-video-nv/dist/src: nv_driver.c

Log Message:
put pci_device_has_kernel_driver(dev) into #if NV_TEST_FOR_KERNEL_DRIVER
at least for now there is nothing that keeps the nv driver from running
if a kernel driver other than vga is attached
Now this works again on macppc ( and x86 if you use for example genfb )


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c
diff -u xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c:1.4 xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c:1.5
--- xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c:1.4	Sun Jun  2 08:29:33 2013
+++ xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c	Wed Aug 13 22:45:12 2014
@@ -911,15 +911,23 @@ NVPciProbe(DriverPtr drv, int entity, st
   NVGetPCIXpressChip(dev) : dev-vendor_id  16 | dev-device_id;
 const char *name = xf86TokenToString(NVKnownChipsets, id);
 
+/*
+ * XXX
+ * disable this test for now since it's bogus
+ * it will trigger whenever there's a driver other than vga attached to the
+ * device we're trying to probe, yet this works fine on top of gffb or genfb
+ * might need to revisit this when we have working DRM on non-x86
+ */
+#if NV_TEST_FOR_KERNEL_DRIVER
 if (pci_device_has_kernel_driver(dev)) {
 xf86DrvMsg(0, X_ERROR,
NV_NAME : The PCI device 0x%x (%s) at %2.2d@%2.2d:%2.2d:%1.1d has a kernel module claiming it.\n,
-   (int)id, name, dev-bus, dev-domain, dev-dev, dev-func);
+   id, name, dev-bus, dev-domain, dev-dev, dev-func);
 xf86DrvMsg(0, X_ERROR,
NV_NAME : This driver cannot operate until it has been unloaded.\n);
 return FALSE;
 }
-
+#endif
 if(dev-vendor_id == PCI_VENDOR_NVIDIA  !name 
!NVIsSupported(id)  !NVIsG80(id)) {
 /* See if pci.ids knows what the heck this thing is */
@@ -927,11 +935,11 @@ NVPciProbe(DriverPtr drv, int entity, st
 if(name)
 xf86DrvMsg(0, X_WARNING,
NV_NAME : Ignoring unsupported device 0x%x (%s) at %2.2d@%2.2d:%2.2d:%1.1d\n,
-   (int)id, name, dev-bus, dev-domain, dev-dev, dev-func);
+   id, name, dev-bus, dev-domain, dev-dev, dev-func);
 else
 xf86DrvMsg(0, X_WARNING,
NV_NAME : Ignoring unsupported device 0x%x at %2.2d@%2.2d:%2.2d:%1.1d\n,
-   (int)id, dev-bus, dev-domain, dev-dev, dev-func);
+   id, dev-bus, dev-domain, dev-dev, dev-func);
 return FALSE;
 }
 
@@ -1212,7 +1220,7 @@ NVCloseScreen(CLOSE_SCREEN_ARGS_DECL)
 NVLockUnlock(pNv, 1);
 }
 }
-
+
 NVUnmapMem(pScrn);
 #ifndef AVOID_VGAHW
 vgaHWUnmapMem(pScrn);
@@ -1260,7 +1268,6 @@ NVFreeScreen(FREE_SCREEN_ARGS_DECL)
  * This only gets called when a screen is being deleted.  It does not
  * get called routinely at the end of a server generation.
  */
-  
 if (xf86LoaderCheckSymbol(vgaHWFreeHWRec))
 	vgaHWFreeHWRec(pScrn);
 NVFreeRec(pScrn);

CVS commit: xsrc/external/mit/xf86-video-nv/dist/src

2012-05-29 Thread Michael Lorenz 
Module Name:xsrc
Committed By:   macallan
Date:   Wed May 30 04:54:27 UTC 2012

Modified Files:
xsrc/external/mit/xf86-video-nv/dist/src: nv_driver.c

Log Message:
don't map the VGA framebuffer if AVOID_VGAHW is defined


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.5 -r1.2 \
xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c
diff -u xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c:1.1.1.5 xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c:1.2
--- xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c:1.1.1.5	Mon Aug  9 16:17:55 2010
+++ xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c	Wed May 30 04:54:27 2012
@@ -1219,7 +1219,9 @@ NVCloseScreen(int scrnIndex, ScreenPtr p
 }
 
 NVUnmapMem(pScrn);
+#ifndef AVOID_VGAHW
 vgaHWUnmapMem(pScrn);
+#endif
 if (pNv-AccelInfoRec)
 XAADestroyInfoRec(pNv-AccelInfoRec);
 if (pNv-CursorInfoRec)
@@ -1259,6 +1261,7 @@ NVFreeScreen(int scrnIndex, int flags)
  * This only gets called when a screen is being deleted.  It does not
  * get called routinely at the end of a server generation.
  */
+  
 if (xf86LoaderCheckSymbol(vgaHWFreeHWRec))
 	vgaHWFreeHWRec(xf86Screens[scrnIndex]);
 NVFreeRec(xf86Screens[scrnIndex]);
@@ -2410,11 +2413,13 @@ NVScreenInit(int scrnIndex, ScreenPtr pS
 }
 
 /* Map the VGA memory when the primary video */
+#ifndef AVOID_VGAHW
 if (pNv-Primary  !pNv-FBDev) {
 	hwp-MapSize = 0x1;
 	if (!vgaHWMapMem(pScrn))
 	return FALSE;
 }
+#endif
 
 if (pNv-FBDev) {
 	fbdevHWSave(pScrn);

CVS commit: xsrc/external/mit/xf86-video-nv/dist

2010-08-09 Thread matthew green 
Module Name:xsrc
Committed By:   mrg
Date:   Mon Aug  9 16:17:58 UTC 2010

Update of /cvsroot/xsrc/external/mit/xf86-video-nv/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv3739

Log Message:
initial import of xf86-video-nv-2.1.18

Status:

Vendor Tag: xorg
Release Tags:   xf86-video-nv-2-1-18

U xsrc/external/mit/xf86-video-nv/dist/Makefile.am
U xsrc/external/mit/xf86-video-nv/dist/INSTALL
U xsrc/external/mit/xf86-video-nv/dist/depcomp
U xsrc/external/mit/xf86-video-nv/dist/ChangeLog
U xsrc/external/mit/xf86-video-nv/dist/COPYING
U xsrc/external/mit/xf86-video-nv/dist/README
U xsrc/external/mit/xf86-video-nv/dist/configure
U xsrc/external/mit/xf86-video-nv/dist/Makefile.in
U xsrc/external/mit/xf86-video-nv/dist/configure.ac
U xsrc/external/mit/xf86-video-nv/dist/aclocal.m4
U xsrc/external/mit/xf86-video-nv/dist/ltmain.sh
U xsrc/external/mit/xf86-video-nv/dist/config.sub
U xsrc/external/mit/xf86-video-nv/dist/config.h.in
U xsrc/external/mit/xf86-video-nv/dist/README.G80
U xsrc/external/mit/xf86-video-nv/dist/install-sh
U xsrc/external/mit/xf86-video-nv/dist/config.guess
U xsrc/external/mit/xf86-video-nv/dist/missing
U xsrc/external/mit/xf86-video-nv/dist/src/g80_display.c
U xsrc/external/mit/xf86-video-nv/dist/src/nv_cursor.c
U xsrc/external/mit/xf86-video-nv/dist/src/g80_display.h
U xsrc/external/mit/xf86-video-nv/dist/src/nv_shadow.c
U xsrc/external/mit/xf86-video-nv/dist/src/nv_const.h
U xsrc/external/mit/xf86-video-nv/dist/src/riva_type.h
U xsrc/external/mit/xf86-video-nv/dist/src/g80_dma.c
U xsrc/external/mit/xf86-video-nv/dist/src/nv_hw.c
U xsrc/external/mit/xf86-video-nv/dist/src/g80_xaa.c
U xsrc/external/mit/xf86-video-nv/dist/src/g80_output.h
C xsrc/external/mit/xf86-video-nv/dist/src/g80_dac.c
U xsrc/external/mit/xf86-video-nv/dist/src/g80_cursor.h
U xsrc/external/mit/xf86-video-nv/dist/src/riva_dga.c
U xsrc/external/mit/xf86-video-nv/dist/src/g80_exa.h
U xsrc/external/mit/xf86-video-nv/dist/src/nv_dma.h
U xsrc/external/mit/xf86-video-nv/dist/src/nv_dga.c
U xsrc/external/mit/xf86-video-nv/dist/src/riva_setup.c
U xsrc/external/mit/xf86-video-nv/dist/src/g80_type.h
U xsrc/external/mit/xf86-video-nv/dist/src/riva_dac.c
U xsrc/external/mit/xf86-video-nv/dist/src/riva_include.h
U xsrc/external/mit/xf86-video-nv/dist/src/g80_driver.c
U xsrc/external/mit/xf86-video-nv/dist/src/g80_dma.h
U xsrc/external/mit/xf86-video-nv/dist/src/nv_type.h
U xsrc/external/mit/xf86-video-nv/dist/src/Makefile.am
U xsrc/external/mit/xf86-video-nv/dist/src/g80_xaa.h
U xsrc/external/mit/xf86-video-nv/dist/src/riva_hw.h
U xsrc/external/mit/xf86-video-nv/dist/src/nv_setup.c
U xsrc/external/mit/xf86-video-nv/dist/src/riva_cursor.c
U xsrc/external/mit/xf86-video-nv/dist/src/nv_video.c
U xsrc/external/mit/xf86-video-nv/dist/src/riva_local.h
U xsrc/external/mit/xf86-video-nv/dist/src/riva_xaa.c
U xsrc/external/mit/xf86-video-nv/dist/src/g80_cursor.c
U xsrc/external/mit/xf86-video-nv/dist/src/nv_xaa.c
U xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c
C xsrc/external/mit/xf86-video-nv/dist/src/g80_sor.c
U xsrc/external/mit/xf86-video-nv/dist/src/riva_shadow.c
U xsrc/external/mit/xf86-video-nv/dist/src/nv_include.h
U xsrc/external/mit/xf86-video-nv/dist/src/Makefile.in
U xsrc/external/mit/xf86-video-nv/dist/src/nv_dac.c
U xsrc/external/mit/xf86-video-nv/dist/src/riva_const.h
U xsrc/external/mit/xf86-video-nv/dist/src/nv_local.h
U xsrc/external/mit/xf86-video-nv/dist/src/riva_driver.c
U xsrc/external/mit/xf86-video-nv/dist/src/riva_tbl.h
U xsrc/external/mit/xf86-video-nv/dist/src/g80_exa.c
U xsrc/external/mit/xf86-video-nv/dist/src/nv_proto.h
U xsrc/external/mit/xf86-video-nv/dist/src/g80_output.c
U xsrc/external/mit/xf86-video-nv/dist/src/riva_proto.h
U xsrc/external/mit/xf86-video-nv/dist/src/riva_hw.c
U xsrc/external/mit/xf86-video-nv/dist/man/Makefile.am
U xsrc/external/mit/xf86-video-nv/dist/man/Makefile.in
U xsrc/external/mit/xf86-video-nv/dist/man/nv.man

2 conflicts created by this import.
Use the following command to help the merge:

cvs checkout -jxorg:yesterday -jxorg 
xsrc/external/mit/xf86-video-nv/dist

CVS commit: xsrc/external/mit/xf86-video-nv/dist

2010-08-09 Thread matthew green 
Module Name:xsrc
Committed By:   mrg
Date:   Mon Aug  9 16:18:45 UTC 2010

Modified Files:
xsrc/external/mit/xf86-video-nv/dist/src: g80_dac.c g80_sor.c
Removed Files:
xsrc/external/mit/xf86-video-nv/dist/compat: Makefile.am Makefile.in
README
xsrc/external/mit/xf86-video-nv/dist/compat/modes: xf86Crtc.c
xf86Crtc.h xf86Cursors.c xf86DiDGA.c xf86EdidModes.c xf86Modes.c
xf86Modes.h xf86RandR12.c xf86RandR12.h xf86Rename.h xf86Rotate.c
xf86cvt.c xf86gtf.c
xsrc/external/mit/xf86-video-nv/dist/compat/parser: xf86Optrec.h
xf86Parser.h
xsrc/external/mit/xf86-video-nv/dist/src: local_xf86Rename.h

Log Message:
merge xf86-video-nv 2.1.18


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r0 \
xsrc/external/mit/xf86-video-nv/dist/compat/Makefile.am \
xsrc/external/mit/xf86-video-nv/dist/compat/README
cvs rdiff -u -r1.1.1.3 -r0 \
xsrc/external/mit/xf86-video-nv/dist/compat/Makefile.in
cvs rdiff -u -r1.1.1.4 -r0 \
xsrc/external/mit/xf86-video-nv/dist/compat/modes/xf86Crtc.c \
xsrc/external/mit/xf86-video-nv/dist/compat/modes/xf86Crtc.h \
xsrc/external/mit/xf86-video-nv/dist/compat/modes/xf86Cursors.c \
xsrc/external/mit/xf86-video-nv/dist/compat/modes/xf86EdidModes.c \
xsrc/external/mit/xf86-video-nv/dist/compat/modes/xf86Modes.c \
xsrc/external/mit/xf86-video-nv/dist/compat/modes/xf86Modes.h \
xsrc/external/mit/xf86-video-nv/dist/compat/modes/xf86RandR12.c \
xsrc/external/mit/xf86-video-nv/dist/compat/modes/xf86Rotate.c
cvs rdiff -u -r1.1.1.3 -r0 \
xsrc/external/mit/xf86-video-nv/dist/compat/modes/xf86DiDGA.c \
xsrc/external/mit/xf86-video-nv/dist/compat/modes/xf86RandR12.h \
xsrc/external/mit/xf86-video-nv/dist/compat/modes/xf86gtf.c
cvs rdiff -u -r1.1.1.2 -r0 \
xsrc/external/mit/xf86-video-nv/dist/compat/modes/xf86Rename.h \
xsrc/external/mit/xf86-video-nv/dist/compat/modes/xf86cvt.c
cvs rdiff -u -r1.1.1.2 -r0 \
xsrc/external/mit/xf86-video-nv/dist/compat/parser/xf86Optrec.h
cvs rdiff -u -r1.1.1.4 -r0 \
xsrc/external/mit/xf86-video-nv/dist/compat/parser/xf86Parser.h
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xf86-video-nv/dist/src/g80_dac.c \
xsrc/external/mit/xf86-video-nv/dist/src/g80_sor.c
cvs rdiff -u -r1.1.1.1 -r0 \
xsrc/external/mit/xf86-video-nv/dist/src/local_xf86Rename.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xf86-video-nv/dist/src/g80_dac.c
diff -u xsrc/external/mit/xf86-video-nv/dist/src/g80_dac.c:1.3 xsrc/external/mit/xf86-video-nv/dist/src/g80_dac.c:1.4
--- xsrc/external/mit/xf86-video-nv/dist/src/g80_dac.c:1.3	Sat May 22 10:12:55 2010
+++ xsrc/external/mit/xf86-video-nv/dist/src/g80_dac.c	Mon Aug  9 16:18:45 2010
@@ -173,7 +173,7 @@
 {
 G80OutputDestroy(output);
 
-xfree(output-driver_private);
+free(output-driver_private);
 output-driver_private = NULL;
 }
 
Index: xsrc/external/mit/xf86-video-nv/dist/src/g80_sor.c
diff -u xsrc/external/mit/xf86-video-nv/dist/src/g80_sor.c:1.3 xsrc/external/mit/xf86-video-nv/dist/src/g80_sor.c:1.4
--- xsrc/external/mit/xf86-video-nv/dist/src/g80_sor.c:1.3	Sat May 22 10:12:55 2010
+++ xsrc/external/mit/xf86-video-nv/dist/src/g80_sor.c	Mon Aug  9 16:18:45 2010
@@ -169,7 +169,7 @@
 
 xf86DeleteMode(pPriv-nativeMode, pPriv-nativeMode);
 
-xfree(output-driver_private);
+free(output-driver_private);
 output-driver_private = NULL;
 }
 
@@ -265,7 +265,6 @@
 return xf86DuplicateMode(pPriv-nativeMode);
 }
 
-#ifdef RANDR_12_INTERFACE
 #define MAKE_ATOM(a) MakeAtom((a), sizeof(a) - 1, TRUE);
 
 struct property {
@@ -407,7 +406,6 @@
 
 return TRUE;
 }
-#endif // RANDR_12_INTERFACE
 
 static const xf86OutputFuncsRec G80SorTMDSOutputFuncs = {
 .dpms = G80SorDPMSSet,
@@ -420,10 +418,8 @@
 .mode_set = G80SorModeSet,
 .detect = G80SorDetect,
 .get_modes = G80OutputGetDDCModes,
-#ifdef RANDR_12_INTERFACE
 .create_resources = G80SorCreateResources,
 .set_property = G80SorSetProperty,
-#endif
 .destroy = G80SorDestroy,
 };
 
@@ -438,10 +434,8 @@
 .mode_set = G80SorModeSet,
 .detect = G80SorLVDSDetect,
 .get_modes = G80SorGetLVDSModes,
-#ifdef RANDR_12_INTERFACE
 .create_resources = G80SorCreateResources,
 .set_property = G80SorSetProperty,
-#endif
 .destroy = G80SorDestroy,
 };
 
@@ -505,7 +499,7 @@
 if(!pPriv-nativeMode) {
 xf86DrvMsg(pScrn-scrnIndex, X_WARNING,
Failed to find LVDS native mode\n);
-xfree(pPriv);
+free(pPriv);
 return NULL;
 }

CVS commit: xsrc/external/mit/xf86-video-nv/dist/src

2010-05-22 Thread matthew green 
Module Name:xsrc
Committed By:   mrg
Date:   Sat May 22 07:25:03 UTC 2010

Modified Files:
xsrc/external/mit/xf86-video-nv/dist/src: g80_dac.c g80_sor.c

Log Message:
use new-skool X11/extensions/dpmsconst.h.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
xsrc/external/mit/xf86-video-nv/dist/src/g80_dac.c \
xsrc/external/mit/xf86-video-nv/dist/src/g80_sor.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xf86-video-nv/dist/src/g80_dac.c
diff -u xsrc/external/mit/xf86-video-nv/dist/src/g80_dac.c:1.1.1.1 xsrc/external/mit/xf86-video-nv/dist/src/g80_dac.c:1.2
--- xsrc/external/mit/xf86-video-nv/dist/src/g80_dac.c:1.1.1.1	Sat Aug  2 05:14:16 2008
+++ xsrc/external/mit/xf86-video-nv/dist/src/g80_dac.c	Sat May 22 07:25:02 2010
@@ -27,8 +27,7 @@
 
 #include unistd.h
 
-#define DPMS_SERVER
-#include X11/extensions/dpms.h
+#include X11/extensions/dpmsconst.h
 #include xf86_OSproc.h
 
 #include g80_type.h
Index: xsrc/external/mit/xf86-video-nv/dist/src/g80_sor.c
diff -u xsrc/external/mit/xf86-video-nv/dist/src/g80_sor.c:1.1.1.1 xsrc/external/mit/xf86-video-nv/dist/src/g80_sor.c:1.2
--- xsrc/external/mit/xf86-video-nv/dist/src/g80_sor.c:1.1.1.1	Sat Aug  2 05:14:16 2008
+++ xsrc/external/mit/xf86-video-nv/dist/src/g80_sor.c	Sat May 22 07:25:02 2010
@@ -25,8 +25,7 @@
 #include config.h
 #endif
 
-#define DPMS_SERVER
-#include X11/extensions/dpms.h
+#include X11/extensions/dpmsconst.h
 #include X11/Xatom.h
 
 #include g80_type.h

CVS commit: xsrc/external/mit/xf86-video-nv/dist

2010-05-22 Thread matthew green 
Module Name:xsrc
Committed By:   mrg
Date:   Sat May 22 10:09:10 UTC 2010

Update of /cvsroot/xsrc/external/mit/xf86-video-nv/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv10555

Log Message:
initial import of xf86-video-nv-2.1.17

Status:

Vendor Tag: xorg
Release Tags:   xf86-video-nv-2-1-17

U xsrc/external/mit/xf86-video-nv/dist/Makefile.am
N xsrc/external/mit/xf86-video-nv/dist/INSTALL
U xsrc/external/mit/xf86-video-nv/dist/depcomp
U xsrc/external/mit/xf86-video-nv/dist/ChangeLog
U xsrc/external/mit/xf86-video-nv/dist/COPYING
U xsrc/external/mit/xf86-video-nv/dist/README
U xsrc/external/mit/xf86-video-nv/dist/configure
U xsrc/external/mit/xf86-video-nv/dist/Makefile.in
U xsrc/external/mit/xf86-video-nv/dist/configure.ac
U xsrc/external/mit/xf86-video-nv/dist/aclocal.m4
U xsrc/external/mit/xf86-video-nv/dist/ltmain.sh
U xsrc/external/mit/xf86-video-nv/dist/config.sub
U xsrc/external/mit/xf86-video-nv/dist/config.h.in
U xsrc/external/mit/xf86-video-nv/dist/README.G80
U xsrc/external/mit/xf86-video-nv/dist/install-sh
U xsrc/external/mit/xf86-video-nv/dist/config.guess
U xsrc/external/mit/xf86-video-nv/dist/missing
U xsrc/external/mit/xf86-video-nv/dist/src/g80_display.c
U xsrc/external/mit/xf86-video-nv/dist/src/nv_cursor.c
U xsrc/external/mit/xf86-video-nv/dist/src/g80_display.h
U xsrc/external/mit/xf86-video-nv/dist/src/nv_shadow.c
U xsrc/external/mit/xf86-video-nv/dist/src/nv_const.h
U xsrc/external/mit/xf86-video-nv/dist/src/riva_type.h
U xsrc/external/mit/xf86-video-nv/dist/src/g80_dma.c
U xsrc/external/mit/xf86-video-nv/dist/src/nv_hw.c
U xsrc/external/mit/xf86-video-nv/dist/src/g80_xaa.c
U xsrc/external/mit/xf86-video-nv/dist/src/g80_output.h
C xsrc/external/mit/xf86-video-nv/dist/src/g80_dac.c
U xsrc/external/mit/xf86-video-nv/dist/src/g80_cursor.h
U xsrc/external/mit/xf86-video-nv/dist/src/riva_dga.c
U xsrc/external/mit/xf86-video-nv/dist/src/g80_exa.h
U xsrc/external/mit/xf86-video-nv/dist/src/nv_dma.h
U xsrc/external/mit/xf86-video-nv/dist/src/nv_dga.c
U xsrc/external/mit/xf86-video-nv/dist/src/riva_setup.c
U xsrc/external/mit/xf86-video-nv/dist/src/g80_type.h
U xsrc/external/mit/xf86-video-nv/dist/src/riva_dac.c
U xsrc/external/mit/xf86-video-nv/dist/src/riva_include.h
U xsrc/external/mit/xf86-video-nv/dist/src/g80_driver.c
U xsrc/external/mit/xf86-video-nv/dist/src/g80_dma.h
U xsrc/external/mit/xf86-video-nv/dist/src/nv_type.h
U xsrc/external/mit/xf86-video-nv/dist/src/Makefile.am
U xsrc/external/mit/xf86-video-nv/dist/src/g80_xaa.h
U xsrc/external/mit/xf86-video-nv/dist/src/riva_hw.h
U xsrc/external/mit/xf86-video-nv/dist/src/nv_setup.c
U xsrc/external/mit/xf86-video-nv/dist/src/riva_cursor.c
U xsrc/external/mit/xf86-video-nv/dist/src/nv_video.c
U xsrc/external/mit/xf86-video-nv/dist/src/riva_local.h
U xsrc/external/mit/xf86-video-nv/dist/src/riva_xaa.c
U xsrc/external/mit/xf86-video-nv/dist/src/g80_cursor.c
U xsrc/external/mit/xf86-video-nv/dist/src/nv_xaa.c
U xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c
C xsrc/external/mit/xf86-video-nv/dist/src/g80_sor.c
U xsrc/external/mit/xf86-video-nv/dist/src/riva_shadow.c
U xsrc/external/mit/xf86-video-nv/dist/src/nv_include.h
U xsrc/external/mit/xf86-video-nv/dist/src/Makefile.in
U xsrc/external/mit/xf86-video-nv/dist/src/nv_dac.c
U xsrc/external/mit/xf86-video-nv/dist/src/riva_const.h
U xsrc/external/mit/xf86-video-nv/dist/src/nv_local.h
U xsrc/external/mit/xf86-video-nv/dist/src/riva_driver.c
U xsrc/external/mit/xf86-video-nv/dist/src/riva_tbl.h
U xsrc/external/mit/xf86-video-nv/dist/src/g80_exa.c
U xsrc/external/mit/xf86-video-nv/dist/src/nv_proto.h
U xsrc/external/mit/xf86-video-nv/dist/src/g80_output.c
U xsrc/external/mit/xf86-video-nv/dist/src/local_xf86Rename.h
U xsrc/external/mit/xf86-video-nv/dist/src/riva_proto.h
U xsrc/external/mit/xf86-video-nv/dist/src/riva_hw.c
U xsrc/external/mit/xf86-video-nv/dist/compat/Makefile.am
U xsrc/external/mit/xf86-video-nv/dist/compat/Makefile.in
U xsrc/external/mit/xf86-video-nv/dist/compat/README
U xsrc/external/mit/xf86-video-nv/dist/compat/parser/xf86Optrec.h
U xsrc/external/mit/xf86-video-nv/dist/compat/parser/xf86Parser.h
U xsrc/external/mit/xf86-video-nv/dist/compat/modes/xf86EdidModes.c
U xsrc/external/mit/xf86-video-nv/dist/compat/modes/xf86Crtc.c
U xsrc/external/mit/xf86-video-nv/dist/compat/modes/xf86DiDGA.c
U xsrc/external/mit/xf86-video-nv/dist/compat/modes/xf86Modes.c
U xsrc/external/mit/xf86-video-nv/dist/compat/modes/xf86Modes.h
U xsrc/external/mit/xf86-video-nv/dist/compat/modes/xf86gtf.c
U xsrc/external/mit/xf86-video-nv/dist/compat/modes/xf86Crtc.h
U xsrc/external/mit/xf86-video-nv/dist/compat/modes/xf86cvt.c
U xsrc/external/mit/xf86-video-nv/dist/compat/modes/xf86Cursors.c
U xsrc/external/mit/xf86-video-nv/dist/compat/modes/xf86RandR12.h
U xsrc/external/mit/xf86-video-nv/dist/compat/modes/xf86Rotate.c
U xsrc/external/mit/xf86-video-nv/dist/compat/modes/xf86Rename.h
U xsrc/external/mit/xf86-video-nv/dist/compat/modes/xf86RandR12.c
U

CVS commit: xsrc/external/mit/xf86-video-nv/dist/src

2010-05-22 Thread matthew green 
Module Name:xsrc
Committed By:   mrg
Date:   Sat May 22 10:12:55 UTC 2010

Modified Files:
xsrc/external/mit/xf86-video-nv/dist/src: g80_dac.c g80_sor.c

Log Message:
merge xf86-video-nv 2.1.17


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/xf86-video-nv/dist/src/g80_dac.c \
xsrc/external/mit/xf86-video-nv/dist/src/g80_sor.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xf86-video-nv/dist/src/g80_dac.c
diff -u xsrc/external/mit/xf86-video-nv/dist/src/g80_dac.c:1.2 xsrc/external/mit/xf86-video-nv/dist/src/g80_dac.c:1.3
--- xsrc/external/mit/xf86-video-nv/dist/src/g80_dac.c:1.2	Sat May 22 07:25:02 2010
+++ xsrc/external/mit/xf86-video-nv/dist/src/g80_dac.c	Sat May 22 10:12:55 2010
@@ -27,7 +27,13 @@
 
 #include unistd.h
 
+#ifdef HAVE_XEXTPROTO_71
 #include X11/extensions/dpmsconst.h
+#else
+#define DPMS_SERVER
+#include X11/extensions/dpms.h
+#endif
+
 #include xf86_OSproc.h
 
 #include g80_type.h
Index: xsrc/external/mit/xf86-video-nv/dist/src/g80_sor.c
diff -u xsrc/external/mit/xf86-video-nv/dist/src/g80_sor.c:1.2 xsrc/external/mit/xf86-video-nv/dist/src/g80_sor.c:1.3
--- xsrc/external/mit/xf86-video-nv/dist/src/g80_sor.c:1.2	Sat May 22 07:25:02 2010
+++ xsrc/external/mit/xf86-video-nv/dist/src/g80_sor.c	Sat May 22 10:12:55 2010
@@ -25,7 +25,13 @@
 #include config.h
 #endif
 
+#ifdef HAVE_XEXTPROTO_71
 #include X11/extensions/dpmsconst.h
+#else
+#define DPMS_SERVER
+#include X11/extensions/dpms.h
+#endif
+
 #include X11/Xatom.h
 
 #include g80_type.h

CVS commit: xsrc/external/mit/xf86-video-nv/dist

2009-07-09 Thread matthew green 
Module Name:xsrc
Committed By:   mrg
Date:   Thu Jul  9 06:51:32 UTC 2009

Update of /cvsroot/xsrc/external/mit/xf86-video-nv/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv3503

Log Message:
initial import of xf86-video-nv-2.1.14

Status:

Vendor Tag: xorg
Release Tags:   xf86-video-nv-2-1-14

U xsrc/external/mit/xf86-video-nv/dist/Makefile.am
U xsrc/external/mit/xf86-video-nv/dist/depcomp
U xsrc/external/mit/xf86-video-nv/dist/ChangeLog
U xsrc/external/mit/xf86-video-nv/dist/COPYING
U xsrc/external/mit/xf86-video-nv/dist/README
U xsrc/external/mit/xf86-video-nv/dist/configure
U xsrc/external/mit/xf86-video-nv/dist/Makefile.in
U xsrc/external/mit/xf86-video-nv/dist/configure.ac
U xsrc/external/mit/xf86-video-nv/dist/aclocal.m4
U xsrc/external/mit/xf86-video-nv/dist/ltmain.sh
U xsrc/external/mit/xf86-video-nv/dist/config.sub
U xsrc/external/mit/xf86-video-nv/dist/config.h.in
U xsrc/external/mit/xf86-video-nv/dist/README.G80
U xsrc/external/mit/xf86-video-nv/dist/install-sh
U xsrc/external/mit/xf86-video-nv/dist/config.guess
U xsrc/external/mit/xf86-video-nv/dist/missing
U xsrc/external/mit/xf86-video-nv/dist/src/g80_display.c
U xsrc/external/mit/xf86-video-nv/dist/src/nv_cursor.c
U xsrc/external/mit/xf86-video-nv/dist/src/g80_display.h
U xsrc/external/mit/xf86-video-nv/dist/src/nv_shadow.c
U xsrc/external/mit/xf86-video-nv/dist/src/nv_const.h
U xsrc/external/mit/xf86-video-nv/dist/src/riva_type.h
U xsrc/external/mit/xf86-video-nv/dist/src/g80_dma.c
U xsrc/external/mit/xf86-video-nv/dist/src/nv_hw.c
U xsrc/external/mit/xf86-video-nv/dist/src/g80_xaa.c
U xsrc/external/mit/xf86-video-nv/dist/src/g80_output.h
U xsrc/external/mit/xf86-video-nv/dist/src/g80_dac.c
U xsrc/external/mit/xf86-video-nv/dist/src/g80_cursor.h
U xsrc/external/mit/xf86-video-nv/dist/src/riva_dga.c
U xsrc/external/mit/xf86-video-nv/dist/src/g80_exa.h
U xsrc/external/mit/xf86-video-nv/dist/src/nv_dma.h
U xsrc/external/mit/xf86-video-nv/dist/src/nv_dga.c
U xsrc/external/mit/xf86-video-nv/dist/src/riva_setup.c
U xsrc/external/mit/xf86-video-nv/dist/src/g80_type.h
U xsrc/external/mit/xf86-video-nv/dist/src/riva_dac.c
U xsrc/external/mit/xf86-video-nv/dist/src/riva_include.h
U xsrc/external/mit/xf86-video-nv/dist/src/g80_driver.c
U xsrc/external/mit/xf86-video-nv/dist/src/g80_dma.h
U xsrc/external/mit/xf86-video-nv/dist/src/nv_type.h
U xsrc/external/mit/xf86-video-nv/dist/src/Makefile.am
U xsrc/external/mit/xf86-video-nv/dist/src/g80_xaa.h
U xsrc/external/mit/xf86-video-nv/dist/src/riva_hw.h
U xsrc/external/mit/xf86-video-nv/dist/src/nv_setup.c
U xsrc/external/mit/xf86-video-nv/dist/src/riva_cursor.c
U xsrc/external/mit/xf86-video-nv/dist/src/nv_video.c
U xsrc/external/mit/xf86-video-nv/dist/src/riva_local.h
U xsrc/external/mit/xf86-video-nv/dist/src/riva_xaa.c
U xsrc/external/mit/xf86-video-nv/dist/src/g80_cursor.c
U xsrc/external/mit/xf86-video-nv/dist/src/nv_xaa.c
U xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c
U xsrc/external/mit/xf86-video-nv/dist/src/g80_sor.c
U xsrc/external/mit/xf86-video-nv/dist/src/riva_shadow.c
U xsrc/external/mit/xf86-video-nv/dist/src/nv_include.h
U xsrc/external/mit/xf86-video-nv/dist/src/Makefile.in
U xsrc/external/mit/xf86-video-nv/dist/src/nv_dac.c
U xsrc/external/mit/xf86-video-nv/dist/src/riva_const.h
U xsrc/external/mit/xf86-video-nv/dist/src/nv_local.h
U xsrc/external/mit/xf86-video-nv/dist/src/riva_driver.c
U xsrc/external/mit/xf86-video-nv/dist/src/riva_tbl.h
U xsrc/external/mit/xf86-video-nv/dist/src/g80_exa.c
U xsrc/external/mit/xf86-video-nv/dist/src/nv_proto.h
U xsrc/external/mit/xf86-video-nv/dist/src/g80_output.c
U xsrc/external/mit/xf86-video-nv/dist/src/local_xf86Rename.h
U xsrc/external/mit/xf86-video-nv/dist/src/riva_proto.h
U xsrc/external/mit/xf86-video-nv/dist/src/riva_hw.c
U xsrc/external/mit/xf86-video-nv/dist/compat/Makefile.am
U xsrc/external/mit/xf86-video-nv/dist/compat/Makefile.in
U xsrc/external/mit/xf86-video-nv/dist/compat/README
U xsrc/external/mit/xf86-video-nv/dist/compat/parser/xf86Optrec.h
U xsrc/external/mit/xf86-video-nv/dist/compat/parser/xf86Parser.h
U xsrc/external/mit/xf86-video-nv/dist/compat/modes/xf86EdidModes.c
U xsrc/external/mit/xf86-video-nv/dist/compat/modes/xf86Crtc.c
U xsrc/external/mit/xf86-video-nv/dist/compat/modes/xf86DiDGA.c
U xsrc/external/mit/xf86-video-nv/dist/compat/modes/xf86Modes.c
U xsrc/external/mit/xf86-video-nv/dist/compat/modes/xf86Modes.h
U xsrc/external/mit/xf86-video-nv/dist/compat/modes/xf86gtf.c
U xsrc/external/mit/xf86-video-nv/dist/compat/modes/xf86Crtc.h
U xsrc/external/mit/xf86-video-nv/dist/compat/modes/xf86cvt.c
U xsrc/external/mit/xf86-video-nv/dist/compat/modes/xf86Cursors.c
U xsrc/external/mit/xf86-video-nv/dist/compat/modes/xf86RandR12.h
U xsrc/external/mit/xf86-video-nv/dist/compat/modes/xf86Rotate.c
U xsrc/external/mit/xf86-video-nv/dist/compat/modes/xf86Rename.h
U xsrc/external/mit/xf86-video-nv/dist/compat/modes/xf86RandR12.c
U xsrc/external/mit/xf86-video-nv/dist/man/Makefile.am
U

CVS commit: xsrc/external/mit/xf86-video-nv/dist

2009-07-08 Thread matthew green 
Module Name:xsrc
Committed By:   mrg
Date:   Thu Jul  9 03:32:44 UTC 2009

Update of /cvsroot/xsrc/external/mit/xf86-video-nv/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv3467

Log Message:
initial import of xf86-video-nv-2.1.13

Status:

Vendor Tag: xorg
Release Tags:   xf86-video-nv-2-1-13

U xsrc/external/mit/xf86-video-nv/dist/missing
U xsrc/external/mit/xf86-video-nv/dist/Makefile.in
U xsrc/external/mit/xf86-video-nv/dist/ChangeLog
U xsrc/external/mit/xf86-video-nv/dist/configure.ac
U xsrc/external/mit/xf86-video-nv/dist/Makefile.am
U xsrc/external/mit/xf86-video-nv/dist/config.guess
U xsrc/external/mit/xf86-video-nv/dist/README
U xsrc/external/mit/xf86-video-nv/dist/COPYING
U xsrc/external/mit/xf86-video-nv/dist/config.h.in
U xsrc/external/mit/xf86-video-nv/dist/install-sh
U xsrc/external/mit/xf86-video-nv/dist/aclocal.m4
U xsrc/external/mit/xf86-video-nv/dist/ltmain.sh
U xsrc/external/mit/xf86-video-nv/dist/configure
U xsrc/external/mit/xf86-video-nv/dist/depcomp
U xsrc/external/mit/xf86-video-nv/dist/config.sub
U xsrc/external/mit/xf86-video-nv/dist/README.G80
U xsrc/external/mit/xf86-video-nv/dist/src/g80_display.c
U xsrc/external/mit/xf86-video-nv/dist/src/riva_proto.h
U xsrc/external/mit/xf86-video-nv/dist/src/Makefile.in
U xsrc/external/mit/xf86-video-nv/dist/src/nv_dac.c
U xsrc/external/mit/xf86-video-nv/dist/src/nv_xaa.c
U xsrc/external/mit/xf86-video-nv/dist/src/riva_setup.c
U xsrc/external/mit/xf86-video-nv/dist/src/g80_cursor.c
U xsrc/external/mit/xf86-video-nv/dist/src/riva_shadow.c
U xsrc/external/mit/xf86-video-nv/dist/src/Makefile.am
U xsrc/external/mit/xf86-video-nv/dist/src/nv_video.c
U xsrc/external/mit/xf86-video-nv/dist/src/nv_hw.c
U xsrc/external/mit/xf86-video-nv/dist/src/g80_cursor.h
U xsrc/external/mit/xf86-video-nv/dist/src/riva_driver.c
U xsrc/external/mit/xf86-video-nv/dist/src/g80_exa.c
U xsrc/external/mit/xf86-video-nv/dist/src/nv_dma.h
U xsrc/external/mit/xf86-video-nv/dist/src/nv_shadow.c
U xsrc/external/mit/xf86-video-nv/dist/src/riva_include.h
U xsrc/external/mit/xf86-video-nv/dist/src/g80_output.c
U xsrc/external/mit/xf86-video-nv/dist/src/riva_tbl.h
U xsrc/external/mit/xf86-video-nv/dist/src/local_xf86Rename.h
U xsrc/external/mit/xf86-video-nv/dist/src/g80_sor.c
U xsrc/external/mit/xf86-video-nv/dist/src/g80_driver.c
U xsrc/external/mit/xf86-video-nv/dist/src/riva_hw.h
U xsrc/external/mit/xf86-video-nv/dist/src/riva_cursor.c
U xsrc/external/mit/xf86-video-nv/dist/src/g80_dac.c
U xsrc/external/mit/xf86-video-nv/dist/src/nv_setup.c
U xsrc/external/mit/xf86-video-nv/dist/src/nv_local.h
U xsrc/external/mit/xf86-video-nv/dist/src/nv_proto.h
U xsrc/external/mit/xf86-video-nv/dist/src/nv_const.h
U xsrc/external/mit/xf86-video-nv/dist/src/g80_dma.h
U xsrc/external/mit/xf86-video-nv/dist/src/nv_include.h
U xsrc/external/mit/xf86-video-nv/dist/src/g80_type.h
U xsrc/external/mit/xf86-video-nv/dist/src/nv_type.h
U xsrc/external/mit/xf86-video-nv/dist/src/g80_xaa.h
U xsrc/external/mit/xf86-video-nv/dist/src/g80_output.h
U xsrc/external/mit/xf86-video-nv/dist/src/riva_dac.c
U xsrc/external/mit/xf86-video-nv/dist/src/riva_hw.c
U xsrc/external/mit/xf86-video-nv/dist/src/g80_exa.h
U xsrc/external/mit/xf86-video-nv/dist/src/riva_dga.c
U xsrc/external/mit/xf86-video-nv/dist/src/riva_const.h
U xsrc/external/mit/xf86-video-nv/dist/src/nv_cursor.c
U xsrc/external/mit/xf86-video-nv/dist/src/riva_local.h
U xsrc/external/mit/xf86-video-nv/dist/src/riva_type.h
U xsrc/external/mit/xf86-video-nv/dist/src/riva_xaa.c
U xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c
U xsrc/external/mit/xf86-video-nv/dist/src/g80_display.h
U xsrc/external/mit/xf86-video-nv/dist/src/g80_xaa.c
U xsrc/external/mit/xf86-video-nv/dist/src/nv_dga.c
U xsrc/external/mit/xf86-video-nv/dist/src/g80_dma.c
U xsrc/external/mit/xf86-video-nv/dist/compat/Makefile.in
U xsrc/external/mit/xf86-video-nv/dist/compat/Makefile.am
U xsrc/external/mit/xf86-video-nv/dist/compat/README
U xsrc/external/mit/xf86-video-nv/dist/compat/parser/xf86Optrec.h
U xsrc/external/mit/xf86-video-nv/dist/compat/parser/xf86Parser.h
U xsrc/external/mit/xf86-video-nv/dist/compat/modes/xf86RandR12.h
U xsrc/external/mit/xf86-video-nv/dist/compat/modes/xf86Crtc.c
U xsrc/external/mit/xf86-video-nv/dist/compat/modes/xf86DiDGA.c
U xsrc/external/mit/xf86-video-nv/dist/compat/modes/xf86Cursors.c
U xsrc/external/mit/xf86-video-nv/dist/compat/modes/xf86Rotate.c
U xsrc/external/mit/xf86-video-nv/dist/compat/modes/xf86gtf.c
U xsrc/external/mit/xf86-video-nv/dist/compat/modes/xf86cvt.c
U xsrc/external/mit/xf86-video-nv/dist/compat/modes/xf86Modes.h
U xsrc/external/mit/xf86-video-nv/dist/compat/modes/xf86EdidModes.c
U xsrc/external/mit/xf86-video-nv/dist/compat/modes/xf86Crtc.h
U xsrc/external/mit/xf86-video-nv/dist/compat/modes/xf86Rename.h
U xsrc/external/mit/xf86-video-nv/dist/compat/modes/xf86Modes.c
U xsrc/external/mit/xf86-video-nv/dist/compat/modes/xf86RandR12.c
U xsrc/external/mit/xf86-video-nv/dist/man/Makefile.in
U

CVS commit: xsrc/external/mit/xf86-video-nv/dist

2009-06-09 Thread matthew green 
Module Name:xsrc
Committed By:   mrg
Date:   Wed Jun 10 00:48:00 UTC 2009

Update of /cvsroot/xsrc/external/mit/xf86-video-nv/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv27296

Log Message:
initial import of xf86-video-nv-2.1.13

Status:

Vendor Tag: xorg
Release Tags:   xf86-video-nv-2-1-13

U xsrc/external/mit/xf86-video-nv/dist/missing
U xsrc/external/mit/xf86-video-nv/dist/Makefile.in
U xsrc/external/mit/xf86-video-nv/dist/ChangeLog
U xsrc/external/mit/xf86-video-nv/dist/configure.ac
U xsrc/external/mit/xf86-video-nv/dist/Makefile.am
U xsrc/external/mit/xf86-video-nv/dist/config.guess
N xsrc/external/mit/xf86-video-nv/dist/README
U xsrc/external/mit/xf86-video-nv/dist/COPYING
U xsrc/external/mit/xf86-video-nv/dist/config.h.in
U xsrc/external/mit/xf86-video-nv/dist/install-sh
U xsrc/external/mit/xf86-video-nv/dist/aclocal.m4
U xsrc/external/mit/xf86-video-nv/dist/ltmain.sh
U xsrc/external/mit/xf86-video-nv/dist/configure
U xsrc/external/mit/xf86-video-nv/dist/depcomp
U xsrc/external/mit/xf86-video-nv/dist/config.sub
U xsrc/external/mit/xf86-video-nv/dist/README.G80
U xsrc/external/mit/xf86-video-nv/dist/src/g80_display.c
U xsrc/external/mit/xf86-video-nv/dist/src/riva_proto.h
U xsrc/external/mit/xf86-video-nv/dist/src/Makefile.in
U xsrc/external/mit/xf86-video-nv/dist/src/nv_dac.c
U xsrc/external/mit/xf86-video-nv/dist/src/nv_xaa.c
U xsrc/external/mit/xf86-video-nv/dist/src/riva_setup.c
U xsrc/external/mit/xf86-video-nv/dist/src/g80_cursor.c
U xsrc/external/mit/xf86-video-nv/dist/src/riva_shadow.c
U xsrc/external/mit/xf86-video-nv/dist/src/Makefile.am
U xsrc/external/mit/xf86-video-nv/dist/src/nv_video.c
U xsrc/external/mit/xf86-video-nv/dist/src/nv_hw.c
U xsrc/external/mit/xf86-video-nv/dist/src/g80_cursor.h
U xsrc/external/mit/xf86-video-nv/dist/src/riva_driver.c
U xsrc/external/mit/xf86-video-nv/dist/src/g80_exa.c
U xsrc/external/mit/xf86-video-nv/dist/src/nv_dma.h
U xsrc/external/mit/xf86-video-nv/dist/src/nv_shadow.c
U xsrc/external/mit/xf86-video-nv/dist/src/riva_include.h
U xsrc/external/mit/xf86-video-nv/dist/src/g80_output.c
U xsrc/external/mit/xf86-video-nv/dist/src/riva_tbl.h
U xsrc/external/mit/xf86-video-nv/dist/src/local_xf86Rename.h
U xsrc/external/mit/xf86-video-nv/dist/src/g80_sor.c
U xsrc/external/mit/xf86-video-nv/dist/src/g80_driver.c
U xsrc/external/mit/xf86-video-nv/dist/src/riva_hw.h
U xsrc/external/mit/xf86-video-nv/dist/src/riva_cursor.c
U xsrc/external/mit/xf86-video-nv/dist/src/g80_dac.c
U xsrc/external/mit/xf86-video-nv/dist/src/nv_setup.c
U xsrc/external/mit/xf86-video-nv/dist/src/nv_local.h
U xsrc/external/mit/xf86-video-nv/dist/src/nv_proto.h
U xsrc/external/mit/xf86-video-nv/dist/src/nv_const.h
U xsrc/external/mit/xf86-video-nv/dist/src/g80_dma.h
U xsrc/external/mit/xf86-video-nv/dist/src/nv_include.h
U xsrc/external/mit/xf86-video-nv/dist/src/g80_type.h
U xsrc/external/mit/xf86-video-nv/dist/src/nv_type.h
U xsrc/external/mit/xf86-video-nv/dist/src/g80_xaa.h
U xsrc/external/mit/xf86-video-nv/dist/src/g80_output.h
U xsrc/external/mit/xf86-video-nv/dist/src/riva_dac.c
U xsrc/external/mit/xf86-video-nv/dist/src/riva_hw.c
U xsrc/external/mit/xf86-video-nv/dist/src/g80_exa.h
U xsrc/external/mit/xf86-video-nv/dist/src/riva_dga.c
U xsrc/external/mit/xf86-video-nv/dist/src/riva_const.h
U xsrc/external/mit/xf86-video-nv/dist/src/nv_cursor.c
U xsrc/external/mit/xf86-video-nv/dist/src/riva_local.h
U xsrc/external/mit/xf86-video-nv/dist/src/riva_type.h
U xsrc/external/mit/xf86-video-nv/dist/src/riva_xaa.c
U xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c
U xsrc/external/mit/xf86-video-nv/dist/src/g80_display.h
U xsrc/external/mit/xf86-video-nv/dist/src/g80_xaa.c
U xsrc/external/mit/xf86-video-nv/dist/src/nv_dga.c
U xsrc/external/mit/xf86-video-nv/dist/src/g80_dma.c
U xsrc/external/mit/xf86-video-nv/dist/compat/Makefile.in
U xsrc/external/mit/xf86-video-nv/dist/compat/Makefile.am
U xsrc/external/mit/xf86-video-nv/dist/compat/README
U xsrc/external/mit/xf86-video-nv/dist/compat/parser/xf86Optrec.h
U xsrc/external/mit/xf86-video-nv/dist/compat/parser/xf86Parser.h
U xsrc/external/mit/xf86-video-nv/dist/compat/modes/xf86RandR12.h
U xsrc/external/mit/xf86-video-nv/dist/compat/modes/xf86Crtc.c
U xsrc/external/mit/xf86-video-nv/dist/compat/modes/xf86DiDGA.c
U xsrc/external/mit/xf86-video-nv/dist/compat/modes/xf86Cursors.c
U xsrc/external/mit/xf86-video-nv/dist/compat/modes/xf86Rotate.c
U xsrc/external/mit/xf86-video-nv/dist/compat/modes/xf86gtf.c
U xsrc/external/mit/xf86-video-nv/dist/compat/modes/xf86cvt.c
U xsrc/external/mit/xf86-video-nv/dist/compat/modes/xf86Modes.h
U xsrc/external/mit/xf86-video-nv/dist/compat/modes/xf86EdidModes.c
U xsrc/external/mit/xf86-video-nv/dist/compat/modes/xf86Crtc.h
U xsrc/external/mit/xf86-video-nv/dist/compat/modes/xf86Rename.h
U xsrc/external/mit/xf86-video-nv/dist/compat/modes/xf86Modes.c
U xsrc/external/mit/xf86-video-nv/dist/compat/modes/xf86RandR12.c
U xsrc/external/mit/xf86-video-nv/dist/man/Makefile.in
U