summaryrefslogtreecommitdiff
path: root/src/nv_xaa.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/nv_xaa.c')
-rw-r--r--src/nv_xaa.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/src/nv_xaa.c b/src/nv_xaa.c
index 851e3bf..9c32910 100644
--- a/src/nv_xaa.c
+++ b/src/nv_xaa.c
@@ -105,13 +105,11 @@ static const int NVPatternROP[16] =
0xFF
};
-static CARD32 getOffset(NVPtr pNv, NVAllocRec *mem) {
- return (mem->offset - pNv->VRAMPhysical);
-}
-
void
-NVWaitVSync(NVPtr pNv)
+NVWaitVSync(ScrnInfoPtr pScrn)
{
+ NVPtr pNv = NVPTR(pScrn);
+
NVDmaStart(pNv, 5, 0x0000012C, 1);
NVDmaNext (pNv, 0);
NVDmaStart(pNv, 5, 0x00000134, 1);
@@ -418,7 +416,7 @@ NVSubsequentScanlineImageWriteRect(
NVDmaStart(pNv, NvSubContextSurfaces, SURFACE_PITCH, 2);
NVDmaNext (pNv, (_image_dstpitch << 16) | image_srcpitch);
- NVDmaNext (pNv, getOffset(pNv, pNv->ScratchBuffer));
+ NVDmaNext (pNv, pNv->ScratchBuffer->offset);
}
static void NVSubsequentImageWriteScanline(ScrnInfoPtr pScrn, int bufno)
@@ -437,7 +435,7 @@ static void NVSubsequentImageWriteScanline(ScrnInfoPtr pScrn, int bufno)
} else {
NVDmaStart(pNv, NvSubContextSurfaces, SURFACE_PITCH, 2);
NVDmaNext (pNv, _image_dstpitch | (_image_dstpitch << 16));
- NVDmaNext (pNv, getOffset(pNv, pNv->FB));
+ NVDmaNext (pNv, pNv->FB->offset);
}
}