diff options
Diffstat (limited to 'driver/xf86-video-nv/src/g80_xaa.c')
| -rw-r--r-- | driver/xf86-video-nv/src/g80_xaa.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/driver/xf86-video-nv/src/g80_xaa.c b/driver/xf86-video-nv/src/g80_xaa.c index 1f074441c..ce218991e 100644 --- a/driver/xf86-video-nv/src/g80_xaa.c +++ b/driver/xf86-video-nv/src/g80_xaa.c @@ -31,7 +31,7 @@ #include "g80_dma.h" #include "g80_xaa.h" -static void +void G80Sync(ScrnInfoPtr pScrn) { G80Ptr pNv = G80PTR(pScrn); @@ -47,7 +47,7 @@ G80Sync(ScrnInfoPtr pScrn) while(*pSync); } -static void +void G80DMAKickoffCallback(ScrnInfoPtr pScrn) { G80Ptr pNv = G80PTR(pScrn); @@ -56,7 +56,7 @@ G80DMAKickoffCallback(ScrnInfoPtr pScrn) pNv->DMAKickoffCallback = NULL; } -static void +void G80SetPattern(G80Ptr pNv, int bg, int fg, int pat0, int pat1) { G80DmaStart(pNv, 0x2f0, 4); @@ -66,7 +66,7 @@ G80SetPattern(G80Ptr pNv, int bg, int fg, int pat0, int pat1) G80DmaNext (pNv, pat1); } -static void +void G80SetRopSolid(G80Ptr pNv, CARD32 rop, CARD32 planemask) { static const int rops[] = { @@ -95,7 +95,7 @@ G80SetRopSolid(G80Ptr pNv, CARD32 rop, CARD32 planemask) } } -static void inline +inline void G80SetClip(G80Ptr pNv, int x, int y, int w, int h) { G80DmaStart(pNv, 0x280, 4); @@ -125,7 +125,7 @@ G80SetupForScreenToScreenCopy( if(rop == GXcopy && planemask == ~0) { G80DmaNext (pNv, 3); } else { - G80DmaNext (pNv, 1); + G80DmaNext (pNv, 4); G80SetRopSolid(pNv, rop, planemask); } pNv->DMAKickoffCallback = G80DMAKickoffCallback; @@ -177,7 +177,7 @@ G80SetupForSolidFill( G80SetClip(pNv, 0, 0, 0x7fff, 0x7fff); G80DmaStart(pNv, 0x2ac, 1); - G80DmaNext (pNv, 1); + G80DmaNext (pNv, 4); G80SetRopSolid(pNv, rop, planemask); G80DmaStart(pNv, 0x580, 1); G80DmaNext (pNv, 4); @@ -235,7 +235,7 @@ G80SetupForMono8x8PatternFill( G80SetPattern(pNv, bg, fg, patternx, patterny); G80DmaStart(pNv, 0x2ac, 1); - G80DmaNext (pNv, 1); + G80DmaNext (pNv, 4); G80DmaStart(pNv, 0x580, 1); G80DmaNext (pNv, 4); G80DmaStart(pNv, 0x588, 1); @@ -353,7 +353,7 @@ G80SetupForScanlineImageWrite( if(rop == GXcopy && planemask == ~0) { G80DmaNext (pNv, 3); } else { - G80DmaNext (pNv, 1); + G80DmaNext (pNv, 4); G80SetRopSolid(pNv, rop, planemask); } @@ -420,7 +420,7 @@ G80SetupForSolidLine(ScrnInfoPtr pScrn, int color, int rop, unsigned planemask) G80SetClip(pNv, 0, 0, 0x7fff, 0x7fff); G80DmaStart(pNv, 0x2ac, 1); - G80DmaNext (pNv, 1); + G80DmaNext (pNv, 4); G80SetRopSolid(pNv, rop, planemask); G80DmaStart(pNv, 0x580, 1); G80DmaNext (pNv, 1); |