diff options
Diffstat (limited to 'src/nv04_xv_blit.c')
| -rw-r--r-- | src/nv04_xv_blit.c | 34 |
1 files changed, 15 insertions, 19 deletions
diff --git a/src/nv04_xv_blit.c b/src/nv04_xv_blit.c index 1b8de4f..4377841 100644 --- a/src/nv04_xv_blit.c +++ b/src/nv04_xv_blit.c @@ -36,6 +36,8 @@ #include "nv04_pushbuf.h" +#include "hwdefs/nv01_2d.xml.h" + #define FOURCC_RGB 0x0000003 #define VSYNC_POSSIBLE (pNv->dev->chipset >= 0x11) @@ -92,7 +94,7 @@ NVPutBlitImage(ScrnInfoPtr pScrn, struct nouveau_bo *src, int src_offset, if (MARK_RING(chan, 64, 4)) return BadImplementation; - BEGIN_RING(chan, surf2d, NV04_CONTEXT_SURFACES_2D_FORMAT, 4); + BEGIN_RING(chan, surf2d, NV04_SURFACE_2D_FORMAT, 4); OUT_RING (chan, dst_format); OUT_RING (chan, (exaGetPixmapPitch(ppix) << 16) | exaGetPixmapPitch(ppix)); if (OUT_RELOCl(chan, bo, 0, NOUVEAU_BO_VRAM | NOUVEAU_BO_WR) || @@ -111,22 +113,19 @@ NVPutBlitImage(ScrnInfoPtr pScrn, struct nouveau_bo *src, int src_offset, (dstBox->x2 - dstBox->x1); dst_point = (dstBox->y1 << 16) | dstBox->x1; - src_pitch |= (NV03_SCALED_IMAGE_FROM_MEMORY_FORMAT_ORIGIN_CENTER | - NV03_SCALED_IMAGE_FROM_MEMORY_FORMAT_FILTER_BILINEAR); + src_pitch |= (NV03_SIFM_FORMAT_ORIGIN_CENTER | + NV03_SIFM_FORMAT_FILTER_BILINEAR); src_point = ((y1 << 4) & 0xffff0000) | (x1 >> 12); switch(id) { case FOURCC_RGB: - src_format = - NV03_SCALED_IMAGE_FROM_MEMORY_COLOR_FORMAT_X8R8G8B8; + src_format = NV03_SIFM_COLOR_FORMAT_X8R8G8B8; break; case FOURCC_UYVY: - src_format = - NV03_SCALED_IMAGE_FROM_MEMORY_COLOR_FORMAT_YB8V8YA8U8; + src_format = NV03_SIFM_COLOR_FORMAT_YB8V8YA8U8; break; default: - src_format = - NV03_SCALED_IMAGE_FROM_MEMORY_COLOR_FORMAT_V8YB8U8YA8; + src_format = NV03_SIFM_COLOR_FORMAT_V8YB8U8YA8; break; } @@ -136,26 +135,23 @@ NVPutBlitImage(ScrnInfoPtr pScrn, struct nouveau_bo *src, int src_offset, } if (pNv->dev->chipset >= 0x05) { - BEGIN_RING(chan, sifm, - NV03_SCALED_IMAGE_FROM_MEMORY_COLOR_FORMAT, 2); + BEGIN_RING(chan, sifm, NV03_SIFM_COLOR_FORMAT, 2); OUT_RING (chan, src_format); - OUT_RING (chan, NV03_SCALED_IMAGE_FROM_MEMORY_OPERATION_SRCCOPY); + OUT_RING (chan, NV03_SIFM_OPERATION_SRCCOPY); } else { - BEGIN_RING(chan, sifm, - NV03_SCALED_IMAGE_FROM_MEMORY_COLOR_FORMAT, 1); + BEGIN_RING(chan, sifm, NV03_SIFM_COLOR_FORMAT, 1); OUT_RING (chan, src_format); } - BEGIN_RING(chan, sifm, NV03_SCALED_IMAGE_FROM_MEMORY_DMA_IMAGE, 1); + BEGIN_RING(chan, sifm, NV03_SIFM_DMA_IMAGE, 1); OUT_RELOCo(chan, src, NOUVEAU_BO_VRAM | NOUVEAU_BO_GART | NOUVEAU_BO_RD); while (nbox--) { - BEGIN_RING(chan, rect, NV04_GDI_RECTANGLE_TEXT_COLOR1_A, 1); + BEGIN_RING(chan, rect, NV04_GDI_COLOR1_A, 1); OUT_RING (chan, 0); - BEGIN_RING(chan, sifm, - NV03_SCALED_IMAGE_FROM_MEMORY_CLIP_POINT, 6); + BEGIN_RING(chan, sifm, NV03_SIFM_CLIP_POINT, 6); OUT_RING (chan, (pbox->y1 << 16) | pbox->x1); OUT_RING (chan, ((pbox->y2 - pbox->y1) << 16) | (pbox->x2 - pbox->x1)); @@ -164,7 +160,7 @@ NVPutBlitImage(ScrnInfoPtr pScrn, struct nouveau_bo *src, int src_offset, OUT_RING (chan, dsdx); OUT_RING (chan, dtdy); - BEGIN_RING(chan, sifm, NV03_SCALED_IMAGE_FROM_MEMORY_SIZE, 4); + BEGIN_RING(chan, sifm, NV03_SIFM_SIZE, 4); OUT_RING (chan, (height << 16) | width); OUT_RING (chan, src_pitch); if (OUT_RELOCl(chan, src, src_offset, NOUVEAU_BO_VRAM | |