diff options
Diffstat (limited to 'src/nouveau_exa.c')
| -rw-r--r-- | src/nouveau_exa.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/nouveau_exa.c b/src/nouveau_exa.c index 6ffee2a..824af70 100644 --- a/src/nouveau_exa.c +++ b/src/nouveau_exa.c @@ -24,6 +24,8 @@ #include "nv04_pushbuf.h" #include "exa.h" +#include "hwdefs/nv_m2mf.xml.h" + static inline Bool NVAccelMemcpyRect(char *dst, const char *src, int height, int dst_pitch, int src_pitch, int line_len) @@ -76,7 +78,7 @@ NVAccelDownloadM2MF(PixmapPtr pspix, int x, int y, int w, int h, if (MARK_RING(chan, 32, 6)) return FALSE; - BEGIN_RING(chan, m2mf, NV04_MEMORY_TO_MEMORY_FORMAT_DMA_BUFFER_IN, 2); + BEGIN_RING(chan, m2mf, NV03_M2MF_DMA_BUFFER_IN, 2); if (OUT_RELOCo(chan, bo, NOUVEAU_BO_GART | NOUVEAU_BO_VRAM | NOUVEAU_BO_RD) || OUT_RELOCo(chan, pNv->GART, NOUVEAU_BO_GART | @@ -87,7 +89,7 @@ NVAccelDownloadM2MF(PixmapPtr pspix, int x, int y, int w, int h, if (pNv->Architecture >= NV_ARCH_50) { if (!linear) { - BEGIN_RING(chan, m2mf, NV50_MEMORY_TO_MEMORY_FORMAT_LINEAR_IN, 7); + BEGIN_RING(chan, m2mf, NV50_M2MF_LINEAR_IN, 7); OUT_RING (chan, 0); OUT_RING (chan, bo->tile_mode << 4); OUT_RING (chan, pspix->drawable.width * cpp); @@ -96,14 +98,14 @@ NVAccelDownloadM2MF(PixmapPtr pspix, int x, int y, int w, int h, OUT_RING (chan, 0); OUT_RING (chan, (y << 16) | (x * cpp)); } else { - BEGIN_RING(chan, m2mf, NV50_MEMORY_TO_MEMORY_FORMAT_LINEAR_IN, 1); + BEGIN_RING(chan, m2mf, NV50_M2MF_LINEAR_IN, 1); OUT_RING (chan, 1); } - BEGIN_RING(chan, m2mf, NV50_MEMORY_TO_MEMORY_FORMAT_LINEAR_OUT, 1); + BEGIN_RING(chan, m2mf, NV50_M2MF_LINEAR_OUT, 1); OUT_RING (chan, 1); - BEGIN_RING(chan, m2mf, NV50_MEMORY_TO_MEMORY_FORMAT_OFFSET_IN_HIGH, 2); + BEGIN_RING(chan, m2mf, NV50_M2MF_OFFSET_IN_HIGH, 2); if (OUT_RELOCh(chan, bo, src_offset, NOUVEAU_BO_GART | NOUVEAU_BO_VRAM | NOUVEAU_BO_RD) || OUT_RELOCh(chan, pNv->GART, 0, NOUVEAU_BO_GART | @@ -113,8 +115,7 @@ NVAccelDownloadM2MF(PixmapPtr pspix, int x, int y, int w, int h, } } - BEGIN_RING(chan, m2mf, - NV04_MEMORY_TO_MEMORY_FORMAT_OFFSET_IN, 8); + BEGIN_RING(chan, m2mf, NV03_M2MF_OFFSET_IN, 8); if (OUT_RELOCl(chan, bo, src_offset, NOUVEAU_BO_GART | NOUVEAU_BO_VRAM | NOUVEAU_BO_RD) || OUT_RELOCl(chan, pNv->GART, 0, NOUVEAU_BO_GART | @@ -206,7 +207,7 @@ NVAccelUploadM2MF(PixmapPtr pdpix, int x, int y, int w, int h, if (MARK_RING(chan, 32, 6)) return FALSE; - BEGIN_RING(chan, m2mf, NV04_MEMORY_TO_MEMORY_FORMAT_DMA_BUFFER_IN, 2); + BEGIN_RING(chan, m2mf, NV03_M2MF_DMA_BUFFER_IN, 2); if (OUT_RELOCo(chan, pNv->GART, NOUVEAU_BO_GART | NOUVEAU_BO_RD) || OUT_RELOCo(chan, bo, NOUVEAU_BO_VRAM | NOUVEAU_BO_GART | @@ -216,11 +217,11 @@ NVAccelUploadM2MF(PixmapPtr pdpix, int x, int y, int w, int h, } if (pNv->Architecture >= NV_ARCH_50) { - BEGIN_RING(chan, m2mf, NV50_MEMORY_TO_MEMORY_FORMAT_LINEAR_IN, 1); + BEGIN_RING(chan, m2mf, NV50_M2MF_LINEAR_IN, 1); OUT_RING (chan, 1); if (!linear) { - BEGIN_RING(chan, m2mf, NV50_MEMORY_TO_MEMORY_FORMAT_LINEAR_OUT, 7); + BEGIN_RING(chan, m2mf, NV50_M2MF_LINEAR_OUT, 7); OUT_RING (chan, 0); OUT_RING (chan, bo->tile_mode << 4); OUT_RING (chan, pdpix->drawable.width * cpp); @@ -229,11 +230,11 @@ NVAccelUploadM2MF(PixmapPtr pdpix, int x, int y, int w, int h, OUT_RING (chan, 0); OUT_RING (chan, (y << 16) | (x * cpp)); } else { - BEGIN_RING(chan, m2mf, NV50_MEMORY_TO_MEMORY_FORMAT_LINEAR_OUT, 1); + BEGIN_RING(chan, m2mf, NV50_M2MF_LINEAR_OUT, 1); OUT_RING (chan, 1); } - BEGIN_RING(chan, m2mf, NV50_MEMORY_TO_MEMORY_FORMAT_OFFSET_IN_HIGH, 2); + BEGIN_RING(chan, m2mf, NV50_M2MF_OFFSET_IN_HIGH, 2); if (OUT_RELOCh(chan, pNv->GART, 0, NOUVEAU_BO_GART | NOUVEAU_BO_RD) || OUT_RELOCh(chan, bo, dst_offset, NOUVEAU_BO_VRAM | @@ -244,8 +245,7 @@ NVAccelUploadM2MF(PixmapPtr pdpix, int x, int y, int w, int h, } /* DMA to VRAM */ - BEGIN_RING(chan, m2mf, - NV04_MEMORY_TO_MEMORY_FORMAT_OFFSET_IN, 8); + BEGIN_RING(chan, m2mf, NV03_M2MF_OFFSET_IN, 8); if (OUT_RELOCl(chan, pNv->GART, 0, NOUVEAU_BO_GART | NOUVEAU_BO_RD) || OUT_RELOCl(chan, bo, dst_offset, NOUVEAU_BO_VRAM | |