fbdev: move FBIO_WAITFORVSYNC to linux/fb.h
[safe/jmp/linux-2.6] / drivers / video / offb.c
index 42a6591..46dda7d 100644 (file)
  *  more details.
  */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/mm.h>
-#include <linux/tty.h>
-#include <linux/slab.h>
 #include <linux/vmalloc.h>
 #include <linux/delay.h>
 #include <linux/interrupt.h>
 #include <linux/fb.h>
 #include <linux/init.h>
 #include <linux/ioport.h>
+#include <linux/pci.h>
 #include <asm/io.h>
 #include <asm/prom.h>
 
@@ -48,6 +46,7 @@ enum {
        cmap_M3B,               /* ATI Rage Mobility M3 Head B */
        cmap_radeon,            /* ATI Radeon */
        cmap_gxt2000,           /* IBM GXT2000 */
+       cmap_avivo,             /* ATI R5xx */
 };
 
 struct offb_par {
@@ -59,34 +58,36 @@ struct offb_par {
 
 struct offb_par default_par;
 
-    /*
-     *  Interface used by the world
-     */
-
-int offb_init(void);
-
-static int offb_setcolreg(u_int regno, u_int red, u_int green, u_int blue,
-                         u_int transp, struct fb_info *info);
-static int offb_blank(int blank, struct fb_info *info);
-
 #ifdef CONFIG_PPC32
 extern boot_infos_t *boot_infos;
 #endif
 
-static void offb_init_nodriver(struct device_node *);
-static void offb_init_fb(const char *name, const char *full_name,
-                        int width, int height, int depth, int pitch,
-                        unsigned long address, struct device_node *dp);
-
-static struct fb_ops offb_ops = {
-       .owner          = THIS_MODULE,
-       .fb_setcolreg   = offb_setcolreg,
-       .fb_blank       = offb_blank,
-       .fb_fillrect    = cfb_fillrect,
-       .fb_copyarea    = cfb_copyarea,
-       .fb_imageblit   = cfb_imageblit,
-       .fb_cursor      = soft_cursor,
-};
+/* Definitions used by the Avivo palette hack */
+#define AVIVO_DC_LUT_RW_SELECT                  0x6480
+#define AVIVO_DC_LUT_RW_MODE                    0x6484
+#define AVIVO_DC_LUT_RW_INDEX                   0x6488
+#define AVIVO_DC_LUT_SEQ_COLOR                  0x648c
+#define AVIVO_DC_LUT_PWL_DATA                   0x6490
+#define AVIVO_DC_LUT_30_COLOR                   0x6494
+#define AVIVO_DC_LUT_READ_PIPE_SELECT           0x6498
+#define AVIVO_DC_LUT_WRITE_EN_MASK              0x649c
+#define AVIVO_DC_LUT_AUTOFILL                   0x64a0
+
+#define AVIVO_DC_LUTA_CONTROL                   0x64c0
+#define AVIVO_DC_LUTA_BLACK_OFFSET_BLUE         0x64c4
+#define AVIVO_DC_LUTA_BLACK_OFFSET_GREEN        0x64c8
+#define AVIVO_DC_LUTA_BLACK_OFFSET_RED          0x64cc
+#define AVIVO_DC_LUTA_WHITE_OFFSET_BLUE         0x64d0
+#define AVIVO_DC_LUTA_WHITE_OFFSET_GREEN        0x64d4
+#define AVIVO_DC_LUTA_WHITE_OFFSET_RED          0x64d8
+
+#define AVIVO_DC_LUTB_CONTROL                   0x6cc0
+#define AVIVO_DC_LUTB_BLACK_OFFSET_BLUE         0x6cc4
+#define AVIVO_DC_LUTB_BLACK_OFFSET_GREEN        0x6cc8
+#define AVIVO_DC_LUTB_BLACK_OFFSET_RED          0x6ccc
+#define AVIVO_DC_LUTB_WHITE_OFFSET_BLUE         0x6cd0
+#define AVIVO_DC_LUTB_WHITE_OFFSET_GREEN        0x6cd4
+#define AVIVO_DC_LUTB_WHITE_OFFSET_RED          0x6cd8
 
     /*
      *  Set a single color register. The values supplied are already
@@ -98,14 +99,43 @@ static int offb_setcolreg(u_int regno, u_int red, u_int green, u_int blue,
                          u_int transp, struct fb_info *info)
 {
        struct offb_par *par = (struct offb_par *) info->par;
+       int i, depth;
+       u32 *pal = info->pseudo_palette;
 
-       if (!par->cmap_adr || regno > 255)
+       depth = info->var.bits_per_pixel;
+       if (depth == 16)
+               depth = (info->var.green.length == 5) ? 15 : 16;
+
+       if (regno > 255 ||
+           (depth == 16 && regno > 63) ||
+           (depth == 15 && regno > 31))
                return 1;
 
+       if (regno < 16) {
+               switch (depth) {
+               case 15:
+                       pal[regno] = (regno << 10) | (regno << 5) | regno;
+                       break;
+               case 16:
+                       pal[regno] = (regno << 11) | (regno << 5) | regno;
+                       break;
+               case 24:
+                       pal[regno] = (regno << 16) | (regno << 8) | regno;
+                       break;
+               case 32:
+                       i = (regno << 8) | regno;
+                       pal[regno] = (i << 16) | i;
+                       break;
+               }
+       }
+
        red >>= 8;
        green >>= 8;
        blue >>= 8;
 
+       if (!par->cmap_adr)
+               return 0;
+
        switch (par->cmap_type) {
        case cmap_m64:
                writeb(regno, par->cmap_adr);
@@ -137,25 +167,22 @@ static int offb_setcolreg(u_int regno, u_int red, u_int green, u_int blue,
                out_le32(par->cmap_adr + 0xb4, (red << 16 | green << 8 | blue));
                break;
        case cmap_gxt2000:
-               out_le32((unsigned __iomem *) par->cmap_adr + regno,
+               out_le32(((unsigned __iomem *) par->cmap_adr) + regno,
                         (red << 16 | green << 8 | blue));
                break;
+       case cmap_avivo:
+               /* Write to both LUTs for now */
+               writel(1, par->cmap_adr + AVIVO_DC_LUT_RW_SELECT);
+               writeb(regno, par->cmap_adr + AVIVO_DC_LUT_RW_INDEX);
+               writel(((red) << 22) | ((green) << 12) | ((blue) << 2),
+                      par->cmap_adr + AVIVO_DC_LUT_30_COLOR);
+               writel(0, par->cmap_adr + AVIVO_DC_LUT_RW_SELECT);
+               writeb(regno, par->cmap_adr + AVIVO_DC_LUT_RW_INDEX);
+               writel(((red) << 22) | ((green) << 12) | ((blue) << 2),
+                      par->cmap_adr + AVIVO_DC_LUT_30_COLOR);
+               break;
        }
 
-       if (regno < 16)
-               switch (info->var.bits_per_pixel) {
-               case 16:
-                       ((u16 *) (info->pseudo_palette))[regno] =
-                           (regno << 10) | (regno << 5) | regno;
-                       break;
-               case 32:
-                       {
-                               int i = (regno << 8) | regno;
-                               ((u32 *) (info->pseudo_palette))[regno] =
-                                   (i << 16) | i;
-                               break;
-                       }
-               }
        return 0;
 }
 
@@ -207,186 +234,158 @@ static int offb_blank(int blank, struct fb_info *info)
                                out_le32(par->cmap_adr + 0xb4, 0);
                                break;
                        case cmap_gxt2000:
-                               out_le32((unsigned __iomem *) par->cmap_adr + i,
+                               out_le32(((unsigned __iomem *) par->cmap_adr) + i,
                                         0);
                                break;
+                       case cmap_avivo:
+                               writel(1, par->cmap_adr + AVIVO_DC_LUT_RW_SELECT);
+                               writeb(i, par->cmap_adr + AVIVO_DC_LUT_RW_INDEX);
+                               writel(0, par->cmap_adr + AVIVO_DC_LUT_30_COLOR);
+                               writel(0, par->cmap_adr + AVIVO_DC_LUT_RW_SELECT);
+                               writeb(i, par->cmap_adr + AVIVO_DC_LUT_RW_INDEX);
+                               writel(0, par->cmap_adr + AVIVO_DC_LUT_30_COLOR);
+                               break;
                        }
        } else
                fb_set_cmap(&info->cmap, info);
        return 0;
 }
 
-    /*
-     *  Initialisation
-     */
-
-int __init offb_init(void)
+static int offb_set_par(struct fb_info *info)
 {
-       struct device_node *dp = NULL, *boot_disp = NULL;
-#if defined(CONFIG_BOOTX_TEXT) && defined(CONFIG_PPC32)
-       struct device_node *macos_display = NULL;
-#endif
-       if (fb_get_options("offb", NULL))
-               return -ENODEV;
-
-#if defined(CONFIG_BOOTX_TEXT) && defined(CONFIG_PPC32)
-       /* If we're booted from BootX... */
-       if (boot_infos != 0) {
-               unsigned long addr =
-                   (unsigned long) boot_infos->dispDeviceBase;
-               /* find the device node corresponding to the macos display */
-               while ((dp = of_find_node_by_type(dp, "display"))) {
-                       int i;
-                       /*
-                        * Grrr...  It looks like the MacOS ATI driver
-                        * munges the assigned-addresses property (but
-                        * the AAPL,address value is OK).
-                        */
-                       if (strncmp(dp->name, "ATY,", 4) == 0
-                           && dp->n_addrs == 1) {
-                               unsigned int *ap =
-                                   (unsigned int *) get_property(dp,
-                                                                 "AAPL,address",
-                                                                 NULL);
-                               if (ap != NULL) {
-                                       dp->addrs[0].address = *ap;
-                                       dp->addrs[0].size = 0x01000000;
-                               }
-                       }
-
-                       /*
-                        * The LTPro on the Lombard powerbook has no addresses
-                        * on the display nodes, they are on their parent.
-                        */
-                       if (dp->n_addrs == 0
-                           && device_is_compatible(dp, "ATY,264LTPro")) {
-                               int na;
-                               unsigned int *ap = (unsigned int *)
-                                   get_property(dp, "AAPL,address", &na);
-                               if (ap != 0)
-                                       for (na /= sizeof(unsigned int);
-                                            na > 0; --na, ++ap)
-                                               if (*ap <= addr
-                                                   && addr <
-                                                   *ap + 0x1000000)
-                                                       goto foundit;
-                       }
-
-                       /*
-                        * See if the display address is in one of the address
-                        * ranges for this display.
-                        */
-                       for (i = 0; i < dp->n_addrs; ++i) {
-                               if (dp->addrs[i].address <= addr
-                                   && addr <
-                                   dp->addrs[i].address +
-                                   dp->addrs[i].size)
-                                       break;
-                       }
-                       if (i < dp->n_addrs) {
-                             foundit:
-                               printk(KERN_INFO "MacOS display is %s\n",
-                                      dp->full_name);
-                               macos_display = dp;
-                               break;
-                       }
-               }
-
-               /* initialize it */
-               offb_init_fb(macos_display ? macos_display->
-                            name : "MacOS display",
-                            macos_display ? macos_display->
-                            full_name : "MacOS display",
-                            boot_infos->dispDeviceRect[2],
-                            boot_infos->dispDeviceRect[3],
-                            boot_infos->dispDeviceDepth,
-                            boot_infos->dispDeviceRowBytes, addr, NULL);
-       }
-#endif /* defined(CONFIG_BOOTX_TEXT) && defined(CONFIG_PPC32) */
+       struct offb_par *par = (struct offb_par *) info->par;
 
-       for (dp = NULL; (dp = of_find_node_by_type(dp, "display"));) {
-               if (get_property(dp, "linux,opened", NULL) &&
-                   get_property(dp, "linux,boot-display", NULL)) {
-                       boot_disp = dp;
-                       offb_init_nodriver(dp);
-               }
-       }
-       for (dp = NULL; (dp = of_find_node_by_type(dp, "display"));) {
-               if (get_property(dp, "linux,opened", NULL) &&
-                   dp != boot_disp)
-                       offb_init_nodriver(dp);
+       /* On avivo, initialize palette control */
+       if (par->cmap_type == cmap_avivo) {
+               writel(0, par->cmap_adr + AVIVO_DC_LUTA_CONTROL);
+               writel(0, par->cmap_adr + AVIVO_DC_LUTA_BLACK_OFFSET_BLUE);
+               writel(0, par->cmap_adr + AVIVO_DC_LUTA_BLACK_OFFSET_GREEN);
+               writel(0, par->cmap_adr + AVIVO_DC_LUTA_BLACK_OFFSET_RED);
+               writel(0x0000ffff, par->cmap_adr + AVIVO_DC_LUTA_WHITE_OFFSET_BLUE);
+               writel(0x0000ffff, par->cmap_adr + AVIVO_DC_LUTA_WHITE_OFFSET_GREEN);
+               writel(0x0000ffff, par->cmap_adr + AVIVO_DC_LUTA_WHITE_OFFSET_RED);
+               writel(0, par->cmap_adr + AVIVO_DC_LUTB_CONTROL);
+               writel(0, par->cmap_adr + AVIVO_DC_LUTB_BLACK_OFFSET_BLUE);
+               writel(0, par->cmap_adr + AVIVO_DC_LUTB_BLACK_OFFSET_GREEN);
+               writel(0, par->cmap_adr + AVIVO_DC_LUTB_BLACK_OFFSET_RED);
+               writel(0x0000ffff, par->cmap_adr + AVIVO_DC_LUTB_WHITE_OFFSET_BLUE);
+               writel(0x0000ffff, par->cmap_adr + AVIVO_DC_LUTB_WHITE_OFFSET_GREEN);
+               writel(0x0000ffff, par->cmap_adr + AVIVO_DC_LUTB_WHITE_OFFSET_RED);
+               writel(1, par->cmap_adr + AVIVO_DC_LUT_RW_SELECT);
+               writel(0, par->cmap_adr + AVIVO_DC_LUT_RW_MODE);
+               writel(0x0000003f, par->cmap_adr + AVIVO_DC_LUT_WRITE_EN_MASK);
+               writel(0, par->cmap_adr + AVIVO_DC_LUT_RW_SELECT);
+               writel(0, par->cmap_adr + AVIVO_DC_LUT_RW_MODE);
+               writel(0x0000003f, par->cmap_adr + AVIVO_DC_LUT_WRITE_EN_MASK);
        }
-
        return 0;
 }
 
-
-static void __init offb_init_nodriver(struct device_node *dp)
+static void offb_destroy(struct fb_info *info)
 {
-       int *pp, i;
-       unsigned int len;
-       int width = 640, height = 480, depth = 8, pitch;
-       unsigned *up;
-       unsigned long address;
+       if (info->screen_base)
+               iounmap(info->screen_base);
+       release_mem_region(info->apertures->ranges[0].base, info->apertures->ranges[0].size);
+       framebuffer_release(info);
+}
 
-       if ((pp = (int *) get_property(dp, "depth", &len)) != NULL
-           && len == sizeof(int))
-               depth = *pp;
-       if ((pp = (int *) get_property(dp, "width", &len)) != NULL
-           && len == sizeof(int))
-               width = *pp;
-       if ((pp = (int *) get_property(dp, "height", &len)) != NULL
-           && len == sizeof(int))
-               height = *pp;
-       if ((pp = (int *) get_property(dp, "linebytes", &len)) != NULL
-           && len == sizeof(int)) {
-               pitch = *pp;
-               if (pitch == 1)
-                       pitch = 0x1000;
-       } else
-               pitch = width;
-       if ((up = (unsigned *) get_property(dp, "address", &len)) != NULL
-           && len == sizeof(unsigned))
-               address = (u_long) * up;
-       else {
-               for (i = 0; i < dp->n_addrs; ++i)
-                       if (dp->addrs[i].size >=
-                           pitch * height * depth / 8)
-                               break;
-               if (i >= dp->n_addrs) {
-                       printk(KERN_ERR
-                              "no framebuffer address found for %s\n",
-                              dp->full_name);
-                       return;
-               }
+static struct fb_ops offb_ops = {
+       .owner          = THIS_MODULE,
+       .fb_destroy     = offb_destroy,
+       .fb_setcolreg   = offb_setcolreg,
+       .fb_set_par     = offb_set_par,
+       .fb_blank       = offb_blank,
+       .fb_fillrect    = cfb_fillrect,
+       .fb_copyarea    = cfb_copyarea,
+       .fb_imageblit   = cfb_imageblit,
+};
 
-               address = (u_long) dp->addrs[i].address;
+static void __iomem *offb_map_reg(struct device_node *np, int index,
+                                 unsigned long offset, unsigned long size)
+{
+       const u32 *addrp;
+       u64 asize, taddr;
+       unsigned int flags;
+
+       addrp = of_get_pci_address(np, index, &asize, &flags);
+       if (addrp == NULL)
+               addrp = of_get_address(np, index, &asize, &flags);
+       if (addrp == NULL)
+               return NULL;
+       if ((flags & (IORESOURCE_IO | IORESOURCE_MEM)) == 0)
+               return NULL;
+       if ((offset + size) > asize)
+               return NULL;
+       taddr = of_translate_address(np, addrp);
+       if (taddr == OF_BAD_ADDR)
+               return NULL;
+       return ioremap(taddr + offset, size);
+}
 
-#ifdef CONFIG_PPC64
-               address += dp->phb->pci_mem_offset;
-#endif
+static void offb_init_palette_hacks(struct fb_info *info, struct device_node *dp,
+                                   const char *name, unsigned long address)
+{
+       struct offb_par *par = (struct offb_par *) info->par;
 
-               /* kludge for valkyrie */
-               if (strcmp(dp->name, "valkyrie") == 0)
-                       address += 0x1000;
+       if (dp && !strncmp(name, "ATY,Rage128", 11)) {
+               par->cmap_adr = offb_map_reg(dp, 2, 0, 0x1fff);
+               if (par->cmap_adr)
+                       par->cmap_type = cmap_r128;
+       } else if (dp && (!strncmp(name, "ATY,RageM3pA", 12)
+                         || !strncmp(name, "ATY,RageM3p12A", 14))) {
+               par->cmap_adr = offb_map_reg(dp, 2, 0, 0x1fff);
+               if (par->cmap_adr)
+                       par->cmap_type = cmap_M3A;
+       } else if (dp && !strncmp(name, "ATY,RageM3pB", 12)) {
+               par->cmap_adr = offb_map_reg(dp, 2, 0, 0x1fff);
+               if (par->cmap_adr)
+                       par->cmap_type = cmap_M3B;
+       } else if (dp && !strncmp(name, "ATY,Rage6", 9)) {
+               par->cmap_adr = offb_map_reg(dp, 1, 0, 0x1fff);
+               if (par->cmap_adr)
+                       par->cmap_type = cmap_radeon;
+       } else if (!strncmp(name, "ATY,", 4)) {
+               unsigned long base = address & 0xff000000UL;
+               par->cmap_adr =
+                       ioremap(base + 0x7ff000, 0x1000) + 0xcc0;
+               par->cmap_data = par->cmap_adr + 1;
+               par->cmap_type = cmap_m64;
+       } else if (dp && (of_device_is_compatible(dp, "pci1014,b7") ||
+                         of_device_is_compatible(dp, "pci1014,21c"))) {
+               par->cmap_adr = offb_map_reg(dp, 0, 0x6000, 0x1000);
+               if (par->cmap_adr)
+                       par->cmap_type = cmap_gxt2000;
+       } else if (dp && !strncmp(name, "vga,Display-", 12)) {
+               /* Look for AVIVO initialized by SLOF */
+               struct device_node *pciparent = of_get_parent(dp);
+               const u32 *vid, *did;
+               vid = of_get_property(pciparent, "vendor-id", NULL);
+               did = of_get_property(pciparent, "device-id", NULL);
+               /* This will match most R5xx */
+               if (vid && did && *vid == 0x1002 &&
+                   ((*did >= 0x7100 && *did < 0x7800) ||
+                    (*did >= 0x9400))) {
+                       par->cmap_adr = offb_map_reg(pciparent, 2, 0, 0x10000);
+                       if (par->cmap_adr)
+                               par->cmap_type = cmap_avivo;
+               }
+               of_node_put(pciparent);
        }
-       offb_init_fb(dp->name, dp->full_name, width, height, depth,
-                    pitch, address, dp);
-
+       info->fix.visual = (par->cmap_type != cmap_unknown) ?
+               FB_VISUAL_PSEUDOCOLOR : FB_VISUAL_STATIC_PSEUDOCOLOR;
 }
 
 static void __init offb_init_fb(const char *name, const char *full_name,
                                int width, int height, int depth,
                                int pitch, unsigned long address,
-                               struct device_node *dp)
+                               int foreign_endian, struct device_node *dp)
 {
-       unsigned long res_size = pitch * height * depth / 8;
+       unsigned long res_size = pitch * height * (depth + 7) / 8;
        struct offb_par *par = &default_par;
        unsigned long res_start = address;
        struct fb_fix_screeninfo *fix;
        struct fb_var_screeninfo *var;
        struct fb_info *info;
-       int size;
 
        if (!request_mem_region(res_start, res_size, "offb"))
                return;
@@ -394,25 +393,23 @@ static void __init offb_init_fb(const char *name, const char *full_name,
        printk(KERN_INFO
               "Using unsupported %dx%d %s at %lx, depth=%d, pitch=%d\n",
               width, height, name, address, depth, pitch);
-       if (depth != 8 && depth != 16 && depth != 32) {
+       if (depth != 8 && depth != 15 && depth != 16 && depth != 32) {
                printk(KERN_ERR "%s: can't use depth = %d\n", full_name,
                       depth);
                release_mem_region(res_start, res_size);
                return;
        }
 
-       size = sizeof(struct fb_info) + sizeof(u32) * 17;
-
-       info = kmalloc(size, GFP_ATOMIC);
+       info = framebuffer_alloc(sizeof(u32) * 16, NULL);
        
        if (info == 0) {
                release_mem_region(res_start, res_size);
                return;
        }
-       memset(info, 0, size);
 
        fix = &info->fix;
        var = &info->var;
+       info->par = par;
 
        strcpy(fix->id, "OFfb ");
        strncat(fix->id, name, sizeof(fix->id) - sizeof("OFfb "));
@@ -428,46 +425,12 @@ static void __init offb_init_fb(const char *name, const char *full_name,
        fix->type_aux = 0;
 
        par->cmap_type = cmap_unknown;
-       if (depth == 8) {
-               /* XXX kludge for ati */
-               if (dp && !strncmp(name, "ATY,Rage128", 11)) {
-                       unsigned long regbase = dp->addrs[2].address;
-                       par->cmap_adr = ioremap(regbase, 0x1FFF);
-                       par->cmap_type = cmap_r128;
-               } else if (dp && (!strncmp(name, "ATY,RageM3pA", 12)
-                                 || !strncmp(name, "ATY,RageM3p12A", 14))) {
-                       unsigned long regbase =
-                           dp->parent->addrs[2].address;
-                       par->cmap_adr = ioremap(regbase, 0x1FFF);
-                       par->cmap_type = cmap_M3A;
-               } else if (dp && !strncmp(name, "ATY,RageM3pB", 12)) {
-                       unsigned long regbase =
-                           dp->parent->addrs[2].address;
-                       par->cmap_adr = ioremap(regbase, 0x1FFF);
-                       par->cmap_type = cmap_M3B;
-               } else if (dp && !strncmp(name, "ATY,Rage6", 9)) {
-                       unsigned long regbase = dp->addrs[1].address;
-                       par->cmap_adr = ioremap(regbase, 0x1FFF);
-                       par->cmap_type = cmap_radeon;
-               } else if (!strncmp(name, "ATY,", 4)) {
-                       unsigned long base = address & 0xff000000UL;
-                       par->cmap_adr =
-                           ioremap(base + 0x7ff000, 0x1000) + 0xcc0;
-                       par->cmap_data = par->cmap_adr + 1;
-                       par->cmap_type = cmap_m64;
-               } else if (device_is_compatible(dp, "pci1014,b7")) {
-                       unsigned long regbase = dp->addrs[0].address;
-                       par->cmap_adr = ioremap(regbase + 0x6000, 0x1000);
-                       par->cmap_type = cmap_gxt2000;
-               }
-               fix->visual = par->cmap_adr ? FB_VISUAL_PSEUDOCOLOR
-                   : FB_VISUAL_STATIC_PSEUDOCOLOR;
-       } else
-               fix->visual =   /* par->cmap_adr ? FB_VISUAL_DIRECTCOLOR
-                                  : */ FB_VISUAL_TRUECOLOR;
+       if (depth == 8)
+               offb_init_palette_hacks(info, dp, name, address);
+       else
+               fix->visual = FB_VISUAL_TRUECOLOR;
 
        var->xoffset = var->yoffset = 0;
-       var->bits_per_pixel = depth;
        switch (depth) {
        case 8:
                var->bits_per_pixel = 8;
@@ -480,7 +443,7 @@ static void __init offb_init_fb(const char *name, const char *full_name,
                var->transp.offset = 0;
                var->transp.length = 0;
                break;
-       case 16:                /* RGB 555 */
+       case 15:                /* RGB 555 */
                var->bits_per_pixel = 16;
                var->red.offset = 10;
                var->red.length = 5;
@@ -491,6 +454,17 @@ static void __init offb_init_fb(const char *name, const char *full_name,
                var->transp.offset = 0;
                var->transp.length = 0;
                break;
+       case 16:                /* RGB 565 */
+               var->bits_per_pixel = 16;
+               var->red.offset = 11;
+               var->red.length = 5;
+               var->green.offset = 5;
+               var->green.length = 6;
+               var->blue.offset = 0;
+               var->blue.length = 5;
+               var->transp.offset = 0;
+               var->transp.length = 0;
+               break;
        case 32:                /* RGB 888 */
                var->bits_per_pixel = 32;
                var->red.offset = 16;
@@ -516,23 +490,178 @@ static void __init offb_init_fb(const char *name, const char *full_name,
        var->sync = 0;
        var->vmode = FB_VMODE_NONINTERLACED;
 
+       /* set offb aperture size for generic probing */
+       info->apertures = alloc_apertures(1);
+       if (!info->apertures)
+               goto out_aper;
+       info->apertures->ranges[0].base = address;
+       info->apertures->ranges[0].size = fix->smem_len;
+
        info->fbops = &offb_ops;
        info->screen_base = ioremap(address, fix->smem_len);
-       info->par = par;
        info->pseudo_palette = (void *) (info + 1);
-       info->flags = FBINFO_DEFAULT;
+       info->flags = FBINFO_DEFAULT | FBINFO_MISC_FIRMWARE | foreign_endian;
 
        fb_alloc_cmap(&info->cmap, 256, 0);
 
-       if (register_framebuffer(info) < 0) {
-               kfree(info);
-               release_mem_region(res_start, res_size);
-               return;
-       }
+       if (register_framebuffer(info) < 0)
+               goto out_err;
 
        printk(KERN_INFO "fb%d: Open Firmware frame buffer device on %s\n",
               info->node, full_name);
+       return;
+
+out_err:
+       iounmap(info->screen_base);
+out_aper:
+       iounmap(par->cmap_adr);
+       par->cmap_adr = NULL;
+       framebuffer_release(info);
+       release_mem_region(res_start, res_size);
+}
+
+
+static void __init offb_init_nodriver(struct device_node *dp, int no_real_node)
+{
+       unsigned int len;
+       int i, width = 640, height = 480, depth = 8, pitch = 640;
+       unsigned int flags, rsize, addr_prop = 0;
+       unsigned long max_size = 0;
+       u64 rstart, address = OF_BAD_ADDR;
+       const u32 *pp, *addrp, *up;
+       u64 asize;
+       int foreign_endian = 0;
+
+#ifdef __BIG_ENDIAN
+       if (of_get_property(dp, "little-endian", NULL))
+               foreign_endian = FBINFO_FOREIGN_ENDIAN;
+#else
+       if (of_get_property(dp, "big-endian", NULL))
+               foreign_endian = FBINFO_FOREIGN_ENDIAN;
+#endif
+
+       pp = of_get_property(dp, "linux,bootx-depth", &len);
+       if (pp == NULL)
+               pp = of_get_property(dp, "depth", &len);
+       if (pp && len == sizeof(u32))
+               depth = *pp;
+
+       pp = of_get_property(dp, "linux,bootx-width", &len);
+       if (pp == NULL)
+               pp = of_get_property(dp, "width", &len);
+       if (pp && len == sizeof(u32))
+               width = *pp;
+
+       pp = of_get_property(dp, "linux,bootx-height", &len);
+       if (pp == NULL)
+               pp = of_get_property(dp, "height", &len);
+       if (pp && len == sizeof(u32))
+               height = *pp;
+
+       pp = of_get_property(dp, "linux,bootx-linebytes", &len);
+       if (pp == NULL)
+               pp = of_get_property(dp, "linebytes", &len);
+       if (pp && len == sizeof(u32) && (*pp != 0xffffffffu))
+               pitch = *pp;
+       else
+               pitch = width * ((depth + 7) / 8);
+
+       rsize = (unsigned long)pitch * (unsigned long)height;
+
+       /* Ok, now we try to figure out the address of the framebuffer.
+        *
+        * Unfortunately, Open Firmware doesn't provide a standard way to do
+        * so. All we can do is a dodgy heuristic that happens to work in
+        * practice. On most machines, the "address" property contains what
+        * we need, though not on Matrox cards found in IBM machines. What I've
+        * found that appears to give good results is to go through the PCI
+        * ranges and pick one that is both big enough and if possible encloses
+        * the "address" property. If none match, we pick the biggest
+        */
+       up = of_get_property(dp, "linux,bootx-addr", &len);
+       if (up == NULL)
+               up = of_get_property(dp, "address", &len);
+       if (up && len == sizeof(u32))
+               addr_prop = *up;
+
+       /* Hack for when BootX is passing us */
+       if (no_real_node)
+               goto skip_addr;
+
+       for (i = 0; (addrp = of_get_address(dp, i, &asize, &flags))
+                    != NULL; i++) {
+               int match_addrp = 0;
+
+               if (!(flags & IORESOURCE_MEM))
+                       continue;
+               if (asize < rsize)
+                       continue;
+               rstart = of_translate_address(dp, addrp);
+               if (rstart == OF_BAD_ADDR)
+                       continue;
+               if (addr_prop && (rstart <= addr_prop) &&
+                   ((rstart + asize) >= (addr_prop + rsize)))
+                       match_addrp = 1;
+               if (match_addrp) {
+                       address = addr_prop;
+                       break;
+               }
+               if (rsize > max_size) {
+                       max_size = rsize;
+                       address = OF_BAD_ADDR;
+               }
+
+               if (address == OF_BAD_ADDR)
+                       address = rstart;
+       }
+ skip_addr:
+       if (address == OF_BAD_ADDR && addr_prop)
+               address = (u64)addr_prop;
+       if (address != OF_BAD_ADDR) {
+               /* kludge for valkyrie */
+               if (strcmp(dp->name, "valkyrie") == 0)
+                       address += 0x1000;
+               offb_init_fb(no_real_node ? "bootx" : dp->name,
+                            no_real_node ? "display" : dp->full_name,
+                            width, height, depth, pitch, address,
+                            foreign_endian, no_real_node ? NULL : dp);
+       }
 }
 
+static int __init offb_init(void)
+{
+       struct device_node *dp = NULL, *boot_disp = NULL;
+
+       if (fb_get_options("offb", NULL))
+               return -ENODEV;
+
+       /* Check if we have a MacOS display without a node spec */
+       if (of_get_property(of_chosen, "linux,bootx-noscreen", NULL) != NULL) {
+               /* The old code tried to work out which node was the MacOS
+                * display based on the address. I'm dropping that since the
+                * lack of a node spec only happens with old BootX versions
+                * (users can update) and with this code, they'll still get
+                * a display (just not the palette hacks).
+                */
+               offb_init_nodriver(of_chosen, 1);
+       }
+
+       for (dp = NULL; (dp = of_find_node_by_type(dp, "display"));) {
+               if (of_get_property(dp, "linux,opened", NULL) &&
+                   of_get_property(dp, "linux,boot-display", NULL)) {
+                       boot_disp = dp;
+                       offb_init_nodriver(dp, 0);
+               }
+       }
+       for (dp = NULL; (dp = of_find_node_by_type(dp, "display"));) {
+               if (of_get_property(dp, "linux,opened", NULL) &&
+                   dp != boot_disp)
+                       offb_init_nodriver(dp, 0);
+       }
+
+       return 0;
+}
+
+
 module_init(offb_init);
 MODULE_LICENSE("GPL");