drm/nouveau: use the same packet header macros as userspace

[linux-2.6-microblaze.git] / drivers / gpu / drm / nouveau / nv04_fbcon.c

diff --git a/drivers/gpu/drm/nouveau/nv04_fbcon.c b/drivers/gpu/drm/nouveau/nv04_fbcon.c
index 7a11893..7cd7857 100644 (file)
--- a/drivers/gpu/drm/nouveau/nv04_fbcon.c
+++ b/drivers/gpu/drm/nouveau/nv04_fbcon.c
@@ -41,7 +41,7 @@ nv04_fbcon_copyarea(struct fb_info *info, const struct fb_copyarea *region)
        if (ret)
                return ret;
 
-       BEGIN_RING(chan, NvSubImageBlit, 0x0300, 3);
+       BEGIN_NV04(chan, NvSubImageBlit, 0x0300, 3);
        OUT_RING(chan, (region->sy << 16) | region->sx);
        OUT_RING(chan, (region->dy << 16) | region->dx);
        OUT_RING(chan, (region->height << 16) | region->width);
@@ -62,15 +62,15 @@ nv04_fbcon_fillrect(struct fb_info *info, const struct fb_fillrect *rect)
        if (ret)
                return ret;
 
-       BEGIN_RING(chan, NvSubGdiRect, 0x02fc, 1);
+       BEGIN_NV04(chan, NvSubGdiRect, 0x02fc, 1);
        OUT_RING(chan, (rect->rop != ROP_COPY) ? 1 : 3);
-       BEGIN_RING(chan, NvSubGdiRect, 0x03fc, 1);
+       BEGIN_NV04(chan, NvSubGdiRect, 0x03fc, 1);
        if (info->fix.visual == FB_VISUAL_TRUECOLOR ||
            info->fix.visual == FB_VISUAL_DIRECTCOLOR)
                OUT_RING(chan, ((uint32_t *)info->pseudo_palette)[rect->color]);
        else
                OUT_RING(chan, rect->color);
-       BEGIN_RING(chan, NvSubGdiRect, 0x0400, 2);
+       BEGIN_NV04(chan, NvSubGdiRect, 0x0400, 2);
        OUT_RING(chan, (rect->dx << 16) | rect->dy);
        OUT_RING(chan, (rect->width << 16) | rect->height);
        FIRE_RING(chan);
@@ -110,7 +110,7 @@ nv04_fbcon_imageblit(struct fb_info *info, const struct fb_image *image)
                bg = image->bg_color;
        }
 
-       BEGIN_RING(chan, NvSubGdiRect, 0x0be4, 7);
+       BEGIN_NV04(chan, NvSubGdiRect, 0x0be4, 7);
        OUT_RING(chan, (image->dy << 16) | (image->dx & 0xffff));
        OUT_RING(chan, ((image->dy + image->height) << 16) |
                         ((image->dx + image->width) & 0xffff));
@@ -127,7 +127,7 @@ nv04_fbcon_imageblit(struct fb_info *info, const struct fb_image *image)
                if (ret)
                        return ret;
 
-               BEGIN_RING(chan, NvSubGdiRect, 0x0c00, iter_len);
+               BEGIN_NV04(chan, NvSubGdiRect, 0x0c00, iter_len);
                OUT_RINGp(chan, data, iter_len);
                data += iter_len;
                dsize -= iter_len;
@@ -209,25 +209,25 @@ nv04_fbcon_accel_init(struct fb_info *info)
                return 0;
        }
 
-       BEGIN_RING(chan, sub, 0x0000, 1);
+       BEGIN_NV04(chan, sub, 0x0000, 1);
        OUT_RING(chan, NvCtxSurf2D);
-       BEGIN_RING(chan, sub, 0x0184, 2);
+       BEGIN_NV04(chan, sub, 0x0184, 2);
        OUT_RING(chan, NvDmaFB);
        OUT_RING(chan, NvDmaFB);
-       BEGIN_RING(chan, sub, 0x0300, 4);
+       BEGIN_NV04(chan, sub, 0x0300, 4);
        OUT_RING(chan, surface_fmt);
        OUT_RING(chan, info->fix.line_length | (info->fix.line_length << 16));
        OUT_RING(chan, info->fix.smem_start - dev->mode_config.fb_base);
        OUT_RING(chan, info->fix.smem_start - dev->mode_config.fb_base);
 
-       BEGIN_RING(chan, sub, 0x0000, 1);
+       BEGIN_NV04(chan, sub, 0x0000, 1);
        OUT_RING(chan, NvRop);
-       BEGIN_RING(chan, sub, 0x0300, 1);
+       BEGIN_NV04(chan, sub, 0x0300, 1);
        OUT_RING(chan, 0x55);
 
-       BEGIN_RING(chan, sub, 0x0000, 1);
+       BEGIN_NV04(chan, sub, 0x0000, 1);
        OUT_RING(chan, NvImagePatt);
-       BEGIN_RING(chan, sub, 0x0300, 8);
+       BEGIN_NV04(chan, sub, 0x0300, 8);
        OUT_RING(chan, pattern_fmt);
 #ifdef __BIG_ENDIAN
        OUT_RING(chan, 2);
@@ -241,31 +241,31 @@ nv04_fbcon_accel_init(struct fb_info *info)
        OUT_RING(chan, ~0);
        OUT_RING(chan, ~0);
 
-       BEGIN_RING(chan, sub, 0x0000, 1);
+       BEGIN_NV04(chan, sub, 0x0000, 1);
        OUT_RING(chan, NvClipRect);
-       BEGIN_RING(chan, sub, 0x0300, 2);
+       BEGIN_NV04(chan, sub, 0x0300, 2);
        OUT_RING(chan, 0);
        OUT_RING(chan, (info->var.yres_virtual << 16) | info->var.xres_virtual);
 
-       BEGIN_RING(chan, NvSubImageBlit, 0x0000, 1);
+       BEGIN_NV04(chan, NvSubImageBlit, 0x0000, 1);
        OUT_RING(chan, NvImageBlit);
-       BEGIN_RING(chan, NvSubImageBlit, 0x019c, 1);
+       BEGIN_NV04(chan, NvSubImageBlit, 0x019c, 1);
        OUT_RING(chan, NvCtxSurf2D);
-       BEGIN_RING(chan, NvSubImageBlit, 0x02fc, 1);
+       BEGIN_NV04(chan, NvSubImageBlit, 0x02fc, 1);
        OUT_RING(chan, 3);
 
-       BEGIN_RING(chan, NvSubGdiRect, 0x0000, 1);
+       BEGIN_NV04(chan, NvSubGdiRect, 0x0000, 1);
        OUT_RING(chan, NvGdiRect);
-       BEGIN_RING(chan, NvSubGdiRect, 0x0198, 1);
+       BEGIN_NV04(chan, NvSubGdiRect, 0x0198, 1);
        OUT_RING(chan, NvCtxSurf2D);
-       BEGIN_RING(chan, NvSubGdiRect, 0x0188, 2);
+       BEGIN_NV04(chan, NvSubGdiRect, 0x0188, 2);
        OUT_RING(chan, NvImagePatt);
        OUT_RING(chan, NvRop);
-       BEGIN_RING(chan, NvSubGdiRect, 0x0304, 1);
+       BEGIN_NV04(chan, NvSubGdiRect, 0x0304, 1);
        OUT_RING(chan, 1);
-       BEGIN_RING(chan, NvSubGdiRect, 0x0300, 1);
+       BEGIN_NV04(chan, NvSubGdiRect, 0x0300, 1);
        OUT_RING(chan, rect_fmt);
-       BEGIN_RING(chan, NvSubGdiRect, 0x02fc, 1);
+       BEGIN_NV04(chan, NvSubGdiRect, 0x02fc, 1);
        OUT_RING(chan, 3);
 
        FIRE_RING(chan);