Update to new nouveau_class.h

Signed-off-by: Francisco Jerez <currojerez@riseup.net>

3 files changed, 25 insertions, 25 deletions

diff --git a/src/nv04_exa.c b/src/nv04_exa.c
index 11b975c..c5e44a5 100644
--- a/src/nv04_exa.c
+++ b/src/nv04_exa.c
@@ -209,14 +209,14 @@ NV04EXAPrepareCopy(PixmapPtr pSrcPixmap, PixmapPtr pDstPixmap, int dx, int dy,
 
 		BEGIN_RING(chan, blit, NV04_IMAGE_BLIT_SURFACE, 1);
 		OUT_RING  (chan, pNv->NvContextSurfaces->handle);
-		BEGIN_RING(chan, blit, NV04_IMAGE_BLIT_OPERATION, 1);
+		BEGIN_RING(chan, blit, NV01_IMAGE_BLIT_OPERATION, 1);
 		OUT_RING  (chan, 1); /* ROP_AND */
 
 		NV04EXASetROP(pScrn, alu, planemask);
 	} else {
 		BEGIN_RING(chan, blit, NV04_IMAGE_BLIT_SURFACE, 1);
 		OUT_RING  (chan, pNv->NvContextSurfaces->handle);
-		BEGIN_RING(chan, blit, NV04_IMAGE_BLIT_OPERATION, 1);
+		BEGIN_RING(chan, blit, NV01_IMAGE_BLIT_OPERATION, 1);
 		OUT_RING  (chan, 3); /* SRCCOPY */
 	}
 
diff --git a/src/nv04_xv_blit.c b/src/nv04_xv_blit.c
index 6359215..3828fa4 100644
--- a/src/nv04_xv_blit.c
+++ b/src/nv04_xv_blit.c
@@ -110,22 +110,22 @@ NVPutBlitImage(ScrnInfoPtr pScrn, struct nouveau_bo *src, int src_offset,
                      (dstBox->x2 - dstBox->x1);
         dst_point = (dstBox->y1 << 16) | dstBox->x1;
 
-        src_pitch |= (NV04_SCALED_IMAGE_FROM_MEMORY_FORMAT_ORIGIN_CENTER |
-                      NV04_SCALED_IMAGE_FROM_MEMORY_FORMAT_FILTER_BILINEAR);
+        src_pitch |= (NV03_SCALED_IMAGE_FROM_MEMORY_FORMAT_ORIGIN_CENTER |
+                      NV03_SCALED_IMAGE_FROM_MEMORY_FORMAT_FILTER_BILINEAR);
         src_point = ((y1 << 4) & 0xffff0000) | (x1 >> 12);
 
         switch(id) {
         case FOURCC_RGB:
                 src_format =
-                        NV04_SCALED_IMAGE_FROM_MEMORY_COLOR_FORMAT_X8R8G8B8;
+                        NV03_SCALED_IMAGE_FROM_MEMORY_COLOR_FORMAT_X8R8G8B8;
                 break;
         case FOURCC_UYVY:
                 src_format =
-                        NV04_SCALED_IMAGE_FROM_MEMORY_COLOR_FORMAT_YB8V8YA8U8;
+                        NV03_SCALED_IMAGE_FROM_MEMORY_COLOR_FORMAT_YB8V8YA8U8;
                 break;
         default:
                 src_format =
-                        NV04_SCALED_IMAGE_FROM_MEMORY_COLOR_FORMAT_V8YB8U8YA8;
+                        NV03_SCALED_IMAGE_FROM_MEMORY_COLOR_FORMAT_V8YB8U8YA8;
                 break;
         }
 
@@ -142,17 +142,17 @@ NVPutBlitImage(ScrnInfoPtr pScrn, struct nouveau_bo *src, int src_offset,
 
         if (pNv->dev->chipset >= 0x05) {
                 BEGIN_RING(chan, sifm,
-				 NV04_SCALED_IMAGE_FROM_MEMORY_COLOR_FORMAT, 2);
+				 NV03_SCALED_IMAGE_FROM_MEMORY_COLOR_FORMAT, 2);
                 OUT_RING  (chan, src_format);
-                OUT_RING  (chan, NV04_SCALED_IMAGE_FROM_MEMORY_OPERATION_SRCCOPY);
+                OUT_RING  (chan, NV03_SCALED_IMAGE_FROM_MEMORY_OPERATION_SRCCOPY);
         } else {
                 BEGIN_RING(chan, sifm,
-				 NV04_SCALED_IMAGE_FROM_MEMORY_COLOR_FORMAT, 1);
+				 NV03_SCALED_IMAGE_FROM_MEMORY_COLOR_FORMAT, 1);
                 OUT_RING  (chan, src_format);
         }
 
 
-	BEGIN_RING(chan, sifm, NV04_SCALED_IMAGE_FROM_MEMORY_DMA_IMAGE, 1);
+	BEGIN_RING(chan, sifm, NV03_SCALED_IMAGE_FROM_MEMORY_DMA_IMAGE, 1);
 	OUT_RELOCo(chan, src, NOUVEAU_BO_VRAM | NOUVEAU_BO_GART |
 			      NOUVEAU_BO_RD);
         while (nbox--) {
@@ -160,7 +160,7 @@ NVPutBlitImage(ScrnInfoPtr pScrn, struct nouveau_bo *src, int src_offset,
                 OUT_RING  (chan, 0);
 
                 BEGIN_RING(chan, sifm,
-				 NV04_SCALED_IMAGE_FROM_MEMORY_CLIP_POINT, 6);
+				 NV03_SCALED_IMAGE_FROM_MEMORY_CLIP_POINT, 6);
                 OUT_RING  (chan, (pbox->y1 << 16) | pbox->x1);
                 OUT_RING  (chan, ((pbox->y2 - pbox->y1) << 16) |
                                  (pbox->x2 - pbox->x1));
@@ -169,7 +169,7 @@ NVPutBlitImage(ScrnInfoPtr pScrn, struct nouveau_bo *src, int src_offset,
                 OUT_RING  (chan, dsdx);
                 OUT_RING  (chan, dtdy);
 
-                BEGIN_RING(chan, sifm, NV04_SCALED_IMAGE_FROM_MEMORY_SIZE, 4);
+                BEGIN_RING(chan, sifm, NV03_SCALED_IMAGE_FROM_MEMORY_SIZE, 4);
                 OUT_RING  (chan, (height << 16) | width);
                 OUT_RING  (chan, src_pitch);
 		if (OUT_RELOCl(chan, src, src_offset, NOUVEAU_BO_VRAM |
diff --git a/src/nv_accel_common.c b/src/nv_accel_common.c
index 53a44c9..869a6d6 100644
--- a/src/nv_accel_common.c
+++ b/src/nv_accel_common.c
@@ -270,18 +270,18 @@ NVAccelInitImageBlit(ScrnInfoPtr pScrn)
 	}
 	blit = pNv->NvImageBlit;
 
-	BEGIN_RING(chan, blit, NV04_IMAGE_BLIT_DMA_NOTIFY, 1);
+	BEGIN_RING(chan, blit, NV01_IMAGE_BLIT_DMA_NOTIFY, 1);
 	OUT_RING  (chan, pNv->notify0->handle);
-	BEGIN_RING(chan, blit, NV04_IMAGE_BLIT_COLOR_KEY, 1);
+	BEGIN_RING(chan, blit, NV01_IMAGE_BLIT_COLOR_KEY, 1);
 	OUT_RING  (chan, chan->nullobj->handle);
 	BEGIN_RING(chan, blit, NV04_IMAGE_BLIT_SURFACE, 1);
 	OUT_RING  (chan, pNv->NvContextSurfaces->handle);
-	BEGIN_RING(chan, blit, NV04_IMAGE_BLIT_CLIP_RECTANGLE, 3);
+	BEGIN_RING(chan, blit, NV01_IMAGE_BLIT_CLIP_RECTANGLE, 3);
 	OUT_RING  (chan, chan->nullobj->handle);
 	OUT_RING  (chan, pNv->NvImagePattern->handle);
 	OUT_RING  (chan, pNv->NvRop->handle);
-	BEGIN_RING(chan, blit, NV04_IMAGE_BLIT_OPERATION, 1);
-	OUT_RING  (chan, NV04_IMAGE_BLIT_OPERATION_ROP_AND);
+	BEGIN_RING(chan, blit, NV01_IMAGE_BLIT_OPERATION, 1);
+	OUT_RING  (chan, NV01_IMAGE_BLIT_OPERATION_ROP_AND);
 
 	if (blit->grclass == NV12_IMAGE_BLIT) {
 		BEGIN_RING(chan, blit, 0x0120, 3);
@@ -324,7 +324,7 @@ NVAccelInitScaledImage(ScrnInfoPtr pScrn)
 	sifm = pNv->NvScaledImage;
 
 	BEGIN_RING(chan, sifm,
-			 NV04_SCALED_IMAGE_FROM_MEMORY_DMA_NOTIFY, 7);
+			 NV03_SCALED_IMAGE_FROM_MEMORY_DMA_NOTIFY, 7);
 	OUT_RING  (chan, pNv->notify0->handle);
 	OUT_RING  (chan, pNv->chan->vram->handle);
 	OUT_RING  (chan, chan->nullobj->handle);
@@ -334,11 +334,11 @@ NVAccelInitScaledImage(ScrnInfoPtr pScrn)
 	OUT_RING  (chan, pNv->NvContextSurfaces->handle);
 	if (pNv->Architecture>=NV_ARCH_10) {
 	BEGIN_RING(chan, sifm,
-			 NV04_SCALED_IMAGE_FROM_MEMORY_COLOR_CONVERSION, 1);
-	OUT_RING  (chan, NV04_SCALED_IMAGE_FROM_MEMORY_COLOR_CONVERSION_DITHER);
+			 NV05_SCALED_IMAGE_FROM_MEMORY_COLOR_CONVERSION, 1);
+	OUT_RING  (chan, NV05_SCALED_IMAGE_FROM_MEMORY_COLOR_CONVERSION_DITHER);
 	}
-	BEGIN_RING(chan, sifm, NV04_SCALED_IMAGE_FROM_MEMORY_OPERATION, 1);
-	OUT_RING  (chan, NV04_SCALED_IMAGE_FROM_MEMORY_OPERATION_SRCCOPY);
+	BEGIN_RING(chan, sifm, NV03_SCALED_IMAGE_FROM_MEMORY_OPERATION, 1);
+	OUT_RING  (chan, NV03_SCALED_IMAGE_FROM_MEMORY_OPERATION_SRCCOPY);
 
 	return TRUE;
 }
@@ -433,10 +433,10 @@ NVAccelInitImageFromCpu(ScrnInfoPtr pScrn)
 	if (pNv->Architecture >= NV_ARCH_10) {
 		BEGIN_RING(chan, ifc, NV01_IMAGE_FROM_CPU_BETA1, 1);
 		OUT_RING  (chan, chan->nullobj->handle);
-		BEGIN_RING(chan, ifc, NV05_IMAGE_FROM_CPU_BETA4, 1);
+		BEGIN_RING(chan, ifc, NV04_IMAGE_FROM_CPU_BETA4, 1);
 		OUT_RING  (chan, chan->nullobj->handle);
 	}
-	BEGIN_RING(chan, ifc, NV05_IMAGE_FROM_CPU_SURFACE, 1);
+	BEGIN_RING(chan, ifc, NV04_IMAGE_FROM_CPU_SURFACE, 1);
 	OUT_RING  (chan, pNv->NvContextSurfaces->handle);
 	BEGIN_RING(chan, ifc, NV01_IMAGE_FROM_CPU_OPERATION, 1);
 	OUT_RING  (chan, NV01_IMAGE_FROM_CPU_OPERATION_SRCCOPY);