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 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);

Reply via email to