Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6

* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6: (23 commits)
  [SPARC64]: virt_to_real_irq_table --> virt_irq_table
  [SPARC64]: virt_irq --> bucket mapping no longer necessary
  [SPARC64]: Kill ugly __bucket() macro.
  [SPARC64]: Kill ugly __irq_ino() macro.
  [SPARC64]: Only use bypass accesses to INO buckets.
  [SPARC64]: Update defconfig.
  [SPARC64]: Use sun4v VIRQ interfaces as intended.
  [SPARC64]: Allocate ivector_table dynamically.
  [SPARC64]: Access ivector_table[] using physical addresses.
  [SPARC64]: Make IVEC pointers 64-bit.
  [SPARC64]: Fix register usage in xor_raid_4().
  [SPARC64]: Kill pci_memspace_mask.
  [SPARC64]: Consolidate MSI support code.
  [SPARC/64]: Move of_platform_driver initialisations: arch/sparc{,64}.
  [SPARC64]: Fix bugs in SYSV IPC handling in 64-bit processes.
  [SPARC/64]: Prepare to remove of_platform_driver name.
  [SPARC32]: Add irqflags.h to sparc32 and use it from generic code.
  [SPARC64]: beautify vmlinux.lds
  [SPARC]: beautify vmlinux.lds
  [SPARC64]: Enable MSI on sun4u Fire PCI-E controllers.
  ...

2 files changed, 244 insertions, 211 deletions

diff --git a/drivers/video/cg6.c b/drivers/video/cg6.c
index ee9046db9c7d..549891d76ef5 100644
--- a/drivers/video/cg6.c
+++ b/drivers/video/cg6.c
@@ -19,7 +19,6 @@
 #include <linux/mm.h>
 
 #include <asm/io.h>
-#include <asm/prom.h>
 #include <asm/of_device.h>
 #include <asm/fbio.h>
 
@@ -38,6 +37,7 @@ static void cg6_fillrect(struct fb_info *, const struct fb_fillrect *);
 static int cg6_sync(struct fb_info *);
 static int cg6_mmap(struct fb_info *, struct vm_area_struct *);
 static int cg6_ioctl(struct fb_info *, unsigned int, unsigned long);
+static void cg6_copyarea(struct fb_info *info, const struct fb_copyarea *area);
 
 /*
  *  Frame buffer operations
@@ -48,7 +48,7 @@ static struct fb_ops cg6_ops = {
         .fb_setcolreg           = cg6_setcolreg,
         .fb_blank               = cg6_blank,
         .fb_fillrect            = cg6_fillrect,
-        .fb_copyarea            = cfb_copyarea,
+        .fb_copyarea            = cg6_copyarea,
         .fb_imageblit           = cg6_imageblit,
         .fb_sync                = cg6_sync,
         .fb_mmap                = cg6_mmap,
@@ -65,41 +65,41 @@ static struct fb_ops cg6_ops = {
  * The FBC could be the frame buffer control
  * The FHC could is the frame buffer hardware control.
  */
-#define CG6_ROM_OFFSET       0x0UL
-#define CG6_BROOKTREE_OFFSET 0x200000UL
-#define CG6_DHC_OFFSET       0x240000UL
-#define CG6_ALT_OFFSET       0x280000UL
-#define CG6_FHC_OFFSET       0x300000UL
-#define CG6_THC_OFFSET       0x301000UL
-#define CG6_FBC_OFFSET       0x700000UL
-#define CG6_TEC_OFFSET       0x701000UL
-#define CG6_RAM_OFFSET       0x800000UL
+#define CG6_ROM_OFFSET                  0x0UL
+#define CG6_BROOKTREE_OFFSET            0x200000UL
+#define CG6_DHC_OFFSET                  0x240000UL
+#define CG6_ALT_OFFSET                  0x280000UL
+#define CG6_FHC_OFFSET                  0x300000UL
+#define CG6_THC_OFFSET                  0x301000UL
+#define CG6_FBC_OFFSET                  0x700000UL
+#define CG6_TEC_OFFSET                  0x701000UL
+#define CG6_RAM_OFFSET                  0x800000UL
 
 /* FHC definitions */
-#define CG6_FHC_FBID_SHIFT           24
-#define CG6_FHC_FBID_MASK            255
-#define CG6_FHC_REV_SHIFT            20
-#define CG6_FHC_REV_MASK             15
-#define CG6_FHC_FROP_DISABLE         (1 << 19)
-#define CG6_FHC_ROW_DISABLE          (1 << 18)
-#define CG6_FHC_SRC_DISABLE          (1 << 17)
-#define CG6_FHC_DST_DISABLE          (1 << 16)
-#define CG6_FHC_RESET                (1 << 15)
-#define CG6_FHC_LITTLE_ENDIAN        (1 << 13)
-#define CG6_FHC_RES_MASK             (3 << 11)
-#define CG6_FHC_1024                 (0 << 11)
-#define CG6_FHC_1152                 (1 << 11)
-#define CG6_FHC_1280                 (2 << 11)
-#define CG6_FHC_1600                 (3 << 11)
-#define CG6_FHC_CPU_MASK             (3 << 9)
-#define CG6_FHC_CPU_SPARC            (0 << 9)
-#define CG6_FHC_CPU_68020            (1 << 9)
-#define CG6_FHC_CPU_386              (2 << 9)
-#define CG6_FHC_TEST                 (1 << 8)
-#define CG6_FHC_TEST_X_SHIFT         4
-#define CG6_FHC_TEST_X_MASK          15
-#define CG6_FHC_TEST_Y_SHIFT         0
-#define CG6_FHC_TEST_Y_MASK          15
+#define CG6_FHC_FBID_SHIFT              24
+#define CG6_FHC_FBID_MASK               255
+#define CG6_FHC_REV_SHIFT               20
+#define CG6_FHC_REV_MASK                15
+#define CG6_FHC_FROP_DISABLE            (1 << 19)
+#define CG6_FHC_ROW_DISABLE             (1 << 18)
+#define CG6_FHC_SRC_DISABLE             (1 << 17)
+#define CG6_FHC_DST_DISABLE             (1 << 16)
+#define CG6_FHC_RESET                   (1 << 15)
+#define CG6_FHC_LITTLE_ENDIAN           (1 << 13)
+#define CG6_FHC_RES_MASK                (3 << 11)
+#define CG6_FHC_1024                    (0 << 11)
+#define CG6_FHC_1152                    (1 << 11)
+#define CG6_FHC_1280                    (2 << 11)
+#define CG6_FHC_1600                    (3 << 11)
+#define CG6_FHC_CPU_MASK                (3 << 9)
+#define CG6_FHC_CPU_SPARC               (0 << 9)
+#define CG6_FHC_CPU_68020               (1 << 9)
+#define CG6_FHC_CPU_386                 (2 << 9)
+#define CG6_FHC_TEST                    (1 << 8)
+#define CG6_FHC_TEST_X_SHIFT            4
+#define CG6_FHC_TEST_X_MASK             15
+#define CG6_FHC_TEST_Y_SHIFT            0
+#define CG6_FHC_TEST_Y_MASK             15
 
 /* FBC mode definitions */
 #define CG6_FBC_BLIT_IGNORE             0x00000000
@@ -150,17 +150,17 @@ static struct fb_ops cg6_ops = {
 #define CG6_FBC_INDEX_MASK              0x00000030
 
 /* THC definitions */
-#define CG6_THC_MISC_REV_SHIFT       16
-#define CG6_THC_MISC_REV_MASK        15
-#define CG6_THC_MISC_RESET           (1 << 12)
-#define CG6_THC_MISC_VIDEO           (1 << 10)
-#define CG6_THC_MISC_SYNC            (1 << 9)
-#define CG6_THC_MISC_VSYNC           (1 << 8)
-#define CG6_THC_MISC_SYNC_ENAB       (1 << 7)
-#define CG6_THC_MISC_CURS_RES        (1 << 6)
-#define CG6_THC_MISC_INT_ENAB        (1 << 5)
-#define CG6_THC_MISC_INT             (1 << 4)
-#define CG6_THC_MISC_INIT            0x9f
+#define CG6_THC_MISC_REV_SHIFT          16
+#define CG6_THC_MISC_REV_MASK           15
+#define CG6_THC_MISC_RESET              (1 << 12)
+#define CG6_THC_MISC_VIDEO              (1 << 10)
+#define CG6_THC_MISC_SYNC               (1 << 9)
+#define CG6_THC_MISC_VSYNC              (1 << 8)
+#define CG6_THC_MISC_SYNC_ENAB          (1 << 7)
+#define CG6_THC_MISC_CURS_RES           (1 << 6)
+#define CG6_THC_MISC_INT_ENAB           (1 << 5)
+#define CG6_THC_MISC_INT                (1 << 4)
+#define CG6_THC_MISC_INIT               0x9f
 
 /* The contents are unknown */
 struct cg6_tec {
@@ -170,25 +170,25 @@ struct cg6_tec {
 };
 
 struct cg6_thc {
-        u32 thc_pad0[512];
-        u32 thc_hs;             /* hsync timing */
-        u32 thc_hsdvs;
-        u32 thc_hd;
-        u32 thc_vs;             /* vsync timing */
-        u32 thc_vd;
-        u32 thc_refresh;
-        u32 thc_misc;
-        u32 thc_pad1[56];
-        u32 thc_cursxy; /* cursor x,y position (16 bits each) */
-        u32 thc_cursmask[32];   /* cursor mask bits */
-        u32 thc_cursbits[32];   /* what to show where mask enabled */
+        u32     thc_pad0[512];
+        u32     thc_hs;         /* hsync timing */
+        u32     thc_hsdvs;
+        u32     thc_hd;
+        u32     thc_vs;         /* vsync timing */
+        u32     thc_vd;
+        u32     thc_refresh;
+        u32     thc_misc;
+        u32     thc_pad1[56];
+        u32     thc_cursxy;     /* cursor x,y position (16 bits each) */
+        u32     thc_cursmask[32];       /* cursor mask bits */
+        u32     thc_cursbits[32];       /* what to show where mask enabled */
 };
 
 struct cg6_fbc {
         u32     xxx0[1];
         u32     mode;
         u32     clip;
-        u32     xxx1[1];            
+        u32     xxx1[1];
         u32     s;
         u32     draw;
         u32     blit;
@@ -243,10 +243,10 @@ struct cg6_fbc {
 };
 
 struct bt_regs {
-        u32 addr;
-        u32 color_map;
-        u32 control;
-        u32 cursor;
+        u32     addr;
+        u32     color_map;
+        u32     control;
+        u32     cursor;
 };
 
 struct cg6_par {
@@ -267,7 +267,7 @@ struct cg6_par {
 
 static int cg6_sync(struct fb_info *info)
 {
-        struct cg6_par *par = (struct cg6_par *) info->par;
+        struct cg6_par *par = (struct cg6_par *)info->par;
         struct cg6_fbc __iomem *fbc = par->fbc;
         int limit = 10000;
 
@@ -281,24 +281,24 @@ static int cg6_sync(struct fb_info *info)
 }
 
 /**
- *      cg6_fillrect - REQUIRED function. Can use generic routines if 
- *                     non acclerated hardware and packed pixel based.
- *                     Draws a rectangle on the screen.               
+ *      cg6_fillrect -  Draws a rectangle on the screen.
  *
- *      @info: frame buffer structure that represents a single frame buffer
- *      @rect: structure defining the rectagle and operation.
+ *      @info: frame buffer structure that represents a single frame buffer
+ *      @rect: structure defining the rectagle and operation.
  */
 static void cg6_fillrect(struct fb_info *info, const struct fb_fillrect *rect)
 {
-        struct cg6_par *par = (struct cg6_par *) info->par;
+        struct cg6_par *par = (struct cg6_par *)info->par;
         struct cg6_fbc __iomem *fbc = par->fbc;
         unsigned long flags;
         s32 val;
 
-        /* XXX doesn't handle ROP_XOR */
+        /* CG6 doesn't handle ROP_XOR */
 
         spin_lock_irqsave(&par->lock, flags);
+
         cg6_sync(info);
+
         sbus_writel(rect->color, &fbc->fg);
         sbus_writel(~(u32)0, &fbc->pixelm);
         sbus_writel(0xea80ff00, &fbc->alu);
@@ -316,16 +316,56 @@ static void cg6_fillrect(struct fb_info *info, const struct fb_fillrect *rect)
 }
 
 /**
- *      cg6_imageblit - REQUIRED function. Can use generic routines if
- *                      non acclerated hardware and packed pixel based.
- *                      Copies a image from system memory to the screen. 
+ *      cg6_copyarea - Copies one area of the screen to another area.
+ *
+ *      @info: frame buffer structure that represents a single frame buffer
+ *      @area: Structure providing the data to copy the framebuffer contents
+ *              from one region to another.
+ *
+ *      This drawing operation copies a rectangular area from one area of the
+ *      screen to another area.
+ */
+static void cg6_copyarea(struct fb_info *info, const struct fb_copyarea *area)
+{
+        struct cg6_par *par = (struct cg6_par *)info->par;
+        struct cg6_fbc __iomem *fbc = par->fbc;
+        unsigned long flags;
+        int i;
+
+        spin_lock_irqsave(&par->lock, flags);
+
+        cg6_sync(info);
+
+        sbus_writel(0xff, &fbc->fg);
+        sbus_writel(0x00, &fbc->bg);
+        sbus_writel(~0, &fbc->pixelm);
+        sbus_writel(0xe880cccc, &fbc->alu);
+        sbus_writel(0, &fbc->s);
+        sbus_writel(0, &fbc->clip);
+
+        sbus_writel(area->sy, &fbc->y0);
+        sbus_writel(area->sx, &fbc->x0);
+        sbus_writel(area->sy + area->height - 1, &fbc->y1);
+        sbus_writel(area->sx + area->width - 1, &fbc->x1);
+        sbus_writel(area->dy, &fbc->y2);
+        sbus_writel(area->dx, &fbc->x2);
+        sbus_writel(area->dy + area->height - 1, &fbc->y3);
+        sbus_writel(area->dx + area->width - 1, &fbc->x3);
+        do {
+                i = sbus_readl(&fbc->blit);
+        } while (i < 0 && (i & 0x20000000));
+        spin_unlock_irqrestore(&par->lock, flags);
+}
+
+/**
+ *      cg6_imageblit - Copies a image from system memory to the screen.
  *
- *      @info: frame buffer structure that represents a single frame buffer
- *      @image: structure defining the image.
+ *      @info: frame buffer structure that represents a single frame buffer
+ *      @image: structure defining the image.
  */
 static void cg6_imageblit(struct fb_info *info, const struct fb_image *image)
 {
-        struct cg6_par *par = (struct cg6_par *) info->par;
+        struct cg6_par *par = (struct cg6_par *)info->par;
         struct cg6_fbc __iomem *fbc = par->fbc;
         const u8 *data = image->data;
         unsigned long flags;
@@ -363,7 +403,7 @@ static void cg6_imageblit(struct fb_info *info, const struct fb_image *image)
                         sbus_writel(y, &fbc->y0);
                         sbus_writel(x, &fbc->x0);
                         sbus_writel(x + 32 - 1, &fbc->x1);
-                        
+
                         val = ((u32)data[0] << 24) |
                               ((u32)data[1] << 16) |
                               ((u32)data[2] <<  8) |
@@ -404,19 +444,20 @@ static void cg6_imageblit(struct fb_info *info, const struct fb_image *image)
 }
 
 /**
- *      cg6_setcolreg - Optional function. Sets a color register.
- *      @regno: boolean, 0 copy local, 1 get_user() function
- *      @red: frame buffer colormap structure
- *      @green: The green value which can be up to 16 bits wide
- *      @blue:  The blue value which can be up to 16 bits wide.
- *      @transp: If supported the alpha value which can be up to 16 bits wide.
- *      @info: frame buffer info structure
+ *      cg6_setcolreg - Sets a color register.
+ *
+ *      @regno: boolean, 0 copy local, 1 get_user() function
+ *      @red: frame buffer colormap structure
+ *      @green: The green value which can be up to 16 bits wide
+ *      @blue:  The blue value which can be up to 16 bits wide.
+ *      @transp: If supported the alpha value which can be up to 16 bits wide.
+ *      @info: frame buffer info structure
  */
 static int cg6_setcolreg(unsigned regno,
                          unsigned red, unsigned green, unsigned blue,
                          unsigned transp, struct fb_info *info)
 {
-        struct cg6_par *par = (struct cg6_par *) info->par;
+        struct cg6_par *par = (struct cg6_par *)info->par;
         struct bt_regs __iomem *bt = par->bt;
         unsigned long flags;
 
@@ -440,25 +481,24 @@ static int cg6_setcolreg(unsigned regno,
 }
 
 /**
- *      cg6_blank - Optional function.  Blanks the display.
- *      @blank_mode: the blank mode we want.
- *      @info: frame buffer structure that represents a single frame buffer
+ *      cg6_blank - Blanks the display.
+ *
+ *      @blank_mode: the blank mode we want.
+ *      @info: frame buffer structure that represents a single frame buffer
  */
-static int
-cg6_blank(int blank, struct fb_info *info)
+static int cg6_blank(int blank, struct fb_info *info)
 {
-        struct cg6_par *par = (struct cg6_par *) info->par;
+        struct cg6_par *par = (struct cg6_par *)info->par;
         struct cg6_thc __iomem *thc = par->thc;
         unsigned long flags;
         u32 val;
 
         spin_lock_irqsave(&par->lock, flags);
+        val = sbus_readl(&thc->thc_misc);
 
         switch (blank) {
         case FB_BLANK_UNBLANK: /* Unblanking */
-                val = sbus_readl(&thc->thc_misc);
                 val |= CG6_THC_MISC_VIDEO;
-                sbus_writel(val, &thc->thc_misc);
                 par->flags &= ~CG6_FLAG_BLANKED;
                 break;
 
@@ -466,13 +506,12 @@ cg6_blank(int blank, struct fb_info *info)
         case FB_BLANK_VSYNC_SUSPEND: /* VESA blank (vsync off) */
         case FB_BLANK_HSYNC_SUSPEND: /* VESA blank (hsync off) */
         case FB_BLANK_POWERDOWN: /* Poweroff */
-                val = sbus_readl(&thc->thc_misc);
                 val &= ~CG6_THC_MISC_VIDEO;
-                sbus_writel(val, &thc->thc_misc);
                 par->flags |= CG6_FLAG_BLANKED;
                 break;
         }
 
+        sbus_writel(val, &thc->thc_misc);
         spin_unlock_irqrestore(&par->lock, flags);
 
         return 0;
@@ -533,7 +572,7 @@ static int cg6_mmap(struct fb_info *info, struct vm_area_struct *vma)
 
 static int cg6_ioctl(struct fb_info *info, unsigned int cmd, unsigned long arg)
 {
-        struct cg6_par *par = (struct cg6_par *) info->par;
+        struct cg6_par *par = (struct cg6_par *)info->par;
 
         return sbusfb_ioctl_helper(cmd, arg, info,
                                    FBTYPE_SUNFAST_COLOR, 8, par->fbsize);
@@ -543,15 +582,14 @@ static int cg6_ioctl(struct fb_info *info, unsigned int cmd, unsigned long arg)
  *  Initialisation
  */
 
-static void
-cg6_init_fix(struct fb_info *info, int linebytes)
+static void __devinit cg6_init_fix(struct fb_info *info, int linebytes)
 {
         struct cg6_par *par = (struct cg6_par *)info->par;
         const char *cg6_cpu_name, *cg6_card_name;
         u32 conf;
 
         conf = sbus_readl(par->fhc);
-        switch(conf & CG6_FHC_CPU_MASK) {
+        switch (conf & CG6_FHC_CPU_MASK) {
         case CG6_FHC_CPU_SPARC:
                 cg6_cpu_name = "sparc";
                 break;
@@ -563,21 +601,19 @@ cg6_init_fix(struct fb_info *info, int linebytes)
                 break;
         };
         if (((conf >> CG6_FHC_REV_SHIFT) & CG6_FHC_REV_MASK) >= 11) {
-                if (par->fbsize <= 0x100000) {
+                if (par->fbsize <= 0x100000)
                         cg6_card_name = "TGX";
-                } else {
+                else
                         cg6_card_name = "TGX+";
-                }
         } else {
-                if (par->fbsize <= 0x100000) {
+                if (par->fbsize <= 0x100000)
                         cg6_card_name = "GX";
-                } else {
+                else
                         cg6_card_name = "GX+";
-                }
         }
 
         sprintf(info->fix.id, "%s %s", cg6_card_name, cg6_cpu_name);
-        info->fix.id[sizeof(info->fix.id)-1] = 0;
+        info->fix.id[sizeof(info->fix.id) - 1] = 0;
 
         info->fix.type = FB_TYPE_PACKED_PIXELS;
         info->fix.visual = FB_VISUAL_PSEUDOCOLOR;
@@ -588,28 +624,28 @@ cg6_init_fix(struct fb_info *info, int linebytes)
 }
 
 /* Initialize Brooktree DAC */
-static void cg6_bt_init(struct cg6_par *par)
+static void __devinit cg6_bt_init(struct cg6_par *par)
 {
         struct bt_regs __iomem *bt = par->bt;
 
-        sbus_writel(0x04 << 24, &bt->addr);         /* color planes */
+        sbus_writel(0x04 << 24, &bt->addr);      /* color planes */
         sbus_writel(0xff << 24, &bt->control);
         sbus_writel(0x05 << 24, &bt->addr);
         sbus_writel(0x00 << 24, &bt->control);
-        sbus_writel(0x06 << 24, &bt->addr);         /* overlay plane */
+        sbus_writel(0x06 << 24, &bt->addr);      /* overlay plane */
         sbus_writel(0x73 << 24, &bt->control);
         sbus_writel(0x07 << 24, &bt->addr);
         sbus_writel(0x00 << 24, &bt->control);
 }
 
-static void cg6_chip_init(struct fb_info *info)
+static void __devinit cg6_chip_init(struct fb_info *info)
 {
-        struct cg6_par *par = (struct cg6_par *) info->par;
+        struct cg6_par *par = (struct cg6_par *)info->par;
         struct cg6_tec __iomem *tec = par->tec;
         struct cg6_fbc __iomem *fbc = par->fbc;
         u32 rev, conf, mode;
         int i;
-        
+
         /* Turn off stuff in the Transform Engine. */
         sbus_writel(0, &tec->tec_matrix);
         sbus_writel(0, &tec->tec_clip);
@@ -635,13 +671,13 @@ static void cg6_chip_init(struct fb_info *info)
                 i = sbus_readl(&fbc->s);
         } while (i & 0x10000000);
         mode &= ~(CG6_FBC_BLIT_MASK | CG6_FBC_MODE_MASK |
-                       CG6_FBC_DRAW_MASK | CG6_FBC_BWRITE0_MASK |
-                       CG6_FBC_BWRITE1_MASK | CG6_FBC_BREAD_MASK |
-                       CG6_FBC_BDISP_MASK);
+                  CG6_FBC_DRAW_MASK | CG6_FBC_BWRITE0_MASK |
+                  CG6_FBC_BWRITE1_MASK | CG6_FBC_BREAD_MASK |
+                  CG6_FBC_BDISP_MASK);
         mode |= (CG6_FBC_BLIT_SRC | CG6_FBC_MODE_COLOR8 |
-                      CG6_FBC_DRAW_RENDER | CG6_FBC_BWRITE0_ENABLE |
-                      CG6_FBC_BWRITE1_DISABLE | CG6_FBC_BREAD_0 |
-                      CG6_FBC_BDISP_0);
+                 CG6_FBC_DRAW_RENDER | CG6_FBC_BWRITE0_ENABLE |
+                 CG6_FBC_BWRITE1_DISABLE | CG6_FBC_BREAD_0 |
+                 CG6_FBC_BDISP_0);
         sbus_writel(mode, &fbc->mode);
 
         sbus_writel(0, &fbc->clip);
@@ -671,7 +707,8 @@ static void cg6_unmap_regs(struct of_device *op, struct fb_info *info,
                 of_iounmap(&op->resource[0], info->screen_base, par->fbsize);
 }
 
-static int __devinit cg6_probe(struct of_device *op, const struct of_device_id *match)
+static int __devinit cg6_probe(struct of_device *op,
+                                const struct of_device_id *match)
 {
         struct device_node *dp = op->node;
         struct fb_info *info;
@@ -705,22 +742,23 @@ static int __devinit cg6_probe(struct of_device *op, const struct of_device_id *
                 par->fbsize *= 4;
 
         par->fbc = of_ioremap(&op->resource[0], CG6_FBC_OFFSET,
-                                  4096, "cgsix fbc");
+                                4096, "cgsix fbc");
         par->tec = of_ioremap(&op->resource[0], CG6_TEC_OFFSET,
-                                  sizeof(struct cg6_tec), "cgsix tec");
+                                sizeof(struct cg6_tec), "cgsix tec");
         par->thc = of_ioremap(&op->resource[0], CG6_THC_OFFSET,
-                                  sizeof(struct cg6_thc), "cgsix thc");
+                                sizeof(struct cg6_thc), "cgsix thc");
         par->bt = of_ioremap(&op->resource[0], CG6_BROOKTREE_OFFSET,
-                                 sizeof(struct bt_regs), "cgsix dac");
+                                sizeof(struct bt_regs), "cgsix dac");
         par->fhc = of_ioremap(&op->resource[0], CG6_FHC_OFFSET,
-                                  sizeof(u32), "cgsix fhc");
+                                sizeof(u32), "cgsix fhc");
 
         info->flags = FBINFO_DEFAULT | FBINFO_HWACCEL_IMAGEBLIT |
-                          FBINFO_HWACCEL_COPYAREA | FBINFO_HWACCEL_FILLRECT;
+                        FBINFO_HWACCEL_COPYAREA | FBINFO_HWACCEL_FILLRECT |
+                        FBINFO_READS_FAST;
         info->fbops = &cg6_ops;
 
-        info->screen_base =  of_ioremap(&op->resource[0], CG6_RAM_OFFSET,
-                                            par->fbsize, "cgsix ram");
+        info->screen_base = of_ioremap(&op->resource[0], CG6_RAM_OFFSET,
+                                        par->fbsize, "cgsix ram");
         if (!par->fbc || !par->tec || !par->thc ||
             !par->bt || !par->fhc || !info->screen_base)
                 goto out_unmap_regs;
diff --git a/drivers/video/ffb.c b/drivers/video/ffb.c
index 4b520b573911..d7e24889650e 100644
--- a/drivers/video/ffb.c
+++ b/drivers/video/ffb.c
@@ -171,17 +171,17 @@ static struct fb_ops ffb_ops = {
 #define FFB_PPC_CS_VAR          0x000002
 #define FFB_PPC_CS_CONST        0x000003
 
-#define FFB_ROP_NEW                  0x83
-#define FFB_ROP_OLD                  0x85
-#define FFB_ROP_NEW_XOR_OLD          0x86
-
-#define FFB_UCSR_FIFO_MASK     0x00000fff
-#define FFB_UCSR_FB_BUSY       0x01000000
-#define FFB_UCSR_RP_BUSY       0x02000000
-#define FFB_UCSR_ALL_BUSY      (FFB_UCSR_RP_BUSY|FFB_UCSR_FB_BUSY)
-#define FFB_UCSR_READ_ERR      0x40000000
-#define FFB_UCSR_FIFO_OVFL     0x80000000
-#define FFB_UCSR_ALL_ERRORS    (FFB_UCSR_READ_ERR|FFB_UCSR_FIFO_OVFL)
+#define FFB_ROP_NEW             0x83
+#define FFB_ROP_OLD             0x85
+#define FFB_ROP_NEW_XOR_OLD     0x86
+
+#define FFB_UCSR_FIFO_MASK      0x00000fff
+#define FFB_UCSR_FB_BUSY        0x01000000
+#define FFB_UCSR_RP_BUSY        0x02000000
+#define FFB_UCSR_ALL_BUSY       (FFB_UCSR_RP_BUSY|FFB_UCSR_FB_BUSY)
+#define FFB_UCSR_READ_ERR       0x40000000
+#define FFB_UCSR_FIFO_OVFL      0x80000000
+#define FFB_UCSR_ALL_ERRORS     (FFB_UCSR_READ_ERR|FFB_UCSR_FIFO_OVFL)
 
 struct ffb_fbc {
         /* Next vertex registers */
@@ -197,7 +197,7 @@ struct ffb_fbc {
         u32     ryf;
         u32     rxf;
         u32     xxx3[2];
-        
+
         u32     dmyf;
         u32     dmxf;
         u32     xxx4[2];
@@ -211,13 +211,13 @@ struct ffb_fbc {
         u32     bh;
         u32     bw;
         u32     xxx6[2];
-        
+
         u32     xxx7[32];
-        
+
         /* Setup unit vertex state register */
         u32     suvtx;
         u32     xxx8[63];
-        
+
         /* Control registers */
         u32     ppc;
         u32     wid;
@@ -235,7 +235,7 @@ struct ffb_fbc {
         u32     dcsb;
         u32     dczf;
         u32     dczb;
-        
+
         u32     xxx9;
         u32     blendc;
         u32     blendc1;
@@ -252,7 +252,7 @@ struct ffb_fbc {
         u32     fbcfg1;
         u32     fbcfg2;
         u32     fbcfg3;
-        
+
         u32     ppcfg;
         u32     pick;
         u32     fillmode;
@@ -269,7 +269,7 @@ struct ffb_fbc {
         u32     clip2max;
         u32     clip3min;
         u32     clip3max;
-        
+
         /* New 3dRAM III support regs */
         u32     rawblend2;
         u32     rawpreblend;
@@ -287,7 +287,7 @@ struct ffb_fbc {
         u32     rawcmp;
         u32     rawwac;
         u32     fbramid;
-        
+
         u32     drawop;
         u32     xxx10[2];
         u32     fontlpat;
@@ -302,7 +302,7 @@ struct ffb_fbc {
         u32     stencil;
         u32     stencilctl;
 
-        u32     xxx13[4];       
+        u32     xxx13[4];
         u32     dcss1;
         u32     dcss2;
         u32     dcss3;
@@ -315,17 +315,17 @@ struct ffb_fbc {
         u32     dcd3;
         u32     dcd4;
         u32     xxx15;
-        
+
         u32     pattern[32];
-        
+
         u32     xxx16[256];
-        
+
         u32     devid;
         u32     xxx17[63];
-        
+
         u32     ucsr;
         u32     xxx18[31];
-        
+
         u32     mer;
 };
 
@@ -336,20 +336,20 @@ struct ffb_dac {
         u32     value2;
 };
 
-#define FFB_DAC_UCTRL   0x1001 /* User Control */
-#define  FFB_DAC_UCTRL_MANREV   0x00000f00 /* 4-bit Manufacturing Revision */
-#define  FFB_DAC_UCTRL_MANREV_SHIFT 8
-#define FFB_DAC_TGEN    0x6000 /* Timing Generator */
-#define  FFB_DAC_TGEN_VIDE      0x00000001 /* Video Enable */
-#define FFB_DAC_DID     0x8000 /* Device Identification */
-#define  FFB_DAC_DID_PNUM       0x0ffff000 /* Device Part Number */
-#define  FFB_DAC_DID_PNUM_SHIFT 12
-#define  FFB_DAC_DID_REV        0xf0000000 /* Device Revision */
-#define  FFB_DAC_DID_REV_SHIFT 28
+#define FFB_DAC_UCTRL           0x1001 /* User Control */
+#define FFB_DAC_UCTRL_MANREV    0x00000f00 /* 4-bit Manufacturing Revision */
+#define FFB_DAC_UCTRL_MANREV_SHIFT 8
+#define FFB_DAC_TGEN            0x6000 /* Timing Generator */
+#define FFB_DAC_TGEN_VIDE       0x00000001 /* Video Enable */
+#define FFB_DAC_DID             0x8000 /* Device Identification */
+#define FFB_DAC_DID_PNUM        0x0ffff000 /* Device Part Number */
+#define FFB_DAC_DID_PNUM_SHIFT  12
+#define FFB_DAC_DID_REV         0xf0000000 /* Device Revision */
+#define FFB_DAC_DID_REV_SHIFT   28
 
 #define FFB_DAC_CUR_CTRL        0x100
-#define  FFB_DAC_CUR_CTRL_P0    0x00000001
-#define  FFB_DAC_CUR_CTRL_P1    0x00000002
+#define FFB_DAC_CUR_CTRL_P0     0x00000001
+#define FFB_DAC_CUR_CTRL_P1     0x00000002
 
 struct ffb_par {
         spinlock_t              lock;
@@ -382,7 +382,9 @@ static void FFBFifo(struct ffb_par *par, int n)
 
         if (cache - n < 0) {
                 fbc = par->fbc;
-                do {    cache = (upa_readl(&fbc->ucsr) & FFB_UCSR_FIFO_MASK) - 8;
+                do {
+                        cache = (upa_readl(&fbc->ucsr) & FFB_UCSR_FIFO_MASK);
+                        cache -= 8;
                 } while (cache - n < 0);
         }
         par->fifo_cache = cache - n;
@@ -401,12 +403,12 @@ static void FFBWait(struct ffb_par *par)
                         upa_writel(FFB_UCSR_ALL_ERRORS, &fbc->ucsr);
                 }
                 udelay(10);
-        } while(--limit > 0);
+        } while (--limit > 0);
 }
 
 static int ffb_sync(struct fb_info *p)
 {
-        struct ffb_par *par = (struct ffb_par *) p->par;
+        struct ffb_par *par = (struct ffb_par *)p->par;
 
         FFBWait(par);
         return 0;
@@ -431,8 +433,8 @@ static void ffb_switch_from_graph(struct ffb_par *par)
         FFBWait(par);
         par->fifo_cache = 0;
         FFBFifo(par, 7);
-        upa_writel(FFB_PPC_VCE_DISABLE|FFB_PPC_TBE_OPAQUE|
-                   FFB_PPC_APE_DISABLE|FFB_PPC_CS_CONST,
+        upa_writel(FFB_PPC_VCE_DISABLE | FFB_PPC_TBE_OPAQUE |
+                   FFB_PPC_APE_DISABLE | FFB_PPC_CS_CONST,
                    &fbc->ppc);
         upa_writel(0x2000707f, &fbc->fbc);
         upa_writel(par->rop_cache, &fbc->rop);
@@ -455,7 +457,7 @@ static void ffb_switch_from_graph(struct ffb_par *par)
 
 static int ffb_pan_display(struct fb_var_screeninfo *var, struct fb_info *info)
 {
-        struct ffb_par *par = (struct ffb_par *) info->par;
+        struct ffb_par *par = (struct ffb_par *)info->par;
 
         /* We just use this to catch switches out of
          * graphics mode.
@@ -468,16 +470,14 @@ static int ffb_pan_display(struct fb_var_screeninfo *var, struct fb_info *info)
 }
 
 /**
- *      ffb_fillrect - REQUIRED function. Can use generic routines if 
- *                     non acclerated hardware and packed pixel based.
- *                     Draws a rectangle on the screen.               
+ *      ffb_fillrect - Draws a rectangle on the screen.
  *
- *      @info: frame buffer structure that represents a single frame buffer
- *      @rect: structure defining the rectagle and operation.
+ *      @info: frame buffer structure that represents a single frame buffer
+ *      @rect: structure defining the rectagle and operation.
  */
 static void ffb_fillrect(struct fb_info *info, const struct fb_fillrect *rect)
 {
-        struct ffb_par *par = (struct ffb_par *) info->par;
+        struct ffb_par *par = (struct ffb_par *)info->par;
         struct ffb_fbc __iomem *fbc = par->fbc;
         unsigned long flags;
         u32 fg;
@@ -494,9 +494,9 @@ static void ffb_fillrect(struct fb_info *info, const struct fb_fillrect *rect)
                 par->fg_cache = fg;
         }
 
-        ffb_rop(par, (rect->rop == ROP_COPY ?
-                      FFB_ROP_NEW :
-                      FFB_ROP_NEW_XOR_OLD));
+        ffb_rop(par, rect->rop == ROP_COPY ?
+                     FFB_ROP_NEW :
+                     FFB_ROP_NEW_XOR_OLD);
 
         FFBFifo(par, 5);
         upa_writel(FFB_DRAWOP_RECTANGLE, &fbc->drawop);
@@ -509,18 +509,15 @@ static void ffb_fillrect(struct fb_info *info, const struct fb_fillrect *rect)
 }
 
 /**
- *      ffb_copyarea - REQUIRED function. Can use generic routines if
- *                     non acclerated hardware and packed pixel based.
- *                     Copies on area of the screen to another area.
+ *      ffb_copyarea - Copies on area of the screen to another area.
  *
- *      @info: frame buffer structure that represents a single frame buffer
- *      @area: structure defining the source and destination.
+ *      @info: frame buffer structure that represents a single frame buffer
+ *      @area: structure defining the source and destination.
  */
 
-static void
-ffb_copyarea(struct fb_info *info, const struct fb_copyarea *area) 
+static void ffb_copyarea(struct fb_info *info, const struct fb_copyarea *area)
 {
-        struct ffb_par *par = (struct ffb_par *) info->par;
+        struct ffb_par *par = (struct ffb_par *)info->par;
         struct ffb_fbc __iomem *fbc = par->fbc;
         unsigned long flags;
 
@@ -547,16 +544,14 @@ ffb_copyarea(struct fb_info *info, const struct fb_copyarea *area)
 }
 
 /**
- *      ffb_imageblit - REQUIRED function. Can use generic routines if
- *                      non acclerated hardware and packed pixel based.
- *                      Copies a image from system memory to the screen. 
+ *      ffb_imageblit - Copies a image from system memory to the screen.
  *
- *      @info: frame buffer structure that represents a single frame buffer
- *      @image: structure defining the image.
+ *      @info: frame buffer structure that represents a single frame buffer
+ *      @image: structure defining the image.
  */
 static void ffb_imageblit(struct fb_info *info, const struct fb_image *image)
 {
-        struct ffb_par *par = (struct ffb_par *) info->par;
+        struct ffb_par *par = (struct ffb_par *)info->par;
         struct ffb_fbc __iomem *fbc = par->fbc;
         const u8 *data = image->data;
         unsigned long flags;
@@ -644,13 +639,14 @@ static void ffb_fixup_var_rgb(struct fb_var_screeninfo *var)
 }
 
 /**
- *      ffb_setcolreg - Optional function. Sets a color register.
- *      @regno: boolean, 0 copy local, 1 get_user() function
- *      @red: frame buffer colormap structure
- *      @green: The green value which can be up to 16 bits wide
- *      @blue:  The blue value which can be up to 16 bits wide.
- *      @transp: If supported the alpha value which can be up to 16 bits wide.
- *      @info: frame buffer info structure
+ *      ffb_setcolreg - Sets a color register.
+ *
+ *      @regno: boolean, 0 copy local, 1 get_user() function
+ *      @red: frame buffer colormap structure
+ *      @green: The green value which can be up to 16 bits wide
+ *      @blue:  The blue value which can be up to 16 bits wide.
+ *      @transp: If supported the alpha value which can be up to 16 bits wide.
+ *      @info: frame buffer info structure
  */
 static int ffb_setcolreg(unsigned regno,
                          unsigned red, unsigned green, unsigned blue,
@@ -672,14 +668,13 @@ static int ffb_setcolreg(unsigned regno,
 }
 
 /**
- *      ffb_blank - Optional function.  Blanks the display.
- *      @blank_mode: the blank mode we want.
- *      @info: frame buffer structure that represents a single frame buffer
+ *      ffb_blank - Optional function.  Blanks the display.
+ *      @blank_mode: the blank mode we want.
+ *      @info: frame buffer structure that represents a single frame buffer
  */
-static int
-ffb_blank(int blank, struct fb_info *info)
+static int ffb_blank(int blank, struct fb_info *info)
 {
-        struct ffb_par *par = (struct ffb_par *) info->par;
+        struct ffb_par *par = (struct ffb_par *)info->par;
         struct ffb_dac __iomem *dac = par->dac;
         unsigned long flags;
         u32 val;
@@ -867,7 +862,7 @@ static int ffb_mmap(struct fb_info *info, struct vm_area_struct *vma)
 
 static int ffb_ioctl(struct fb_info *info, unsigned int cmd, unsigned long arg)
 {
-        struct ffb_par *par = (struct ffb_par *) info->par;
+        struct ffb_par *par = (struct ffb_par *)info->par;
 
         return sbusfb_ioctl_helper(cmd, arg, info,
                                    FBTYPE_CREATOR, 24, par->fbsize);
@@ -877,8 +872,7 @@ static int ffb_ioctl(struct fb_info *info, unsigned int cmd, unsigned long arg)
  *  Initialisation
  */
 
-static void
-ffb_init_fix(struct fb_info *info)
+static void ffb_init_fix(struct fb_info *info)
 {
         struct ffb_par *par = (struct ffb_par *)info->par;
         const char *ffb_type_name;
@@ -902,7 +896,8 @@ ffb_init_fix(struct fb_info *info)
         info->fix.accel = FB_ACCEL_SUN_CREATOR;
 }
 
-static int __devinit ffb_probe(struct of_device *op, const struct of_device_id *match)
+static int __devinit ffb_probe(struct of_device *op,
+                               const struct of_device_id *match)
 {
         struct device_node *dp = op->node;
         struct ffb_fbc __iomem *fbc;