vserver 1.9.5.x5

[linux-2.6.git] / drivers / video / i810 / i810_accel.c

diff --git a/drivers/video/i810/i810_accel.c b/drivers/video/i810/i810_accel.c
index 71f649f..64cd1c8 100644 (file)
--- a/drivers/video/i810/i810_accel.c
+++ b/drivers/video/i810/i810_accel.c
@@ -32,7 +32,7 @@ extern void flush_cache(void);
 /************************************************************/
 
 /* BLT Engine Routines */
-static inline void i810_report_error(u8 *mmio)
+static inline void i810_report_error(u8 __iomem *mmio)
 {
        printk("IIR     : 0x%04x\n"
               "EIR     : 0x%04x\n"
@@ -59,7 +59,7 @@ static inline int wait_for_space(struct fb_info *info, u32 space)
 {
        struct i810fb_par *par = (struct i810fb_par *) info->par;
        u32 head, count = WAIT_COUNT, tail;
-       u8 *mmio = par->mmio_start_virtual;
+       u8 __iomem *mmio = par->mmio_start_virtual;
 
        tail = par->cur_tail;
        while (count--) {
@@ -89,7 +89,7 @@ static inline int wait_for_space(struct fb_info *info, u32 space)
 static inline int wait_for_engine_idle(struct fb_info *info)
 {
        struct i810fb_par *par = (struct i810fb_par *) info->par;
-       u8 *mmio = par->mmio_start_virtual;
+       u8 __iomem *mmio = par->mmio_start_virtual;
        int count = WAIT_COUNT;
 
        if (wait_for_space(info, par->iring.size)) /* flush */
@@ -133,7 +133,7 @@ static inline u32 begin_iring(struct fb_info *info, u32 space)
  */
 static inline void end_iring(struct i810fb_par *par)
 {
-       u8 *mmio = par->mmio_start_virtual;
+       u8 __iomem *mmio = par->mmio_start_virtual;
 
        i810_writel(IRING, mmio, par->cur_tail);
 }
@@ -252,49 +252,6 @@ static inline void mono_src_copy_imm_blit(int dwidth, int dheight, int dpitch,
        end_iring(par);
 }
 
-/**
- * mono_src_copy_blit - color expand from video memory to framebuffer
- * @dwidth: width of destination
- * @dheight: height of destination
- * @dpitch: pixels per line of the buffer
- * @qsize: size of bitmap in quad words
- * @dest: address of first byte of pixel;
- * @rop: raster operation
- * @blit_bpp: pixelformat to use which can be different from the 
- *            framebuffer's pixelformat
- * @src: address of image data
- * @bg: backgound color
- * @fg: forground color
- * @par: pointer to i810fb_par structure
- *
- * DESCRIPTION:
- * A color expand operation where the  source data is in video memory. 
- * Useful for drawing text. 
- *
- * REQUIREMENT:
- * The end of a scanline must be padded to the next word.
- */
-static inline void mono_src_copy_blit(int dwidth, int dheight, int dpitch, 
-                                     int qsize, int blit_bpp, int rop, 
-                                     int dest, int src, int bg,
-                                     int fg, struct fb_info *info)
-{
-       struct i810fb_par *par = (struct i810fb_par *) info->par;
-
-       if (begin_iring(info, 32 + IRING_PAD)) return;
-
-       PUT_RING(BLIT | MONO_SOURCE_COPY_BLIT | 6);
-       PUT_RING(DYN_COLOR_EN | blit_bpp | rop << 16 | dpitch | 1 << 27);
-       PUT_RING(dheight << 16 | dwidth);
-       PUT_RING(dest);
-       PUT_RING(qsize - 1);
-       PUT_RING(src);
-       PUT_RING(bg);
-       PUT_RING(fg);
-
-       end_iring(par);
-}
-
 static inline void load_front(int offset, struct fb_info *info)
 {
        struct i810fb_par *par = (struct i810fb_par *) info->par;
@@ -326,7 +283,7 @@ static inline void load_front(int offset, struct fb_info *info)
 static inline void i810fb_iring_enable(struct i810fb_par *par, u32 mode)
 {
        u32 tmp;
-       u8 *mmio = par->mmio_start_virtual;
+       u8 __iomem *mmio = par->mmio_start_virtual;
 
        tmp = i810_readl(IRING + 12, mmio);
        if (mode == OFF) 
@@ -451,7 +408,7 @@ int i810fb_sync(struct fb_info *info)
 void i810fb_load_front(u32 offset, struct fb_info *info)
 {
        struct i810fb_par *par = (struct i810fb_par *) info->par;
-       u8 *mmio = par->mmio_start_virtual;
+       u8 __iomem *mmio = par->mmio_start_virtual;
 
        if (!info->var.accel_flags || par->dev_flags & LOCKUP)
                i810_writel(DPLYBASE, mmio, par->fb.physical + offset);
@@ -472,7 +429,7 @@ void i810fb_init_ringbuffer(struct fb_info *info)
 {
        struct i810fb_par *par = (struct i810fb_par *) info->par;
        u32 tmp1, tmp2;
-       u8 *mmio = par->mmio_start_virtual;
+       u8 __iomem *mmio = par->mmio_start_virtual;
        
        wait_for_engine_idle(info);
        i810fb_iring_enable(par, OFF);