Skip to contentSkip to conversation

fbdev: Add iomem annotations to i810fb

PATCH New Antonino A. Daplas 1 participant 1 message Sep 18, 2004 Framebuffer layer

lore
Share & tools
lore

Antonino A. Daplas

author
#0 lore raw

PATCH 3/5 fbdev: Add iomem annotations to i810fb

Add iomem annotations to i810fb.

Signed-off-by Antonino Daplas <[email protected]>

---

 i810.h       |    4 +-
 i810_accel.c |   14 +++++-----
 i810_gtf.c   |    3 +-
 i810_main.c  |   81 +++++++++++++++++++++++++++++++++--------------------------
 4 files changed, 57 insertions(+), 45 deletions(-)
drivers/video/i810/i810_accel.c +7 -7
diff -uprN linux-2.6.9-rc2-mm1-orig/drivers/video/i810/i810_accel.c linux-2.6.9-rc2-mm1/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 
 {
 	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 
 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_
  */
 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);
 }

@@ -326,7 +326,7 @@ static inline void load_front(int offset
 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 +451,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 +472,7 @@ void i810fb_init_ringbuffer(struct fb_in
 {
 	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);
drivers/video/i810/i810_gtf.c +2 -1
diff -uprN linux-2.6.9-rc2-mm1-orig/drivers/video/i810/i810_gtf.c linux-2.6.9-rc2-mm1/drivers/video/i810/i810_gtf.c
@@ -124,7 +124,8 @@ void i810fb_encode_registers(const struc
 			     struct i810fb_par *par, u32 xres, u32 yres)
 {
 	int n, blank_s, blank_e;
-	u8 *mmio = par->mmio_start_virtual, msr = 0;
+	u8 __iomem *mmio = par->mmio_start_virtual;
+	u8 msr = 0;
 
 	/* Horizontal */
 	/* htotal */
drivers/video/i810/i810.h +2 -2
diff -uprN linux-2.6.9-rc2-mm1-orig/drivers/video/i810/i810.h linux-2.6.9-rc2-mm1/drivers/video/i810/i810.h
@@ -222,7 +222,7 @@ struct mode_registers {
 
 struct heap_data {
         unsigned long physical;
-	__u8 *virtual;
+	__u8 __iomem *virtual;
 	u32 offset;
 	u32 size;
 };	

@@ -256,7 +256,7 @@ struct i810fb_par {
 	u32 pseudo_palette[17];
 	u32 pci_state[16];
 	unsigned long mmio_start_phys;
-	u8 *mmio_start_virtual;
+	u8 __iomem *mmio_start_virtual;
 	u32 pitch;
 	u32 pixconf;
 	u32 watermark;
drivers/video/i810/i810_main.c +46 -35

287 lines not on this page · raw message