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); G80DmaNext (pNv, fg); - pNv->DMAKickoffCallback = G80DMAKickoffCallback; + pNv->DMAKickoffCallback = G80DmaKickoffCallback; } static void @@ -428,7 +419,7 @@ G80SetupForSolidLine(ScrnInfoPtr pScrn, G80DmaStart(pNv, 0x588, 1); G80DmaNext (pNv, color); - pNv->DMAKickoffCallback = G80DMAKickoffCallback; + pNv->DMAKickoffCallback = G80DmaKickoffCallback; } static void