summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArthur Huillet <arthur.huillet@free.fr>2007-07-20 01:33:49 +0200
committerArthur Huillet <arthur.huillet@free.fr>2007-07-20 01:33:49 +0200
commite760235a0596895b726220366c50d4e7c244006e (patch)
treedbe8ad08f6b53adcf77372fd13c2bdbd911413d0
parenta97181f95a1f5da6180b8a72f3ca307079b92079 (diff)
downloadxorg-driver-xf86-video-nouveau-e760235a0596895b726220366c50d4e7c244006e.tar.gz
Now using GART as the source for the blitter - preliminary implementation, gotta clean it up
-rw-r--r--src/nv_video.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/nv_video.c b/src/nv_video.c
index 890d731..4cdaafc 100644
--- a/src/nv_video.c
+++ b/src/nv_video.c
@@ -591,7 +591,9 @@ NVPutBlitImage(ScrnInfoPtr pScrn, int src_offset, int id,
NVDmaNext (pNv, SURFACE_FORMAT_R5G6B5);
}
}
-
+ NVDmaStart(pNv, NvSubScaledImage,
+ NV04_SCALED_IMAGE_FROM_MEMORY_DMA_IMAGE, 1);
+ NVDmaNext (pNv, NvDmaFB); /* source object */
NVDmaKickoff(pNv);
if (pNv->useEXA)
@@ -1193,7 +1195,7 @@ NVPutImage(ScrnInfoPtr pScrn, short src_x, short src_y,
if (!skip) {
if (pPriv->blitter) {
- NVPutBlitImage(pScrn, offset, id,
+ NVPutBlitImage(pScrn, pNv->GARTScratch->offset, id,
dstPitch, &dstBox,
xa, ya, xb, yb,
width, height,