90 files changed, 2543 insertions, 1081 deletions

diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 7a43020fa583..4e83f01e894e 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -541,6 +541,7 @@ config FB_TGA
         select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
         select FB_CFB_IMAGEBLIT
+        select BITREVERSE
         help
           This is the frame buffer device driver for generic TGA graphic
           cards. Say Y if you have one of those.
@@ -551,6 +552,7 @@ config FB_VESA
         select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
         select FB_CFB_IMAGEBLIT
+        select VIDEO_SELECT
         help
           This is the frame buffer device driver for generic VESA 2.0
           compliant graphic cards. The older VESA 1.2 cards are not supported.
@@ -705,6 +707,7 @@ config FB_NVIDIA
         select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
         select FB_CFB_IMAGEBLIT
+        select BITREVERSE
         help
           This driver supports graphics boards with the nVidia chips, TNT
           and newer. For very old chipsets, such as the RIVA128, then use
@@ -744,6 +747,7 @@ config FB_RIVA
         select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
         select FB_CFB_IMAGEBLIT
+        select BITREVERSE
         help
           This driver supports graphics boards with the nVidia Riva/Geforce
           chips.
@@ -1611,6 +1615,16 @@ config FB_PNX4008_DUM_RGB
         ---help---
           Say Y here to enable support for PNX4008 RGB Framebuffer
 
+config FB_IBM_GXT4500
+        tristate "Framebuffer support for IBM GXT4500P adaptor"
+        depends on PPC
+        select FB_CFB_FILLRECT
+        select FB_CFB_COPYAREA
+        select FB_CFB_IMAGEBLIT
+        ---help---
+          Say Y here to enable support for the IBM GXT4500P display
+          adaptor, found on some IBM System P (pSeries) machines.
+
 config FB_VIRTUAL
         tristate "Virtual Frame Buffer support (ONLY FOR TESTING!)"
         depends on FB
diff --git a/drivers/video/Makefile b/drivers/video/Makefile
index a6980e9a2481..309a26dd164a 100644
--- a/drivers/video/Makefile
+++ b/drivers/video/Makefile
@@ -99,6 +99,7 @@ obj-$(CONFIG_FB_IMX)              += imxfb.o
 obj-$(CONFIG_FB_S3C2410)          += s3c2410fb.o
 obj-$(CONFIG_FB_PNX4008_DUM)      += pnx4008/
 obj-$(CONFIG_FB_PNX4008_DUM_RGB)  += pnx4008/
+obj-$(CONFIG_FB_IBM_GXT4500)      += gxt4500.o
 
 # Platform or fallback drivers go here
 obj-$(CONFIG_FB_VESA)             += vesafb.o
diff --git a/drivers/video/S3triofb.c b/drivers/video/S3triofb.c
index 397005eb392d..b3717c8f1bc2 100644
--- a/drivers/video/S3triofb.c
+++ b/drivers/video/S3triofb.c
@@ -535,8 +535,11 @@ static void __init s3triofb_of_init(struct device_node *dp)
 #endif
 
     fb_info.flags = FBINFO_FLAG_DEFAULT;
-    if (register_framebuffer(&fb_info) < 0)
-        return;
+    if (register_framebuffer(&fb_info) < 0) {
+                iounmap(fb_info.screen_base);
+                fb_info.screen_base = NULL;
+                return;
+    }
 
     printk("fb%d: S3 Trio frame buffer device on %s\n",
            fb_info.node, dp->full_name);
diff --git a/drivers/video/amba-clcd.c b/drivers/video/amba-clcd.c
index 6761b68c35e9..6c9dc2e69c82 100644
--- a/drivers/video/amba-clcd.c
+++ b/drivers/video/amba-clcd.c
@@ -447,7 +447,7 @@ static int clcdfb_probe(struct amba_device *dev, void *id)
                 goto out;
         }
 
-        fb = (struct clcd_fb *) kmalloc(sizeof(struct clcd_fb), GFP_KERNEL);
+        fb = kmalloc(sizeof(struct clcd_fb), GFP_KERNEL);
         if (!fb) {
                 printk(KERN_INFO "CLCD: could not allocate new clcd_fb struct\n");
                 ret = -ENOMEM;
diff --git a/drivers/video/amifb.c b/drivers/video/amifb.c
index a4e3fca05891..1a849b870bcc 100644
--- a/drivers/video/amifb.c
+++ b/drivers/video/amifb.c
@@ -2407,10 +2407,10 @@ default_chipset:
                                                    fb_info.fix.smem_len);
         if (!videomemory) {
                 printk("amifb: WARNING! unable to map videomem cached writethrough\n");
-                videomemory = ZTWO_VADDR(fb_info.fix.smem_start);
-        }
+                fb_info.screen_base = (char *)ZTWO_VADDR(fb_info.fix.smem_start);
+        } else
+                fb_info.screen_base = (char *)videomemory;
 
-        fb_info.screen_base = (char *)videomemory;
         memset(dummysprite, 0, DUMMYSPRITEMEMSIZE);
 
         /*
@@ -2453,6 +2453,8 @@ static void amifb_deinit(void)
 {
         fb_dealloc_cmap(&fb_info.cmap);
         chipfree();
+        if (videomemory)
+                iounmap((void*)videomemory);
         release_mem_region(CUSTOM_PHYSADDR+0xe0, 0x120);
         custom.dmacon = DMAF_ALL | DMAF_MASTER;
 }
@@ -2904,14 +2906,6 @@ static int ami_decode_var(struct fb_var_screeninfo *var,
         par->crsr.spot_x = par->crsr.spot_y = 0;
         par->crsr.height = par->crsr.width = 0;
 
-#if 0   /* fbmon not done.  uncomment for 2.5.x -brad */
-        if (!fbmon_valid_timings(pixclock[clk_shift], htotal, vtotal,
-                                 &fb_info)) {
-                DPRINTK("mode doesn't fit for monitor\n");
-                return -EINVAL;
-        }
-#endif
-
         return 0;
 }
 
diff --git a/drivers/video/arcfb.c b/drivers/video/arcfb.c
index ab34b96acc31..30a8369757e7 100644
--- a/drivers/video/arcfb.c
+++ b/drivers/video/arcfb.c
@@ -454,7 +454,7 @@ static ssize_t arcfb_write(struct file *file, const char __user *buf, size_t cou
         unsigned int xres;
 
         p = *ppos;
-        inode = file->f_dentry->d_inode;
+        inode = file->f_path.dentry->d_inode;
         fbidx = iminor(inode);
         info = registered_fb[fbidx];
 
diff --git a/drivers/video/atafb.c b/drivers/video/atafb.c
index 02c41a626fa2..602db660bc73 100644
--- a/drivers/video/atafb.c
+++ b/drivers/video/atafb.c
@@ -2804,8 +2804,19 @@ int __init atafb_init(void)
         atafb_set_disp(-1, &fb_info);
         do_install_cmap(0, &fb_info);
 
-        if (register_framebuffer(&fb_info) < 0)
+        if (register_framebuffer(&fb_info) < 0) {
+#ifdef ATAFB_EXT
+                if (external_addr) {
+                        iounmap(external_addr);
+                        external_addr = NULL;
+                }
+                if (external_vgaiobase) {
+                        iounmap((void*)external_vgaiobase);
+                        external_vgaiobase = 0;
+                }
+#endif
                 return -EINVAL;
+        }
 
         printk("Determined %dx%d, depth %d\n",
                disp.var.xres, disp.var.yres, disp.var.bits_per_pixel);
diff --git a/drivers/video/aty/aty128fb.c b/drivers/video/aty/aty128fb.c
index 5341462b6b48..2e976ffcde0f 100644
--- a/drivers/video/aty/aty128fb.c
+++ b/drivers/video/aty/aty128fb.c
@@ -1333,6 +1333,8 @@ static int aty128_var_to_pll(u32 period_in_ps, struct aty128_pll *pll,
         if (vclk * 12 < c.ppll_min)
                 vclk = c.ppll_min/12;
 
+        pll->post_divider = -1;
+
         /* now, find an acceptable divider */
         for (i = 0; i < sizeof(post_dividers); i++) {
                 output_freq = post_dividers[i] * vclk;
@@ -1342,6 +1344,9 @@ static int aty128_var_to_pll(u32 period_in_ps, struct aty128_pll *pll,
                 }
         }
 
+        if (pll->post_divider < 0)
+                return -EINVAL;
+
         /* calculate feedback divider */
         n = c.ref_divider * output_freq;
         d = c.ref_clk;
diff --git a/drivers/video/aty/atyfb.h b/drivers/video/aty/atyfb.h
index b04f49fb976a..f72faff33c0c 100644
--- a/drivers/video/aty/atyfb.h
+++ b/drivers/video/aty/atyfb.h
@@ -126,7 +126,6 @@ union aty_pll {
      */
 
 struct atyfb_par {
-        struct aty_cmap_regs __iomem *aty_cmap_regs;
         struct { u8 red, green, blue; } palette[256];
         const struct aty_dac_ops *dac_ops;
         const struct aty_pll_ops *pll_ops;
@@ -186,6 +185,7 @@ struct atyfb_par {
         int mtrr_aper;
         int mtrr_reg;
 #endif
+        u32 mem_cntl;
 };
 
     /*
@@ -227,7 +227,7 @@ static inline u32 aty_ld_le32(int regindex, const struct atyfb_par *par)
                 regindex -= 0x800;
 
 #ifdef CONFIG_ATARI
-        return in_le32((volatile u32 *)(par->ati_regbase + regindex));
+        return in_le32(par->ati_regbase + regindex);
 #else
         return readl(par->ati_regbase + regindex);
 #endif
@@ -240,7 +240,7 @@ static inline void aty_st_le32(int regindex, u32 val, const struct atyfb_par *pa
                 regindex -= 0x800;
 
 #ifdef CONFIG_ATARI
-        out_le32((volatile u32 *)(par->ati_regbase + regindex), val);
+        out_le32(par->ati_regbase + regindex, val);
 #else
         writel(val, par->ati_regbase + regindex);
 #endif
@@ -253,7 +253,7 @@ static inline void aty_st_le16(int regindex, u16 val,
         if (regindex >= 0x400)
                 regindex -= 0x800;
 #ifdef CONFIG_ATARI
-        out_le16((volatile u16 *)(par->ati_regbase + regindex), val);
+        out_le16(par->ati_regbase + regindex, val);
 #else
         writel(val, par->ati_regbase + regindex);
 #endif
@@ -315,6 +315,7 @@ struct aty_pll_ops {
         void (*set_pll)   (const struct fb_info * info, const union aty_pll * pll);
         void (*get_pll)   (const struct fb_info *info, union aty_pll * pll);
         int (*init_pll)   (const struct fb_info * info, union aty_pll * pll);
+        void (*resume_pll)(const struct fb_info *info, union aty_pll *pll);
 };
 
 extern const struct aty_pll_ops aty_pll_ati18818_1; /* ATI 18818 */
diff --git a/drivers/video/aty/atyfb_base.c b/drivers/video/aty/atyfb_base.c
index cc4bd8089fe2..f2ebdd880085 100644
--- a/drivers/video/aty/atyfb_base.c
+++ b/drivers/video/aty/atyfb_base.c
@@ -203,14 +203,6 @@ static void ATIReduceRatio(int *Numerator, int *Denominator)
      *  The Hardware parameters for each card
      */
 
-struct aty_cmap_regs {
-        u8 windex;
-        u8 lut;
-        u8 mask;
-        u8 rindex;
-        u8 cntl;
-};
-
 struct pci_mmap_map {
         unsigned long voff;
         unsigned long poff;
@@ -249,7 +241,8 @@ static int atyfb_sync(struct fb_info *info);
      *  Internal routines
      */
 
-static int aty_init(struct fb_info *info, const char *name);
+static int aty_init(struct fb_info *info);
+static void aty_resume_chip(struct fb_info *info);
 #ifdef CONFIG_ATARI
 static int store_video_par(char *videopar, unsigned char m64_num);
 #endif
@@ -406,7 +399,7 @@ static struct {
         { PCI_CHIP_MACH64LB, "3D RAGE LT PRO (Mach64 LB, AGP)", 236, 75, 100, 135, ATI_CHIP_264LTPRO },
         { PCI_CHIP_MACH64LD, "3D RAGE LT PRO (Mach64 LD, AGP)", 230, 100, 100, 135, ATI_CHIP_264LTPRO },
         { PCI_CHIP_MACH64LI, "3D RAGE LT PRO (Mach64 LI, PCI)", 230, 100, 100, 135, ATI_CHIP_264LTPRO | M64F_G3_PB_1_1 | M64F_G3_PB_1024x768 },
-        { PCI_CHIP_MACH64LP, "3D RAGE LT PRO (Mach64 LP, PCI)", 230, 100, 100, 135, ATI_CHIP_264LTPRO },
+        { PCI_CHIP_MACH64LP, "3D RAGE LT PRO (Mach64 LP, PCI)", 230, 100, 100, 135, ATI_CHIP_264LTPRO | M64F_G3_PB_1024x768 },
         { PCI_CHIP_MACH64LQ, "3D RAGE LT PRO (Mach64 LQ, PCI)", 230, 100, 100, 135, ATI_CHIP_264LTPRO },
 
         { PCI_CHIP_MACH64GM, "3D RAGE XL (Mach64 GM, AGP 2x)", 230, 83, 63, 135, ATI_CHIP_264XL },
@@ -1495,10 +1488,6 @@ static int atyfb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)
         else
                 info->var.accel_flags = 0;
 
-#if 0 /* fbmon is not done. uncomment for 2.5.x -brad */
-        if (!fbmon_valid_timings(pixclock, htotal, vtotal, info))
-                return -EINVAL;
-#endif
         aty_crtc_to_var(&crtc, var);
         var->pixclock = par->pll_ops->pll_to_var(info, &pll);
         return 0;
@@ -1937,17 +1926,14 @@ static void atyfb_save_palette(struct atyfb_par *par, int enter)
                 aty_st_8(DAC_CNTL, tmp, par);
                 aty_st_8(DAC_MASK, 0xff, par);
 
-                writeb(i, &par->aty_cmap_regs->rindex);
-                atyfb_save.r[enter][i] = readb(&par->aty_cmap_regs->lut);
-                atyfb_save.g[enter][i] = readb(&par->aty_cmap_regs->lut);
-                atyfb_save.b[enter][i] = readb(&par->aty_cmap_regs->lut);
-                writeb(i, &par->aty_cmap_regs->windex);
-                writeb(atyfb_save.r[1 - enter][i],
-                       &par->aty_cmap_regs->lut);
-                writeb(atyfb_save.g[1 - enter][i],
-                       &par->aty_cmap_regs->lut);
-                writeb(atyfb_save.b[1 - enter][i],
-                       &par->aty_cmap_regs->lut);
+                aty_st_8(DAC_R_INDEX, i, par);
+                atyfb_save.r[enter][i] = aty_ld_8(DAC_DATA, par);
+                atyfb_save.g[enter][i] = aty_ld_8(DAC_DATA, par);
+                atyfb_save.b[enter][i] = aty_ld_8(DAC_DATA, par);
+                aty_st_8(DAC_W_INDEX, i, par);
+                aty_st_8(DAC_DATA, atyfb_save.r[1 - enter][i], par);
+                aty_st_8(DAC_DATA, atyfb_save.g[1 - enter][i], par);
+                aty_st_8(DAC_DATA, atyfb_save.b[1 - enter][i], par);
         }
 }
 
@@ -1982,6 +1968,7 @@ static void atyfb_palette(int enter)
 
 #if defined(CONFIG_PM) && defined(CONFIG_PCI)
 
+#ifdef CONFIG_PPC_PMAC
 /* Power management routines. Those are used for PowerBook sleep.
  */
 static int aty_power_mgmt(int sleep, struct atyfb_par *par)
@@ -2038,21 +2025,13 @@ static int aty_power_mgmt(int sleep, struct atyfb_par *par)
 
         return timeout ? 0 : -EIO;
 }
+#endif
 
 static int atyfb_pci_suspend(struct pci_dev *pdev, pm_message_t state)
 {
         struct fb_info *info = pci_get_drvdata(pdev);
         struct atyfb_par *par = (struct atyfb_par *) info->par;
 
-#ifndef CONFIG_PPC_PMAC
-        /* HACK ALERT ! Once I find a proper way to say to each driver
-         * individually what will happen with it's PCI slot, I'll change
-         * that. On laptops, the AGP slot is just unclocked, so D2 is
-         * expected, while on desktops, the card is powered off
-         */
-        return 0;
-#endif /* CONFIG_PPC_PMAC */
-
         if (state.event == pdev->dev.power.power_state.event)
                 return 0;
 
@@ -2070,6 +2049,7 @@ static int atyfb_pci_suspend(struct pci_dev *pdev, pm_message_t state)
         par->asleep = 1;
         par->lock_blank = 1;
 
+#ifdef CONFIG_PPC_PMAC
         /* Set chip to "suspend" mode */
         if (aty_power_mgmt(1, par)) {
                 par->asleep = 0;
@@ -2079,6 +2059,9 @@ static int atyfb_pci_suspend(struct pci_dev *pdev, pm_message_t state)
                 release_console_sem();
                 return -EIO;
         }
+#else
+        pci_set_power_state(pdev, pci_choose_state(pdev, state));
+#endif
 
         release_console_sem();
 
@@ -2097,8 +2080,15 @@ static int atyfb_pci_resume(struct pci_dev *pdev)
 
         acquire_console_sem();
 
+#ifdef CONFIG_PPC_PMAC
         if (pdev->dev.power.power_state.event == 2)
                 aty_power_mgmt(0, par);
+#else
+        pci_set_power_state(pdev, PCI_D0);
+#endif
+
+        aty_resume_chip(info);
+
         par->asleep = 0;
 
         /* Restore display */
@@ -2344,24 +2334,16 @@ static int __devinit atyfb_get_timings_from_lcd(struct atyfb_par *par,
 }
 #endif /* defined(__i386__) && defined(CONFIG_FB_ATY_GENERIC_LCD) */
 
-static int __devinit aty_init(struct fb_info *info, const char *name)
+static int __devinit aty_init(struct fb_info *info)
 {
         struct atyfb_par *par = (struct atyfb_par *) info->par;
         const char *ramname = NULL, *xtal;
         int gtb_memsize, has_var = 0;
         struct fb_var_screeninfo var;
-        u8 pll_ref_div;
-        u32 i;
-#if defined(CONFIG_PPC)
-        int sense;
-#endif
 
         init_waitqueue_head(&par->vblank.wait);
         spin_lock_init(&par->int_lock);
 
-        par->aty_cmap_regs =
-            (struct aty_cmap_regs __iomem *) (par->ati_regbase + 0xc0);
-
 #ifdef CONFIG_PPC_PMAC
         /* The Apple iBook1 uses non-standard memory frequencies. We detect it
          * and set the frequency manually. */
@@ -2464,18 +2446,21 @@ static int __devinit aty_init(struct fb_info *info, const char *name)
                         par->pll_limits.mclk = 63;
         }
 
-        if (M64_HAS(GTB_DSP)
-            && (pll_ref_div = aty_ld_pll_ct(PLL_REF_DIV, par))) {
-                int diff1, diff2;
-                diff1 = 510 * 14 / pll_ref_div - par->pll_limits.pll_max;
-                diff2 = 510 * 29 / pll_ref_div - par->pll_limits.pll_max;
-                if (diff1 < 0)
-                        diff1 = -diff1;
-                if (diff2 < 0)
-                        diff2 = -diff2;
-                if (diff2 < diff1) {
-                        par->ref_clk_per = 1000000000000ULL / 29498928;
-                        xtal = "29.498928";
+        if (M64_HAS(GTB_DSP)) {
+                u8 pll_ref_div = aty_ld_pll_ct(PLL_REF_DIV, par);
+
+                if (pll_ref_div) {
+                        int diff1, diff2;
+                        diff1 = 510 * 14 / pll_ref_div - par->pll_limits.pll_max;
+                        diff2 = 510 * 29 / pll_ref_div - par->pll_limits.pll_max;
+                        if (diff1 < 0)
+                                diff1 = -diff1;
+                        if (diff2 < 0)
+                                diff2 = -diff2;
+                        if (diff2 < diff1) {
+                                par->ref_clk_per = 1000000000000ULL / 29498928;
+                                xtal = "29.498928";
+                        }
                 }
         }
 #endif /* CONFIG_FB_ATY_CT */
@@ -2485,10 +2470,10 @@ static int __devinit aty_init(struct fb_info *info, const char *name)
         if(par->pll_ops->get_pll)
                 par->pll_ops->get_pll(info, &saved_pll);
 
-        i = aty_ld_le32(MEM_CNTL, par);
+        par->mem_cntl = aty_ld_le32(MEM_CNTL, par);
         gtb_memsize = M64_HAS(GTB_DSP);
         if (gtb_memsize)
-                switch (i & 0xF) {      /* 0xF used instead of MEM_SIZE_ALIAS */
+                switch (par->mem_cntl & 0xF) {  /* 0xF used instead of MEM_SIZE_ALIAS */
                 case MEM_SIZE_512K:
                         info->fix.smem_len = 0x80000;
                         break;
@@ -2510,7 +2495,7 @@ static int __devinit aty_init(struct fb_info *info, const char *name)
                 default:
                         info->fix.smem_len = 0x80000;
         } else
-                switch (i & MEM_SIZE_ALIAS) {
+                switch (par->mem_cntl & MEM_SIZE_ALIAS) {
                 case MEM_SIZE_512K:
                         info->fix.smem_len = 0x80000;
                         break;
@@ -2540,20 +2525,20 @@ static int __devinit aty_init(struct fb_info *info, const char *name)
 
         if (vram) {
                 info->fix.smem_len = vram * 1024;
-                i = i & ~(gtb_memsize ? 0xF : MEM_SIZE_ALIAS);
+                par->mem_cntl &= ~(gtb_memsize ? 0xF : MEM_SIZE_ALIAS);
                 if (info->fix.smem_len <= 0x80000)
-                        i |= MEM_SIZE_512K;
+                        par->mem_cntl |= MEM_SIZE_512K;
                 else if (info->fix.smem_len <= 0x100000)
-                        i |= MEM_SIZE_1M;
+                        par->mem_cntl |= MEM_SIZE_1M;
                 else if (info->fix.smem_len <= 0x200000)
-                        i |= gtb_memsize ? MEM_SIZE_2M_GTB : MEM_SIZE_2M;
+                        par->mem_cntl |= gtb_memsize ? MEM_SIZE_2M_GTB : MEM_SIZE_2M;
                 else if (info->fix.smem_len <= 0x400000)
-                        i |= gtb_memsize ? MEM_SIZE_4M_GTB : MEM_SIZE_4M;
+                        par->mem_cntl |= gtb_memsize ? MEM_SIZE_4M_GTB : MEM_SIZE_4M;
                 else if (info->fix.smem_len <= 0x600000)
-                        i |= gtb_memsize ? MEM_SIZE_6M_GTB : MEM_SIZE_6M;
+                        par->mem_cntl |= gtb_memsize ? MEM_SIZE_6M_GTB : MEM_SIZE_6M;
                 else
-                        i |= gtb_memsize ? MEM_SIZE_8M_GTB : MEM_SIZE_8M;
-                aty_st_le32(MEM_CNTL, i, par);
+                        par->mem_cntl |= gtb_memsize ? MEM_SIZE_8M_GTB : MEM_SIZE_8M;
+                aty_st_le32(MEM_CNTL, par->mem_cntl, par);
         }
 
         /*
@@ -2599,11 +2584,12 @@ static int __devinit aty_init(struct fb_info *info, const char *name)
 #endif
         if(par->pll_ops->init_pll)
                 par->pll_ops->init_pll(info, &par->pll);
+        if (par->pll_ops->resume_pll)
+                par->pll_ops->resume_pll(info, &par->pll);
 
         /*
-         *  Last page of 8 MB (4 MB on ISA) aperture is MMIO
-         *  FIXME: we should use the auxiliary aperture instead so we can access
-         *  the full 8 MB of video RAM on 8 MB boards
+         *  Last page of 8 MB (4 MB on ISA) aperture is MMIO,
+         *  unless the auxiliary register aperture is used.
          */
 
         if (!par->aux_start &&
@@ -2669,6 +2655,7 @@ static int __devinit aty_init(struct fb_info *info, const char *name)
                                 has_var = 1;
                 } else {
                         if (default_vmode == VMODE_CHOOSE) {
+                                int sense;
                                 if (M64_HAS(G3_PB_1024x768))
                                         /* G3 PowerBook with 1024x768 LCD */
                                         default_vmode = VMODE_1024_768_60;
@@ -2749,7 +2736,7 @@ static int __devinit aty_init(struct fb_info *info, const char *name)
         fb_list = info;
 
         PRINTKI("fb%d: %s frame buffer device on %s\n",
-               info->node, info->fix.id, name);
+                info->node, info->fix.id, par->bus_type == ISA ? "ISA" : "PCI");
         return 0;
 
 aty_init_exit:
@@ -2770,6 +2757,19 @@ aty_init_exit:
         return -1;
 }
 
+static void aty_resume_chip(struct fb_info *info)
+{
+        struct atyfb_par *par = info->par;
+
+        aty_st_le32(MEM_CNTL, par->mem_cntl, par);
+
+        if (par->pll_ops->resume_pll)
+                par->pll_ops->resume_pll(info, &par->pll);
+
+        if (par->aux_start)
+                aty_st_le32(BUS_CNTL, aty_ld_le32(BUS_CNTL, par) | BUS_APER_REG_DIS, par);
+}
+
 #ifdef CONFIG_ATARI
 static int __devinit store_video_par(char *video_str, unsigned char m64_num)
 {
@@ -2826,9 +2826,9 @@ static int atyfb_blank(int blank, struct fb_info *info)
 #endif
 
         gen_cntl = aty_ld_le32(CRTC_GEN_CNTL, par);
+        gen_cntl &= ~0x400004c;
         switch (blank) {
-                case FB_BLANK_UNBLANK:
-                        gen_cntl &= ~0x400004c;
+                case FB_BLANK_UNBLANK:
                         break;
                 case FB_BLANK_NORMAL:
                         gen_cntl |= 0x4000040;
@@ -2863,17 +2863,10 @@ static int atyfb_blank(int blank, struct fb_info *info)
 static void aty_st_pal(u_int regno, u_int red, u_int green, u_int blue,
                        const struct atyfb_par *par)
 {
-#ifdef CONFIG_ATARI
-        out_8(&par->aty_cmap_regs->windex, regno);
-        out_8(&par->aty_cmap_regs->lut, red);
-        out_8(&par->aty_cmap_regs->lut, green);
-        out_8(&par->aty_cmap_regs->lut, blue);
-#else
-        writeb(regno, &par->aty_cmap_regs->windex);
-        writeb(red, &par->aty_cmap_regs->lut);
-        writeb(green, &par->aty_cmap_regs->lut);
-        writeb(blue, &par->aty_cmap_regs->lut);
-#endif
+        aty_st_8(DAC_W_INDEX, regno, par);
+        aty_st_8(DAC_DATA, red, par);
+        aty_st_8(DAC_DATA, green, par);
+        aty_st_8(DAC_DATA, blue, par);
 }
 
     /*
@@ -3182,7 +3175,7 @@ static int __devinit atyfb_setup_sparc(struct pci_dev *pdev,
 
 #ifdef __i386__
 #ifdef CONFIG_FB_ATY_GENERIC_LCD
-static void aty_init_lcd(struct atyfb_par *par, u32 bios_base)
+static void __devinit aty_init_lcd(struct atyfb_par *par, u32 bios_base)
 {
         u32 driv_inf_tab, sig;
         u16 lcd_ofs;
@@ -3527,6 +3520,10 @@ static int __devinit atyfb_setup_generic(struct pci_dev *pdev, struct fb_info *i
 atyfb_setup_generic_fail:
         iounmap(par->ati_regbase);
         par->ati_regbase = NULL;
+        if (info->screen_base) {
+                iounmap(info->screen_base);
+                info->screen_base = NULL;
+        }
         return ret;
 }
 
@@ -3594,7 +3591,7 @@ static int __devinit atyfb_pci_probe(struct pci_dev *pdev, const struct pci_devi
         pci_set_drvdata(pdev, info);
 
         /* Init chip & register framebuffer */
-        if (aty_init(info, "PCI"))
+        if (aty_init(info))
                 goto err_release_io;
 
 #ifdef __sparc__
@@ -3641,12 +3638,13 @@ err_release_mem:
 
 #ifdef CONFIG_ATARI
 
-static int __devinit atyfb_atari_probe(void)
+static int __init atyfb_atari_probe(void)
 {
         struct atyfb_par *par;
         struct fb_info *info;
         int m64_num;
         u32 clock_r;
+        int num_found = 0;
 
         for (m64_num = 0; m64_num < mach64_count; m64_num++) {
                 if (!phys_vmembase[m64_num] || !phys_size[m64_num] ||
@@ -3694,16 +3692,34 @@ static int __devinit atyfb_atari_probe(void)
                         break;
                 }
 
-                if (aty_init(info, "ISA bus")) {
+                /* Fake pci_id for correct_chipset() */
+                switch (aty_ld_le32(CONFIG_CHIP_ID, par) & CFG_CHIP_TYPE) {
+                case 0x00d7:
+                        par->pci_id = PCI_CHIP_MACH64GX;
+                        break;
+                case 0x0057:
+                        par->pci_id = PCI_CHIP_MACH64CX;
+                        break;
+                default:
+                        break;
+                }
+
+                if (correct_chipset(par) || aty_init(info)) {
+                        iounmap(info->screen_base);
+                        iounmap(par->ati_regbase);
                         framebuffer_release(info);
-                        /* This is insufficient! kernel_map has added two large chunks!! */
-                        return -ENXIO;
+                } else {
+                        num_found++;
                 }
         }
+
+        return num_found ? 0 : -ENXIO;
 }
 
 #endif /* CONFIG_ATARI */
 
+#ifdef CONFIG_PCI
+
 static void __devexit atyfb_remove(struct fb_info *info)
 {
         struct atyfb_par *par = (struct atyfb_par *) info->par;
@@ -3751,7 +3767,6 @@ static void __devexit atyfb_remove(struct fb_info *info)
         framebuffer_release(info);
 }
 
-#ifdef CONFIG_PCI
 
 static void __devexit atyfb_pci_remove(struct pci_dev *pdev)
 {
@@ -3786,7 +3801,7 @@ static struct pci_driver atyfb_driver = {
 #endif /* CONFIG_PCI */
 
 #ifndef MODULE
-static int __devinit atyfb_setup(char *options)
+static int __init atyfb_setup(char *options)
 {
         char *this_opt;
 
@@ -3858,7 +3873,7 @@ static int __devinit atyfb_setup(char *options)
 }
 #endif  /*  MODULE  */
 
-static int __devinit atyfb_init(void)
+static int __init atyfb_init(void)
 {
     int err1 = 1, err2 = 1;
 #ifndef MODULE
diff --git a/drivers/video/aty/mach64_ct.c b/drivers/video/aty/mach64_ct.c
index 5080816be653..f3b487b8710b 100644
--- a/drivers/video/aty/mach64_ct.c
+++ b/drivers/video/aty/mach64_ct.c
@@ -370,8 +370,8 @@ void aty_set_pll_ct(const struct fb_info *info, const union aty_pll *pll)
 #endif
 }
 
-static void __init aty_get_pll_ct(const struct fb_info *info,
-                                  union aty_pll *pll)
+static void __devinit aty_get_pll_ct(const struct fb_info *info,
+                                     union aty_pll *pll)
 {
         struct atyfb_par *par = (struct atyfb_par *) info->par;
         u8 tmp, clock;
@@ -394,12 +394,12 @@ static void __init aty_get_pll_ct(const struct fb_info *info,
         }
 }
 
-static int __init aty_init_pll_ct(const struct fb_info *info,
-                                 union aty_pll *pll)
+static int __devinit aty_init_pll_ct(const struct fb_info *info,
+                                     union aty_pll *pll)
 {
         struct atyfb_par *par = (struct atyfb_par *) info->par;
-        u8 mpost_div, xpost_div, sclk_post_div_real, sclk_fb_div, spll_cntl2;
-        u32 q, i, memcntl, trp;
+        u8 mpost_div, xpost_div, sclk_post_div_real;
+        u32 q, memcntl, trp;
         u32 dsp_config, dsp_on_off, vga_dsp_config, vga_dsp_on_off;
 #ifdef DEBUG
         int pllmclk, pllsclk;
@@ -575,14 +575,30 @@ static int __init aty_init_pll_ct(const struct fb_info *info,
                         mpost_div += (q <  32*8);
                 }
                 sclk_post_div_real = postdividers[mpost_div];
-                sclk_fb_div = q * sclk_post_div_real / 8;
-                spll_cntl2 = mpost_div << 4;
+                pll->ct.sclk_fb_div = q * sclk_post_div_real / 8;
+                pll->ct.spll_cntl2 = mpost_div << 4;
 #ifdef DEBUG
-                pllsclk = (1000000 * 2 * sclk_fb_div) /
+                pllsclk = (1000000 * 2 * pll->ct.sclk_fb_div) /
                         (par->ref_clk_per * pll->ct.pll_ref_div);
                 printk("atyfb(%s): use sclk, pllsclk=%d MHz, sclk=mclk=%d MHz\n",
                         __FUNCTION__, pllsclk, pllsclk / sclk_post_div_real);
 #endif
+        }
+
+        /* Disable the extra precision pixel clock controls since we do not use them. */
+        pll->ct.ext_vpll_cntl = aty_ld_pll_ct(EXT_VPLL_CNTL, par);
+        pll->ct.ext_vpll_cntl &= ~(EXT_VPLL_EN | EXT_VPLL_VGA_EN | EXT_VPLL_INSYNC);
+
+        return 0;
+}
+
+static void aty_resume_pll_ct(const struct fb_info *info,
+                              union aty_pll *pll)
+{
+        struct atyfb_par *par = info->par;
+
+        if (par->mclk_per != par->xclk_per) {
+                int i;
                 /*
                 * This disables the sclk, crashes the computer as reported:
                 * aty_st_pll_ct(SPLL_CNTL2, 3, info);
@@ -590,8 +606,8 @@ static int __init aty_init_pll_ct(const struct fb_info *info,
                 * So it seems the sclk must be enabled before it is used;
                 * so PLL_GEN_CNTL must be programmed *after* the sclk.
                 */
-                aty_st_pll_ct(SCLK_FB_DIV, sclk_fb_div, par);
-                aty_st_pll_ct(SPLL_CNTL2, spll_cntl2, par);
+                aty_st_pll_ct(SCLK_FB_DIV, pll->ct.sclk_fb_div, par);
+                aty_st_pll_ct(SPLL_CNTL2, pll->ct.spll_cntl2, par);
                 /*
                  * The sclk has been started. However, I believe the first clock
                  * ticks it generates are not very stable. Hope this primitive loop
@@ -605,11 +621,7 @@ static int __init aty_init_pll_ct(const struct fb_info *info,
         aty_st_pll_ct(PLL_GEN_CNTL, pll->ct.pll_gen_cntl, par);
         aty_st_pll_ct(MCLK_FB_DIV, pll->ct.mclk_fb_div, par);
         aty_st_pll_ct(PLL_EXT_CNTL, pll->ct.pll_ext_cntl, par);
-        /* Disable the extra precision pixel clock controls since we do not use them. */
-        aty_st_pll_ct(EXT_VPLL_CNTL, aty_ld_pll_ct(EXT_VPLL_CNTL, par) &
-                ~(EXT_VPLL_EN | EXT_VPLL_VGA_EN | EXT_VPLL_INSYNC), par);
-
-        return 0;
+        aty_st_pll_ct(EXT_VPLL_CNTL, pll->ct.ext_vpll_cntl, par);
 }
 
 static int dummy(void)
@@ -626,5 +638,6 @@ const struct aty_pll_ops aty_pll_ct = {
         .pll_to_var     = aty_pll_to_var_ct,
         .set_pll        = aty_set_pll_ct,
         .get_pll        = aty_get_pll_ct,
-        .init_pll       = aty_init_pll_ct
+        .init_pll       = aty_init_pll_ct,
+        .resume_pll     = aty_resume_pll_ct,
 };
diff --git a/drivers/video/aty/radeon_i2c.c b/drivers/video/aty/radeon_i2c.c
index 676754520099..e7c5b219ad1b 100644
--- a/drivers/video/aty/radeon_i2c.c
+++ b/drivers/video/aty/radeon_i2c.c
@@ -120,26 +120,32 @@ void radeon_create_i2c_busses(struct radeonfb_info *rinfo)
 void radeon_delete_i2c_busses(struct radeonfb_info *rinfo)
 {
         if (rinfo->i2c[0].rinfo)
-                i2c_bit_del_bus(&rinfo->i2c[0].adapter);
+                i2c_del_adapter(&rinfo->i2c[0].adapter);
         rinfo->i2c[0].rinfo = NULL;
 
         if (rinfo->i2c[1].rinfo)
-                i2c_bit_del_bus(&rinfo->i2c[1].adapter);
+                i2c_del_adapter(&rinfo->i2c[1].adapter);
         rinfo->i2c[1].rinfo = NULL;
 
         if (rinfo->i2c[2].rinfo)
-                i2c_bit_del_bus(&rinfo->i2c[2].adapter);
+                i2c_del_adapter(&rinfo->i2c[2].adapter);
         rinfo->i2c[2].rinfo = NULL;
 
         if (rinfo->i2c[3].rinfo)
-                i2c_bit_del_bus(&rinfo->i2c[3].adapter);
+                i2c_del_adapter(&rinfo->i2c[3].adapter);
         rinfo->i2c[3].rinfo = NULL;
 }
 
 int radeon_probe_i2c_connector(struct radeonfb_info *rinfo, int conn,
                                u8 **out_edid)
 {
-        u8 *edid = fb_ddc_read(&rinfo->i2c[conn-1].adapter);
+        u32 reg = rinfo->i2c[conn-1].ddc_reg;
+        u8 *edid;
+
+        OUTREG(reg, INREG(reg) &
+                        ~(VGA_DDC_DATA_OUTPUT | VGA_DDC_CLK_OUTPUT));
+
+        edid = fb_ddc_read(&rinfo->i2c[conn-1].adapter);
 
         if (out_edid)
                 *out_edid = edid;
diff --git a/drivers/video/aty/radeon_monitor.c b/drivers/video/aty/radeon_monitor.c
index ea531a6f45d1..38c7dbf8c151 100644
--- a/drivers/video/aty/radeon_monitor.c
+++ b/drivers/video/aty/radeon_monitor.c
@@ -104,10 +104,9 @@ static int __devinit radeon_parse_montype_prop(struct device_node *dp, u8 **out_
         if (pedid == NULL)
                 return mt;
 
-        tmp = (u8 *)kmalloc(EDID_LENGTH, GFP_KERNEL);
+        tmp = kmemdup(pedid, EDID_LENGTH, GFP_KERNEL);
         if (!tmp)
                 return mt;
-        memcpy(tmp, pedid, EDID_LENGTH);
         *out_EDID = tmp;
         return mt;
 }
diff --git a/drivers/video/au1100fb.h b/drivers/video/au1100fb.h
index 2855534dc235..164fe2f231ec 100644
--- a/drivers/video/au1100fb.h
+++ b/drivers/video/au1100fb.h
@@ -274,7 +274,7 @@ static struct au1100fb_panel known_lcd_panels[] =
                 .bpp = 16,
                 .control_base = 0x0004886A |
                         LCD_CONTROL_DEFAULT_PO | LCD_CONTROL_DEFAULT_SBPPF |
-                        LCD_CONTROL_BPP_16,
+                        LCD_CONTROL_BPP_16 | LCD_CONTROL_SBB_4,
                 .clkcontrol_base = 0x00020000,
                 .horztiming = 0x005aff1f,
                 .verttiming = 0x16000e57,
diff --git a/drivers/video/backlight/backlight.c b/drivers/video/backlight/backlight.c
index 1d97cdf6f382..9601bfe309ac 100644
--- a/drivers/video/backlight/backlight.c
+++ b/drivers/video/backlight/backlight.c
@@ -14,6 +14,59 @@
 #include <linux/err.h>
 #include <linux/fb.h>
 
+
+#if defined(CONFIG_FB) || (defined(CONFIG_FB_MODULE) && \
+                           defined(CONFIG_BACKLIGHT_CLASS_DEVICE_MODULE))
+/* This callback gets called when something important happens inside a
+ * framebuffer driver. We're looking if that important event is blanking,
+ * and if it is, we're switching backlight power as well ...
+ */
+static int fb_notifier_callback(struct notifier_block *self,
+                                unsigned long event, void *data)
+{
+        struct backlight_device *bd;
+        struct fb_event *evdata = data;
+
+        /* If we aren't interested in this event, skip it immediately ... */
+        if (event != FB_EVENT_BLANK)
+                return 0;
+
+        bd = container_of(self, struct backlight_device, fb_notif);
+        down(&bd->sem);
+        if (bd->props)
+                if (!bd->props->check_fb ||
+                    bd->props->check_fb(evdata->info)) {
+                        bd->props->fb_blank = *(int *)evdata->data;
+                        if (likely(bd->props && bd->props->update_status))
+                                bd->props->update_status(bd);
+                }
+        up(&bd->sem);
+        return 0;
+}
+
+static int backlight_register_fb(struct backlight_device *bd)
+{
+        memset(&bd->fb_notif, 0, sizeof(bd->fb_notif));
+        bd->fb_notif.notifier_call = fb_notifier_callback;
+
+        return fb_register_client(&bd->fb_notif);
+}
+
+static void backlight_unregister_fb(struct backlight_device *bd)
+{
+        fb_unregister_client(&bd->fb_notif);
+}
+#else
+static inline int backlight_register_fb(struct backlight_device *bd)
+{
+        return 0;
+}
+
+static inline void backlight_unregister_fb(struct backlight_device *bd)
+{
+}
+#endif /* CONFIG_FB */
+
 static ssize_t backlight_show_power(struct class_device *cdev, char *buf)
 {
         int rc = -ENXIO;
@@ -142,7 +195,7 @@ static struct class backlight_class = {
         .store  = _store,                                       \
 }
 
-static struct class_device_attribute bl_class_device_attributes[] = {
+static const struct class_device_attribute bl_class_device_attributes[] = {
         DECLARE_ATTR(power, 0644, backlight_show_power, backlight_store_power),
         DECLARE_ATTR(brightness, 0644, backlight_show_brightness,
                      backlight_store_brightness),
@@ -151,33 +204,6 @@ static struct class_device_attribute bl_class_device_attributes[] = {
         DECLARE_ATTR(max_brightness, 0444, backlight_show_max_brightness, NULL),
 };
 
-/* This callback gets called when something important happens inside a
- * framebuffer driver. We're looking if that important event is blanking,
- * and if it is, we're switching backlight power as well ...
- */
-static int fb_notifier_callback(struct notifier_block *self,
-                                unsigned long event, void *data)
-{
-        struct backlight_device *bd;
-        struct fb_event *evdata =(struct fb_event *)data;
-
-        /* If we aren't interested in this event, skip it immediately ... */
-        if (event != FB_EVENT_BLANK)
-                return 0;
-
-        bd = container_of(self, struct backlight_device, fb_notif);
-        down(&bd->sem);
-        if (bd->props)
-                if (!bd->props->check_fb ||
-                    bd->props->check_fb(evdata->info)) {
-                        bd->props->fb_blank = *(int *)evdata->data;
-                        if (likely(bd->props && bd->props->update_status))
-                                bd->props->update_status(bd);
-                }
-        up(&bd->sem);
-        return 0;
-}
-
 /**
  * backlight_device_register - create and register a new object of
  *   backlight_device class.
@@ -218,10 +244,7 @@ error:		kfree(new_bd);
                 return ERR_PTR(rc);
         }
 
-        memset(&new_bd->fb_notif, 0, sizeof(new_bd->fb_notif));
-        new_bd->fb_notif.notifier_call = fb_notifier_callback;
-
-        rc = fb_register_client(&new_bd->fb_notif);
+        rc = backlight_register_fb(new_bd);
         if (unlikely(rc))
                 goto error;
 
@@ -262,16 +285,10 @@ void backlight_device_unregister(struct backlight_device *bd)
                                          &bl_class_device_attributes[i]);
 
         down(&bd->sem);
-        if (likely(bd->props && bd->props->update_status)) {
-                bd->props->brightness = 0;
-                bd->props->power = 0;
-                bd->props->update_status(bd);
-        }
-
         bd->props = NULL;
         up(&bd->sem);
 
-        fb_unregister_client(&bd->fb_notif);
+        backlight_unregister_fb(bd);
 
         class_device_unregister(&bd->class_dev);
 }
diff --git a/drivers/video/backlight/corgi_bl.c b/drivers/video/backlight/corgi_bl.c
index 2ebbfd95145f..61587ca2cdbb 100644
--- a/drivers/video/backlight/corgi_bl.c
+++ b/drivers/video/backlight/corgi_bl.c
@@ -111,7 +111,7 @@ static struct backlight_properties corgibl_data = {
         .update_status  = corgibl_set_intensity,
 };
 
-static int __init corgibl_probe(struct platform_device *pdev)
+static int corgibl_probe(struct platform_device *pdev)
 {
         struct corgibl_machinfo *machinfo = pdev->dev.platform_data;
 
@@ -135,6 +135,10 @@ static int __init corgibl_probe(struct platform_device *pdev)
 
 static int corgibl_remove(struct platform_device *dev)
 {
+        corgibl_data.power = 0;
+        corgibl_data.brightness = 0;
+        corgibl_send_intensity(corgi_backlight_device);
+
         backlight_device_unregister(corgi_backlight_device);
 
         printk("Corgi Backlight Driver Unloaded\n");
@@ -166,4 +170,4 @@ module_exit(corgibl_exit);
 
 MODULE_AUTHOR("Richard Purdie <rpurdie@rpsys.net>");
 MODULE_DESCRIPTION("Corgi Backlight Driver");
-MODULE_LICENSE("GPLv2");
+MODULE_LICENSE("GPL");
diff --git a/drivers/video/backlight/hp680_bl.c b/drivers/video/backlight/hp680_bl.c
index fe1488374f62..1c569fb543ae 100644
--- a/drivers/video/backlight/hp680_bl.c
+++ b/drivers/video/backlight/hp680_bl.c
@@ -19,7 +19,7 @@
 #include <linux/backlight.h>
 
 #include <asm/cpu/dac.h>
-#include <asm/hp6xx/hp6xx.h>
+#include <asm/hp6xx.h>
 #include <asm/hd64461.h>
 
 #define HP680_MAX_INTENSITY 255
@@ -117,6 +117,10 @@ static int __init hp680bl_probe(struct platform_device *dev)
 
 static int hp680bl_remove(struct platform_device *dev)
 {
+        hp680bl_data.brightness = 0;
+        hp680bl_data.power = 0;
+        hp680bl_send_intensity(hp680_backlight_device);
+
         backlight_device_unregister(hp680_backlight_device);
 
         return 0;
diff --git a/drivers/video/backlight/lcd.c b/drivers/video/backlight/lcd.c
index bc8ab005a3fb..f6e041627edb 100644
--- a/drivers/video/backlight/lcd.c
+++ b/drivers/video/backlight/lcd.c
@@ -14,6 +14,53 @@
 #include <linux/err.h>
 #include <linux/fb.h>
 
+#if defined(CONFIG_FB) || (defined(CONFIG_FB_MODULE) && \
+                           defined(CONFIG_LCD_CLASS_DEVICE_MODULE))
+/* This callback gets called when something important happens inside a
+ * framebuffer driver. We're looking if that important event is blanking,
+ * and if it is, we're switching lcd power as well ...
+ */
+static int fb_notifier_callback(struct notifier_block *self,
+                                 unsigned long event, void *data)
+{
+        struct lcd_device *ld;
+        struct fb_event *evdata = data;
+
+        /* If we aren't interested in this event, skip it immediately ... */
+        if (event != FB_EVENT_BLANK)
+                return 0;
+
+        ld = container_of(self, struct lcd_device, fb_notif);
+        down(&ld->sem);
+        if (ld->props)
+                if (!ld->props->check_fb || ld->props->check_fb(evdata->info))
+                        ld->props->set_power(ld, *(int *)evdata->data);
+        up(&ld->sem);
+        return 0;
+}
+
+static int lcd_register_fb(struct lcd_device *ld)
+{
+        memset(&ld->fb_notif, 0, sizeof(&ld->fb_notif));
+        ld->fb_notif.notifier_call = fb_notifier_callback;
+        return fb_register_client(&ld->fb_notif);
+}
+
+static void lcd_unregister_fb(struct lcd_device *ld)
+{
+        fb_unregister_client(&ld->fb_notif);
+}
+#else
+static int lcd_register_fb(struct lcd_device *ld)
+{
+        return 0;
+}
+
+static inline void lcd_unregister_fb(struct lcd_device *ld)
+{
+}
+#endif /* CONFIG_FB */
+
 static ssize_t lcd_show_power(struct class_device *cdev, char *buf)
 {
         int rc;
@@ -121,35 +168,12 @@ static struct class lcd_class = {
         .store  = _store,                                       \
 }
 
-static struct class_device_attribute lcd_class_device_attributes[] = {
+static const struct class_device_attribute lcd_class_device_attributes[] = {
         DECLARE_ATTR(power, 0644, lcd_show_power, lcd_store_power),
         DECLARE_ATTR(contrast, 0644, lcd_show_contrast, lcd_store_contrast),
         DECLARE_ATTR(max_contrast, 0444, lcd_show_max_contrast, NULL),
 };
 
-/* This callback gets called when something important happens inside a
- * framebuffer driver. We're looking if that important event is blanking,
- * and if it is, we're switching lcd power as well ...
- */
-static int fb_notifier_callback(struct notifier_block *self,
-                                 unsigned long event, void *data)
-{
-        struct lcd_device *ld;
-        struct fb_event *evdata =(struct fb_event *)data;
-
-        /* If we aren't interested in this event, skip it immediately ... */
-        if (event != FB_EVENT_BLANK)
-                return 0;
-
-        ld = container_of(self, struct lcd_device, fb_notif);
-        down(&ld->sem);
-        if (ld->props)
-                if (!ld->props->check_fb || ld->props->check_fb(evdata->info))
-                        ld->props->set_power(ld, *(int *)evdata->data);
-        up(&ld->sem);
-        return 0;
-}
-
 /**
  * lcd_device_register - register a new object of lcd_device class.
  * @name: the name of the new object(must be the same as the name of the
@@ -186,10 +210,8 @@ error:		kfree(new_ld);
                 return ERR_PTR(rc);
         }
 
-        memset(&new_ld->fb_notif, 0, sizeof(new_ld->fb_notif));
-        new_ld->fb_notif.notifier_call = fb_notifier_callback;
+        rc = lcd_register_fb(new_ld);
 
-        rc = fb_register_client(&new_ld->fb_notif);
         if (unlikely(rc))
                 goto error;
 
@@ -232,9 +254,7 @@ void lcd_device_unregister(struct lcd_device *ld)
         down(&ld->sem);
         ld->props = NULL;
         up(&ld->sem);
-
-        fb_unregister_client(&ld->fb_notif);
-
+        lcd_unregister_fb(ld);
         class_device_unregister(&ld->class_dev);
 }
 EXPORT_SYMBOL(lcd_device_unregister);
diff --git a/drivers/video/backlight/locomolcd.c b/drivers/video/backlight/locomolcd.c
index 628571c63bac..2d7905410b2a 100644
--- a/drivers/video/backlight/locomolcd.c
+++ b/drivers/video/backlight/locomolcd.c
@@ -200,6 +200,10 @@ static int locomolcd_remove(struct locomo_dev *dev)
 {
         unsigned long flags;
 
+        locomobl_data.brightness = 0;
+        locomobl_data.power = 0;
+        locomolcd_set_intensity(locomolcd_bl_device);
+
         backlight_device_unregister(locomolcd_bl_device);
         local_irq_save(flags);
         locomolcd_dev = NULL;
diff --git a/drivers/video/cfbimgblt.c b/drivers/video/cfbimgblt.c
index 51d35386a945..261004473c8e 100644
--- a/drivers/video/cfbimgblt.c
+++ b/drivers/video/cfbimgblt.c
@@ -42,7 +42,7 @@
 #define DPRINTK(fmt, args...)
 #endif
 
-static u32 cfb_tab8[] = {
+static const u32 cfb_tab8[] = {
 #if defined(__BIG_ENDIAN)
     0x00000000,0x000000ff,0x0000ff00,0x0000ffff,
     0x00ff0000,0x00ff00ff,0x00ffff00,0x00ffffff,
@@ -58,7 +58,7 @@ static u32 cfb_tab8[] = {
 #endif
 };
 
-static u32 cfb_tab16[] = {
+static const u32 cfb_tab16[] = {
 #if defined(__BIG_ENDIAN)
     0x00000000, 0x0000ffff, 0xffff0000, 0xffffffff
 #elif defined(__LITTLE_ENDIAN)
@@ -68,7 +68,7 @@ static u32 cfb_tab16[] = {
 #endif
 };
 
-static u32 cfb_tab32[] = {
+static const u32 cfb_tab32[] = {
         0x00000000, 0xffffffff
 };
 
@@ -218,7 +218,7 @@ static inline void fast_imageblit(const struct fb_image *image, struct fb_info *
         u32 bit_mask, end_mask, eorx, shift;
         const char *s = image->data, *src;
         u32 __iomem *dst;
-        u32 *tab = NULL;
+        const u32 *tab = NULL;
         int i, j, k;
                 
         switch (bpp) {
diff --git a/drivers/video/cirrusfb.c b/drivers/video/cirrusfb.c
index daf43f535a0b..2c4bc6205738 100644
--- a/drivers/video/cirrusfb.c
+++ b/drivers/video/cirrusfb.c
@@ -2442,7 +2442,10 @@ static int cirrusfb_pci_register (struct pci_dev *pdev,
         printk ("Cirrus Logic chipset on PCI bus\n");
         pci_set_drvdata(pdev, info);
 
-        return cirrusfb_register(cinfo);
+        ret = cirrusfb_register(cinfo);
+        if (ret)
+                iounmap(cinfo->fbmem);
+        return ret;
 
 err_release_legacy:
         if (release_io_ports)
@@ -2574,7 +2577,15 @@ static int cirrusfb_zorro_register(struct zorro_dev *z,
         printk (KERN_INFO "Cirrus Logic chipset on Zorro bus\n");
         zorro_set_drvdata(z, info);
 
-        return cirrusfb_register(cinfo);
+        ret = cirrusfb_register(cinfo);
+        if (ret) {
+                if (btype == BT_PICASSO4) {
+                        iounmap(cinfo->fbmem);
+                        iounmap(cinfo->regbase - 0x600000);
+                } else if (board_addr > 0x01000000)
+                        iounmap(cinfo->fbmem);
+        }
+        return ret;
 
 err_unmap_regbase:
         /* Parental advisory: explicit hack */
diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c
index 302174b8e477..31f476a64790 100644
--- a/drivers/video/console/fbcon.c
+++ b/drivers/video/console/fbcon.c
@@ -383,9 +383,9 @@ static void fbcon_update_softback(struct vc_data *vc)
                 softback_top = 0;
 }
 
-static void fb_flashcursor(void *private)
+static void fb_flashcursor(struct work_struct *work)
 {
-        struct fb_info *info = private;
+        struct fb_info *info = container_of(work, struct fb_info, queue);
         struct fbcon_ops *ops = info->fbcon_par;
         struct display *p;
         struct vc_data *vc = NULL;
@@ -442,7 +442,7 @@ static void fbcon_add_cursor_timer(struct fb_info *info)
         if ((!info->queue.func || info->queue.func == fb_flashcursor) &&
             !(ops->flags & FBCON_FLAGS_CURSOR_TIMER)) {
                 if (!info->queue.func)
-                        INIT_WORK(&info->queue, fb_flashcursor, info);
+                        INIT_WORK(&info->queue, fb_flashcursor);
 
                 init_timer(&ops->cursor_timer);
                 ops->cursor_timer.function = cursor_timer_handler;
diff --git a/drivers/video/console/softcursor.c b/drivers/video/console/softcursor.c
index 7d07d8383569..f577bd80e020 100644
--- a/drivers/video/console/softcursor.c
+++ b/drivers/video/console/softcursor.c
@@ -1,11 +1,13 @@
 /*
- * linux/drivers/video/softcursor.c -- Generic software cursor for frame buffer devices
+ * linux/drivers/video/softcursor.c
+ *
+ * Generic software cursor for frame buffer devices
  *
  *  Created 14 Nov 2002 by James Simmons
  *
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file COPYING in the main directory of this archive
- * for more details.
+ * This file is subject to the terms and conditions of the GNU General
+ * Public License.  See the file COPYING in the main directory of this
+ * archive for more details.
  */
 
 #include <linux/module.h>
@@ -25,7 +27,7 @@ int soft_cursor(struct fb_info *info, struct fb_cursor *cursor)
         unsigned int buf_align = info->pixmap.buf_align - 1;
         unsigned int i, size, dsize, s_pitch, d_pitch;
         struct fb_image *image;
-        u8 *dst;
+        u8 *src, *dst;
 
         if (info->state != FBINFO_STATE_RUNNING)
                 return 0;
@@ -45,7 +47,8 @@ int soft_cursor(struct fb_info *info, struct fb_cursor *cursor)
                 }
         }
 
-        image = (struct fb_image *) (ops->cursor_src + dsize);
+        src = ops->cursor_src + sizeof(struct fb_image);
+        image = (struct fb_image *)ops->cursor_src;
         *image = cursor->image;
         d_pitch = (s_pitch + scan_align) & ~scan_align;
 
@@ -57,21 +60,18 @@ int soft_cursor(struct fb_info *info, struct fb_cursor *cursor)
                 switch (cursor->rop) {
                 case ROP_XOR:
                         for (i = 0; i < dsize; i++)
-                                ops->cursor_src[i] = image->data[i] ^
-                                        cursor->mask[i];
+                                src[i] = image->data[i] ^ cursor->mask[i];
                         break;
                 case ROP_COPY:
                 default:
                         for (i = 0; i < dsize; i++)
-                                ops->cursor_src[i] = image->data[i] &
-                                        cursor->mask[i];
+                                src[i] = image->data[i] & cursor->mask[i];
                         break;
                 }
         } else
-                memcpy(ops->cursor_src, image->data, dsize);
+                memcpy(src, image->data, dsize);
 
-        fb_pad_aligned_buffer(dst, d_pitch, ops->cursor_src, s_pitch,
-                              image->height);
+        fb_pad_aligned_buffer(dst, d_pitch, src, s_pitch, image->height);
         image->data = dst;
         info->fbops->fb_imageblit(info, image);
         return 0;
diff --git a/drivers/video/console/sticon.c b/drivers/video/console/sticon.c
index 45586aaabd1e..57b21e533036 100644
--- a/drivers/video/console/sticon.c
+++ b/drivers/video/console/sticon.c
@@ -345,7 +345,7 @@ static void sticon_save_screen(struct vc_data *conp)
 {
 }
 
-static struct consw sti_con = {
+static const struct consw sti_con = {
         .owner                  = THIS_MODULE,
         .con_startup            = sticon_startup,
         .con_init               = sticon_init,
diff --git a/drivers/video/console/vgacon.c b/drivers/video/console/vgacon.c
index 0a2c10a1abf8..4a9bde2c839b 100644
--- a/drivers/video/console/vgacon.c
+++ b/drivers/video/console/vgacon.c
@@ -93,27 +93,27 @@ static void vgacon_invert_region(struct vc_data *c, u16 * p, int count);
 static unsigned long vgacon_uni_pagedir[2];
 
 /* Description of the hardware situation */
-static unsigned long    vga_vram_base;          /* Base of video memory */
-static unsigned long    vga_vram_end;           /* End of video memory */
-static int              vga_vram_size;          /* Size of video memory */
-static u16              vga_video_port_reg;     /* Video register select port */
-static u16              vga_video_port_val;     /* Video register value port */
-static unsigned int     vga_video_num_columns;  /* Number of text columns */
-static unsigned int     vga_video_num_lines;    /* Number of text lines */
-static int              vga_can_do_color = 0;   /* Do we support colors? */
-static unsigned int     vga_default_font_height;/* Height of default screen font */
-static unsigned char    vga_video_type;         /* Card type */
-static unsigned char    vga_hardscroll_enabled;
-static unsigned char    vga_hardscroll_user_enable = 1;
+static int              vga_init_done           __read_mostly;
+static unsigned long    vga_vram_base           __read_mostly;  /* Base of video memory */
+static unsigned long    vga_vram_end            __read_mostly;  /* End of video memory */
+static unsigned int     vga_vram_size           __read_mostly;  /* Size of video memory */
+static u16              vga_video_port_reg      __read_mostly;  /* Video register select port */
+static u16              vga_video_port_val      __read_mostly;  /* Video register value port */
+static unsigned int     vga_video_num_columns;                  /* Number of text columns */
+static unsigned int     vga_video_num_lines;                    /* Number of text lines */
+static int              vga_can_do_color        __read_mostly;  /* Do we support colors? */
+static unsigned int     vga_default_font_height __read_mostly;  /* Height of default screen font */
+static unsigned char    vga_video_type          __read_mostly;  /* Card type */
+static unsigned char    vga_hardscroll_enabled  __read_mostly;
+static unsigned char    vga_hardscroll_user_enable __read_mostly = 1;
 static unsigned char    vga_font_is_default = 1;
 static int              vga_vesa_blanked;
 static int              vga_palette_blanked;
 static int              vga_is_gfx;
 static int              vga_512_chars;
 static int              vga_video_font_height;
-static int              vga_scan_lines;
-static unsigned int     vga_rolled_over = 0;
-static int              vga_init_done;
+static int              vga_scan_lines          __read_mostly;
+static unsigned int     vga_rolled_over;
 
 static int __init no_scroll(char *str)
 {
diff --git a/drivers/video/cyberfb.c b/drivers/video/cyberfb.c
index c40e72dafb0e..0b8d5b121152 100644
--- a/drivers/video/cyberfb.c
+++ b/drivers/video/cyberfb.c
@@ -109,8 +109,6 @@ static void cv64_dump(void);
 #define wb_64(regs,reg,dat) (*(((volatile unsigned char *)regs) + reg) = dat)
 #define rb_64(regs, reg) (*(((volatile unsigned char *)regs) + reg))
 
-#define ww_64(regs,reg,dat) (*((volatile unsigned short *)(regs + reg) = dat)
-
 struct cyberfb_par {
         struct fb_var_screeninfo var;
         __u32 type;
@@ -1055,6 +1053,8 @@ int __init cyberfb_init(void)
 
             if (register_framebuffer(&fb_info) < 0) {
                     DPRINTK("EXIT - register_framebuffer failed\n");
+                        if (CyberBase)
+                                iounmap(CyberBase);
                     release_mem_region(CyberMem_phys, 0x400000);
                     release_mem_region(CyberRegs_phys, 0x10000);
                     return -EINVAL;
diff --git a/drivers/video/epson1355fb.c b/drivers/video/epson1355fb.c
index 737257d278f0..29e07c109887 100644
--- a/drivers/video/epson1355fb.c
+++ b/drivers/video/epson1355fb.c
@@ -405,7 +405,7 @@ static inline unsigned long copy_to_user16(void *to, const void *from,
 static ssize_t
 epson1355fb_read(struct file *file, char *buf, size_t count, loff_t * ppos)
 {
-        struct inode *inode = file->f_dentry->d_inode;
+        struct inode *inode = file->f_path.dentry->d_inode;
         int fbidx = iminor(inode);
         struct fb_info *info = registered_fb[fbidx];
         unsigned long p = *ppos;
@@ -437,7 +437,7 @@ static ssize_t
 epson1355fb_write(struct file *file, const char *buf,
                   size_t count, loff_t * ppos)
 {
-        struct inode *inode = file->f_dentry->d_inode;
+        struct inode *inode = file->f_path.dentry->d_inode;
         int fbidx = iminor(inode);
         struct fb_info *info = registered_fb[fbidx];
         unsigned long p = *ppos;
diff --git a/drivers/video/fb_ddc.c b/drivers/video/fb_ddc.c
index 3aa6ebf68f17..f836137a0eda 100644
--- a/drivers/video/fb_ddc.c
+++ b/drivers/video/fb_ddc.c
@@ -20,26 +20,26 @@
 static unsigned char *fb_do_probe_ddc_edid(struct i2c_adapter *adapter)
 {
         unsigned char start = 0x0;
+        unsigned char *buf = kmalloc(EDID_LENGTH, GFP_KERNEL);
         struct i2c_msg msgs[] = {
                 {
                         .addr   = DDC_ADDR,
+                        .flags  = 0,
                         .len    = 1,
                         .buf    = &start,
                 }, {
                         .addr   = DDC_ADDR,
                         .flags  = I2C_M_RD,
                         .len    = EDID_LENGTH,
+                        .buf    = buf,
                 }
         };
-        unsigned char *buf;
 
-        buf = kmalloc(EDID_LENGTH, GFP_KERNEL);
         if (!buf) {
                 dev_warn(&adapter->dev, "unable to allocate memory for EDID "
                          "block.\n");
                 return NULL;
         }
-        msgs[1].buf = buf;
 
         if (i2c_transfer(adapter, msgs, 2) == 2)
                 return buf;
diff --git a/drivers/video/fbcmap.c b/drivers/video/fbcmap.c
index e8b135f3d80d..148108afdd51 100644
--- a/drivers/video/fbcmap.c
+++ b/drivers/video/fbcmap.c
@@ -18,63 +18,64 @@
 
 #include <asm/uaccess.h>
 
-static u16 red2[] = {
+static u16 red2[] __read_mostly = {
     0x0000, 0xaaaa
 };
-static u16 green2[] = {
+static u16 green2[] __read_mostly = {
     0x0000, 0xaaaa
 };
-static u16 blue2[] = {
+static u16 blue2[] __read_mostly = {
     0x0000, 0xaaaa
 };
 
-static u16 red4[] = {
+static u16 red4[] __read_mostly = {
     0x0000, 0xaaaa, 0x5555, 0xffff
 };
-static u16 green4[] = {
+static u16 green4[] __read_mostly = {
     0x0000, 0xaaaa, 0x5555, 0xffff
 };
-static u16 blue4[] = {
+static u16 blue4[] __read_mostly = {
     0x0000, 0xaaaa, 0x5555, 0xffff
 };
 
-static u16 red8[] = {
+static u16 red8[] __read_mostly = {
     0x0000, 0x0000, 0x0000, 0x0000, 0xaaaa, 0xaaaa, 0xaaaa, 0xaaaa
 };
-static u16 green8[] = {
+static u16 green8[] __read_mostly = {
     0x0000, 0x0000, 0xaaaa, 0xaaaa, 0x0000, 0x0000, 0x5555, 0xaaaa
 };
-static u16 blue8[] = {
+static u16 blue8[] __read_mostly = {
     0x0000, 0xaaaa, 0x0000, 0xaaaa, 0x0000, 0xaaaa, 0x0000, 0xaaaa
 };
 
-static u16 red16[] = {
+static u16 red16[] __read_mostly = {
     0x0000, 0x0000, 0x0000, 0x0000, 0xaaaa, 0xaaaa, 0xaaaa, 0xaaaa,
     0x5555, 0x5555, 0x5555, 0x5555, 0xffff, 0xffff, 0xffff, 0xffff
 };
-static u16 green16[] = {
+static u16 green16[] __read_mostly = {
     0x0000, 0x0000, 0xaaaa, 0xaaaa, 0x0000, 0x0000, 0x5555, 0xaaaa,
     0x5555, 0x5555, 0xffff, 0xffff, 0x5555, 0x5555, 0xffff, 0xffff
 };
-static u16 blue16[] = {
+static u16 blue16[] __read_mostly = {
     0x0000, 0xaaaa, 0x0000, 0xaaaa, 0x0000, 0xaaaa, 0x0000, 0xaaaa,
     0x5555, 0xffff, 0x5555, 0xffff, 0x5555, 0xffff, 0x5555, 0xffff
 };
 
-static struct fb_cmap default_2_colors = {
-    0, 2, red2, green2, blue2, NULL
+static const struct fb_cmap default_2_colors = {
+    .len=2, .red=red2, .green=green2, .blue=blue2
 };
-static struct fb_cmap default_8_colors = {
-    0, 8, red8, green8, blue8, NULL
+static const struct fb_cmap default_8_colors = {
+    .len=8, .red=red8, .green=green8, .blue=blue8
 };
-static struct fb_cmap default_4_colors = {
-    0, 4, red4, green4, blue4, NULL
+static const struct fb_cmap default_4_colors = {
+    .len=4, .red=red4, .green=green4, .blue=blue4
 };
-static struct fb_cmap default_16_colors = {
-    0, 16, red16, green16, blue16, NULL
+static const struct fb_cmap default_16_colors = {
+    .len=16, .red=red16, .green=green16, .blue=blue16
 };
 
 
+
 /**
  *      fb_alloc_cmap - allocate a colormap
  *      @cmap: frame buffer colormap structure
@@ -146,7 +147,7 @@ void fb_dealloc_cmap(struct fb_cmap *cmap)
  *      Copy contents of colormap from @from to @to.
  */
 
-int fb_copy_cmap(struct fb_cmap *from, struct fb_cmap *to)
+int fb_copy_cmap(const struct fb_cmap *from, struct fb_cmap *to)
 {
         int tooff = 0, fromoff = 0;
         int size;
@@ -170,7 +171,7 @@ int fb_copy_cmap(struct fb_cmap *from, struct fb_cmap *to)
         return 0;
 }
 
-int fb_cmap_to_user(struct fb_cmap *from, struct fb_cmap_user *to)
+int fb_cmap_to_user(const struct fb_cmap *from, struct fb_cmap_user *to)
 {
         int tooff = 0, fromoff = 0;
         int size;
@@ -282,7 +283,7 @@ int fb_set_user_cmap(struct fb_cmap_user *cmap, struct fb_info *info)
  *
  */
 
-struct fb_cmap *fb_default_cmap(int len)
+const struct fb_cmap *fb_default_cmap(int len)
 {
     if (len <= 2)
         return &default_2_colors;
@@ -305,22 +306,22 @@ void fb_invert_cmaps(void)
 {
     u_int i;
 
-    for (i = 0; i < 2; i++) {
+    for (i = 0; i < ARRAY_SIZE(red2); i++) {
         red2[i] = ~red2[i];
         green2[i] = ~green2[i];
         blue2[i] = ~blue2[i];
     }
-    for (i = 0; i < 4; i++) {
+    for (i = 0; i < ARRAY_SIZE(red4); i++) {
         red4[i] = ~red4[i];
         green4[i] = ~green4[i];
         blue4[i] = ~blue4[i];
     }
-    for (i = 0; i < 8; i++) {
+    for (i = 0; i < ARRAY_SIZE(red8); i++) {
         red8[i] = ~red8[i];
         green8[i] = ~green8[i];
         blue8[i] = ~blue8[i];
     }
-    for (i = 0; i < 16; i++) {
+    for (i = 0; i < ARRAY_SIZE(red16); i++) {
         red16[i] = ~red16[i];
         green16[i] = ~green16[i];
         blue16[i] = ~blue16[i];
diff --git a/drivers/video/fbcvt.c b/drivers/video/fbcvt.c
index b5498999c4ec..0847c5e72cbd 100644
--- a/drivers/video/fbcvt.c
+++ b/drivers/video/fbcvt.c
@@ -57,7 +57,7 @@ struct fb_cvt_data {
         u32 status;
 };
 
-static int fb_cvt_vbi_tab[] = {
+static const unsigned char fb_cvt_vbi_tab[] = {
         4,        /* 4:3      */
         5,        /* 16:9     */
         6,        /* 16:10    */
diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c
index 93ffcdd95f50..3cfea315a48f 100644
--- a/drivers/video/fbmem.c
+++ b/drivers/video/fbmem.c
@@ -52,8 +52,8 @@
 
 #define FBPIXMAPSIZE    (1024 * 8)
 
-struct fb_info *registered_fb[FB_MAX];
-int num_registered_fb;
+struct fb_info *registered_fb[FB_MAX] __read_mostly;
+int num_registered_fb __read_mostly;
 
 /*
  * Helpers
@@ -202,7 +202,7 @@ static void  fb_set_logo_truepalette(struct fb_info *info,
                                             const struct linux_logo *logo,
                                             u32 *palette)
 {
-        unsigned char mask[9] = { 0,0x80,0xc0,0xe0,0xf0,0xf8,0xfc,0xfe,0xff };
+        static const unsigned char mask[] = { 0,0x80,0xc0,0xe0,0xf0,0xf8,0xfc,0xfe,0xff };
         unsigned char redmask, greenmask, bluemask;
         int redshift, greenshift, blueshift;
         int i;
@@ -317,7 +317,7 @@ static struct logo_data {
         int needs_truepalette;
         int needs_cmapreset;
         const struct linux_logo *logo;
-} fb_logo;
+} fb_logo __read_mostly;
 
 static void fb_rotate_logo_ud(const u8 *in, u8 *out, u32 width, u32 height)
 {
@@ -572,7 +572,7 @@ static ssize_t
 fb_read(struct file *file, char __user *buf, size_t count, loff_t *ppos)
 {
         unsigned long p = *ppos;
-        struct inode *inode = file->f_dentry->d_inode;
+        struct inode *inode = file->f_path.dentry->d_inode;
         int fbidx = iminor(inode);
         struct fb_info *info = registered_fb[fbidx];
         u32 *buffer, *dst;
@@ -647,7 +647,7 @@ static ssize_t
 fb_write(struct file *file, const char __user *buf, size_t count, loff_t *ppos)
 {
         unsigned long p = *ppos;
-        struct inode *inode = file->f_dentry->d_inode;
+        struct inode *inode = file->f_path.dentry->d_inode;
         int fbidx = iminor(inode);
         struct fb_info *info = registered_fb[fbidx];
         u32 *buffer, *src;
@@ -1081,7 +1081,7 @@ static int fb_get_fscreeninfo(struct inode *inode, struct file *file,
 static long
 fb_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 {
-        struct inode *inode = file->f_dentry->d_inode;
+        struct inode *inode = file->f_path.dentry->d_inode;
         int fbidx = iminor(inode);
         struct fb_info *info = registered_fb[fbidx];
         struct fb_ops *fb = info->fbops;
@@ -1121,7 +1121,7 @@ fb_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 static int 
 fb_mmap(struct file *file, struct vm_area_struct * vma)
 {
-        int fbidx = iminor(file->f_dentry->d_inode);
+        int fbidx = iminor(file->f_path.dentry->d_inode);
         struct fb_info *info = registered_fb[fbidx];
         struct fb_ops *fb = info->fbops;
         unsigned long off;
@@ -1253,7 +1253,7 @@ fb_release(struct inode *inode, struct file *file)
         return 0;
 }
 
-static struct file_operations fb_fops = {
+static const struct file_operations fb_fops = {
         .owner =        THIS_MODULE,
         .read =         fb_read,
         .write =        fb_write,
@@ -1296,14 +1296,14 @@ register_framebuffer(struct fb_info *fb_info)
                         break;
         fb_info->node = i;
 
-        fb_info->class_device = class_device_create(fb_class, NULL, MKDEV(FB_MAJOR, i),
-                                    fb_info->device, "fb%d", i);
-        if (IS_ERR(fb_info->class_device)) {
+        fb_info->dev = device_create(fb_class, fb_info->device,
+                                     MKDEV(FB_MAJOR, i), "fb%d", i);
+        if (IS_ERR(fb_info->dev)) {
                 /* Not fatal */
-                printk(KERN_WARNING "Unable to create class_device for framebuffer %d; errno = %ld\n", i, PTR_ERR(fb_info->class_device));
-                fb_info->class_device = NULL;
+                printk(KERN_WARNING "Unable to create device for framebuffer %d; errno = %ld\n", i, PTR_ERR(fb_info->dev));
+                fb_info->dev = NULL;
         } else
-                fb_init_class_device(fb_info);
+                fb_init_device(fb_info);
 
         if (fb_info->pixmap.addr == NULL) {
                 fb_info->pixmap.addr = kmalloc(FBPIXMAPSIZE, GFP_KERNEL);
@@ -1356,8 +1356,8 @@ unregister_framebuffer(struct fb_info *fb_info)
         fb_destroy_modelist(&fb_info->modelist);
         registered_fb[i]=NULL;
         num_registered_fb--;
-        fb_cleanup_class_device(fb_info);
-        class_device_destroy(fb_class, MKDEV(FB_MAJOR, i));
+        fb_cleanup_device(fb_info);
+        device_destroy(fb_class, MKDEV(FB_MAJOR, i));
         event.info = fb_info;
         fb_notifier_call_chain(FB_EVENT_FB_UNREGISTERED, &event);
         return 0;
@@ -1459,8 +1459,8 @@ int fb_new_modelist(struct fb_info *info)
         return err;
 }
 
-static char *video_options[FB_MAX];
-static int ofonly;
+static char *video_options[FB_MAX] __read_mostly;
+static int ofonly __read_mostly;
 
 extern const char *global_mode_option;
 
diff --git a/drivers/video/fbmon.c b/drivers/video/fbmon.c
index de93139ccbb5..6b385c39b8b5 100644
--- a/drivers/video/fbmon.c
+++ b/drivers/video/fbmon.c
@@ -58,7 +58,7 @@ struct broken_edid {
         u32 fix;
 };
 
-static struct broken_edid brokendb[] = {
+static const struct broken_edid brokendb[] = {
         /* DEC FR-PCXAV-YZ */
         {
                 .manufacturer = "DEC",
diff --git a/drivers/video/fbsysfs.c b/drivers/video/fbsysfs.c
index d3a50417ed9a..323bdf6fc7d5 100644
--- a/drivers/video/fbsysfs.c
+++ b/drivers/video/fbsysfs.c
@@ -73,7 +73,7 @@ EXPORT_SYMBOL(framebuffer_alloc);
  *
  * @info: frame buffer info structure
  *
- * Drop the reference count of the class_device embedded in the
+ * Drop the reference count of the device embedded in the
  * framebuffer info structure.
  *
  */
@@ -120,10 +120,10 @@ static int mode_string(char *buf, unsigned int offset,
                         m, mode->xres, mode->yres, v, mode->refresh);
 }
 
-static ssize_t store_mode(struct class_device *class_device, const char * buf,
-                          size_t count)
+static ssize_t store_mode(struct device *device, struct device_attribute *attr,
+                          const char *buf, size_t count)
 {
-        struct fb_info *fb_info = class_get_devdata(class_device);
+        struct fb_info *fb_info = dev_get_drvdata(device);
         char mstr[100];
         struct fb_var_screeninfo var;
         struct fb_modelist *modelist;
@@ -151,9 +151,10 @@ static ssize_t store_mode(struct class_device *class_device, const char * buf,
         return -EINVAL;
 }
 
-static ssize_t show_mode(struct class_device *class_device, char *buf)
+static ssize_t show_mode(struct device *device, struct device_attribute *attr,
+                         char *buf)
 {
-        struct fb_info *fb_info = class_get_devdata(class_device);
+        struct fb_info *fb_info = dev_get_drvdata(device);
 
         if (!fb_info->mode)
                 return 0;
@@ -161,10 +162,11 @@ static ssize_t show_mode(struct class_device *class_device, char *buf)
         return mode_string(buf, 0, fb_info->mode);
 }
 
-static ssize_t store_modes(struct class_device *class_device, const char * buf,
-                           size_t count)
+static ssize_t store_modes(struct device *device,
+                           struct device_attribute *attr,
+                           const char *buf, size_t count)
 {
-        struct fb_info *fb_info = class_get_devdata(class_device);
+        struct fb_info *fb_info = dev_get_drvdata(device);
         LIST_HEAD(old_list);
         int i = count / sizeof(struct fb_videomode);
 
@@ -186,9 +188,10 @@ static ssize_t store_modes(struct class_device *class_device, const char * buf,
         return 0;
 }
 
-static ssize_t show_modes(struct class_device *class_device, char *buf)
+static ssize_t show_modes(struct device *device, struct device_attribute *attr,
+                          char *buf)
 {
-        struct fb_info *fb_info = class_get_devdata(class_device);
+        struct fb_info *fb_info = dev_get_drvdata(device);
         unsigned int i;
         struct list_head *pos;
         struct fb_modelist *modelist;
@@ -203,10 +206,10 @@ static ssize_t show_modes(struct class_device *class_device, char *buf)
         return i;
 }
 
-static ssize_t store_bpp(struct class_device *class_device, const char * buf,
-                         size_t count)
+static ssize_t store_bpp(struct device *device, struct device_attribute *attr,
+                         const char *buf, size_t count)
 {
-        struct fb_info *fb_info = class_get_devdata(class_device);
+        struct fb_info *fb_info = dev_get_drvdata(device);
         struct fb_var_screeninfo var;
         char ** last = NULL;
         int err;
@@ -218,16 +221,18 @@ static ssize_t store_bpp(struct class_device *class_device, const char * buf,
         return count;
 }
 
-static ssize_t show_bpp(struct class_device *class_device, char *buf)
+static ssize_t show_bpp(struct device *device, struct device_attribute *attr,
+                        char *buf)
 {
-        struct fb_info *fb_info = class_get_devdata(class_device);
+        struct fb_info *fb_info = dev_get_drvdata(device);
         return snprintf(buf, PAGE_SIZE, "%d\n", fb_info->var.bits_per_pixel);
 }
 
-static ssize_t store_rotate(struct class_device *class_device, const char *buf,
-                            size_t count)
+static ssize_t store_rotate(struct device *device,
+                            struct device_attribute *attr,
+                            const char *buf, size_t count)
 {
-        struct fb_info *fb_info = class_get_devdata(class_device);
+        struct fb_info *fb_info = dev_get_drvdata(device);
         struct fb_var_screeninfo var;
         char **last = NULL;
         int err;
@@ -242,17 +247,19 @@ static ssize_t store_rotate(struct class_device *class_device, const char *buf,
 }
 
 
-static ssize_t show_rotate(struct class_device *class_device, char *buf)
+static ssize_t show_rotate(struct device *device,
+                           struct device_attribute *attr, char *buf)
 {
-        struct fb_info *fb_info = class_get_devdata(class_device);
+        struct fb_info *fb_info = dev_get_drvdata(device);
 
         return snprintf(buf, PAGE_SIZE, "%d\n", fb_info->var.rotate);
 }
 
-static ssize_t store_virtual(struct class_device *class_device,
-                             const char * buf, size_t count)
+static ssize_t store_virtual(struct device *device,
+                             struct device_attribute *attr,
+                             const char *buf, size_t count)
 {
-        struct fb_info *fb_info = class_get_devdata(class_device);
+        struct fb_info *fb_info = dev_get_drvdata(device);
         struct fb_var_screeninfo var;
         char *last = NULL;
         int err;
@@ -269,23 +276,26 @@ static ssize_t store_virtual(struct class_device *class_device,
         return count;
 }
 
-static ssize_t show_virtual(struct class_device *class_device, char *buf)
+static ssize_t show_virtual(struct device *device,
+                            struct device_attribute *attr, char *buf)
 {
-        struct fb_info *fb_info = class_get_devdata(class_device);
+        struct fb_info *fb_info = dev_get_drvdata(device);
         return snprintf(buf, PAGE_SIZE, "%d,%d\n", fb_info->var.xres_virtual,
                         fb_info->var.yres_virtual);
 }
 
-static ssize_t show_stride(struct class_device *class_device, char *buf)
+static ssize_t show_stride(struct device *device,
+                           struct device_attribute *attr, char *buf)
 {
-        struct fb_info *fb_info = class_get_devdata(class_device);
+        struct fb_info *fb_info = dev_get_drvdata(device);
         return snprintf(buf, PAGE_SIZE, "%d\n", fb_info->fix.line_length);
 }
 
-static ssize_t store_blank(struct class_device *class_device, const char * buf,
-                           size_t count)
+static ssize_t store_blank(struct device *device,
+                           struct device_attribute *attr,
+                           const char *buf, size_t count)
 {
-        struct fb_info *fb_info = class_get_devdata(class_device);
+        struct fb_info *fb_info = dev_get_drvdata(device);
         char *last = NULL;
         int err;
 
@@ -299,42 +309,48 @@ static ssize_t store_blank(struct class_device *class_device, const char * buf,
         return count;
 }
 
-static ssize_t show_blank(struct class_device *class_device, char *buf)
+static ssize_t show_blank(struct device *device,
+                          struct device_attribute *attr, char *buf)
 {
-//      struct fb_info *fb_info = class_get_devdata(class_device);
+//      struct fb_info *fb_info = dev_get_drvdata(device);
         return 0;
 }
 
-static ssize_t store_console(struct class_device *class_device,
-                             const char * buf, size_t count)
+static ssize_t store_console(struct device *device,
+                             struct device_attribute *attr,
+                             const char *buf, size_t count)
 {
-//      struct fb_info *fb_info = class_get_devdata(class_device);
+//      struct fb_info *fb_info = dev_get_drvdata(device);
         return 0;
 }
 
-static ssize_t show_console(struct class_device *class_device, char *buf)
+static ssize_t show_console(struct device *device,
+                            struct device_attribute *attr, char *buf)
 {
-//      struct fb_info *fb_info = class_get_devdata(class_device);
+//      struct fb_info *fb_info = dev_get_drvdata(device);
         return 0;
 }
 
-static ssize_t store_cursor(struct class_device *class_device,
-                            const char * buf, size_t count)
+static ssize_t store_cursor(struct device *device,
+                            struct device_attribute *attr,
+                            const char *buf, size_t count)
 {
-//      struct fb_info *fb_info = class_get_devdata(class_device);
+//      struct fb_info *fb_info = dev_get_drvdata(device);
         return 0;
 }
 
-static ssize_t show_cursor(struct class_device *class_device, char *buf)
+static ssize_t show_cursor(struct device *device,
+                           struct device_attribute *attr, char *buf)
 {
-//      struct fb_info *fb_info = class_get_devdata(class_device);
+//      struct fb_info *fb_info = dev_get_drvdata(device);
         return 0;
 }
 
-static ssize_t store_pan(struct class_device *class_device, const char * buf,
-                         size_t count)
+static ssize_t store_pan(struct device *device,
+                         struct device_attribute *attr,
+                         const char *buf, size_t count)
 {
-        struct fb_info *fb_info = class_get_devdata(class_device);
+        struct fb_info *fb_info = dev_get_drvdata(device);
         struct fb_var_screeninfo var;
         char *last = NULL;
         int err;
@@ -355,24 +371,27 @@ static ssize_t store_pan(struct class_device *class_device, const char * buf,
         return count;
 }
 
-static ssize_t show_pan(struct class_device *class_device, char *buf)
+static ssize_t show_pan(struct device *device,
+                        struct device_attribute *attr, char *buf)
 {
-        struct fb_info *fb_info = class_get_devdata(class_device);
+        struct fb_info *fb_info = dev_get_drvdata(device);
         return snprintf(buf, PAGE_SIZE, "%d,%d\n", fb_info->var.xoffset,
                         fb_info->var.xoffset);
 }
 
-static ssize_t show_name(struct class_device *class_device, char *buf)
+static ssize_t show_name(struct device *device,
+                         struct device_attribute *attr, char *buf)
 {
-        struct fb_info *fb_info = class_get_devdata(class_device);
+        struct fb_info *fb_info = dev_get_drvdata(device);
 
         return snprintf(buf, PAGE_SIZE, "%s\n", fb_info->fix.id);
 }
 
-static ssize_t store_fbstate(struct class_device *class_device,
-                        const char *buf, size_t count)
+static ssize_t store_fbstate(struct device *device,
+                             struct device_attribute *attr,
+                             const char *buf, size_t count)
 {
-        struct fb_info *fb_info = class_get_devdata(class_device);
+        struct fb_info *fb_info = dev_get_drvdata(device);
         u32 state;
         char *last = NULL;
 
@@ -385,17 +404,19 @@ static ssize_t store_fbstate(struct class_device *class_device,
         return count;
 }
 
-static ssize_t show_fbstate(struct class_device *class_device, char *buf)
+static ssize_t show_fbstate(struct device *device,
+                            struct device_attribute *attr, char *buf)
 {
-        struct fb_info *fb_info = class_get_devdata(class_device);
+        struct fb_info *fb_info = dev_get_drvdata(device);
         return snprintf(buf, PAGE_SIZE, "%d\n", fb_info->state);
 }
 
 #ifdef CONFIG_FB_BACKLIGHT
-static ssize_t store_bl_curve(struct class_device *class_device,
-                const char *buf, size_t count)
+static ssize_t store_bl_curve(struct device *device,
+                              struct device_attribute *attr,
+                              const char *buf, size_t count)
 {
-        struct fb_info *fb_info = class_get_devdata(class_device);
+        struct fb_info *fb_info = dev_get_drvdata(device);
         u8 tmp_curve[FB_BACKLIGHT_LEVELS];
         unsigned int i;
 
@@ -432,9 +453,10 @@ static ssize_t store_bl_curve(struct class_device *class_device,
         return count;
 }
 
-static ssize_t show_bl_curve(struct class_device *class_device, char *buf)
+static ssize_t show_bl_curve(struct device *device,
+                             struct device_attribute *attr, char *buf)
 {
-        struct fb_info *fb_info = class_get_devdata(class_device);
+        struct fb_info *fb_info = dev_get_drvdata(device);
         ssize_t len = 0;
         unsigned int i;
 
@@ -465,7 +487,7 @@ static ssize_t show_bl_curve(struct class_device *class_device, char *buf)
 /* When cmap is added back in it should be a binary attribute
  * not a text one. Consideration should also be given to converting
  * fbdev to use configfs instead of sysfs */
-static struct class_device_attribute class_device_attrs[] = {
+static struct device_attribute device_attrs[] = {
         __ATTR(bits_per_pixel, S_IRUGO|S_IWUSR, show_bpp, store_bpp),
         __ATTR(blank, S_IRUGO|S_IWUSR, show_blank, store_blank),
         __ATTR(console, S_IRUGO|S_IWUSR, show_console, store_console),
@@ -483,17 +505,16 @@ static struct class_device_attribute class_device_attrs[] = {
 #endif
 };
 
-int fb_init_class_device(struct fb_info *fb_info)
+int fb_init_device(struct fb_info *fb_info)
 {
         int i, error = 0;
 
-        class_set_devdata(fb_info->class_device, fb_info);
+        dev_set_drvdata(fb_info->dev, fb_info);
 
         fb_info->class_flag |= FB_SYSFS_FLAG_ATTR;
 
-        for (i = 0; i < ARRAY_SIZE(class_device_attrs); i++) {
-                error = class_device_create_file(fb_info->class_device,
-                                                 &class_device_attrs[i]);
+        for (i = 0; i < ARRAY_SIZE(device_attrs); i++) {
+                error = device_create_file(fb_info->dev, &device_attrs[i]);
 
                 if (error)
                         break;
@@ -501,22 +522,20 @@ int fb_init_class_device(struct fb_info *fb_info)
 
         if (error) {
                 while (--i >= 0)
-                        class_device_remove_file(fb_info->class_device,
-                                                 &class_device_attrs[i]);
+                        device_remove_file(fb_info->dev, &device_attrs[i]);
                 fb_info->class_flag &= ~FB_SYSFS_FLAG_ATTR;
         }
 
         return 0;
 }
 
-void fb_cleanup_class_device(struct fb_info *fb_info)
+void fb_cleanup_device(struct fb_info *fb_info)
 {
         unsigned int i;
 
         if (fb_info->class_flag & FB_SYSFS_FLAG_ATTR) {
-                for (i = 0; i < ARRAY_SIZE(class_device_attrs); i++)
-                        class_device_remove_file(fb_info->class_device,
-                                                 &class_device_attrs[i]);
+                for (i = 0; i < ARRAY_SIZE(device_attrs); i++)
+                        device_remove_file(fb_info->dev, &device_attrs[i]);
 
                 fb_info->class_flag &= ~FB_SYSFS_FLAG_ATTR;
         }
diff --git a/drivers/video/ffb.c b/drivers/video/ffb.c
index 2a0e8210d398..949141bd44d4 100644
--- a/drivers/video/ffb.c
+++ b/drivers/video/ffb.c
@@ -968,6 +968,8 @@ static int ffb_init_one(struct of_device *op)
 
         if (fb_alloc_cmap(&all->info.cmap, 256, 0)) {
                 printk(KERN_ERR "ffb: Could not allocate color map.\n");
+                of_iounmap(all->par.fbc, sizeof(struct ffb_fbc));
+                of_iounmap(all->par.dac, sizeof(struct ffb_dac));
                 kfree(all);
                 return -ENOMEM;
         }
@@ -978,6 +980,8 @@ static int ffb_init_one(struct of_device *op)
         if (err < 0) {
                 printk(KERN_ERR "ffb: Could not register framebuffer.\n");
                 fb_dealloc_cmap(&all->info.cmap);
+                of_iounmap(all->par.fbc, sizeof(struct ffb_fbc));
+                of_iounmap(all->par.dac, sizeof(struct ffb_dac));
                 kfree(all);
                 return err;
         }
diff --git a/drivers/video/fm2fb.c b/drivers/video/fm2fb.c
index 998374cfae6d..70ff55b14596 100644
--- a/drivers/video/fm2fb.c
+++ b/drivers/video/fm2fb.c
@@ -283,6 +283,7 @@ static int __devinit fm2fb_probe(struct zorro_dev *z,
 
         if (register_framebuffer(info) < 0) {
                 fb_dealloc_cmap(&info->cmap);
+                iounmap(info->screen_base);
                 framebuffer_release(info);
                 zorro_release_device(z);
                 return -EINVAL;
diff --git a/drivers/video/geode/Kconfig b/drivers/video/geode/Kconfig
index 4e173ef20a7d..a814b6c2605c 100644
--- a/drivers/video/geode/Kconfig
+++ b/drivers/video/geode/Kconfig
@@ -23,6 +23,26 @@ config FB_GEODE_GX
 
           If unsure, say N.
 
+config FB_GEODE_GX_SET_FBSIZE
+        bool "Manually specify the Geode GX framebuffer size"
+        depends on FB_GEODE_GX
+        default n
+        ---help---
+          If you want to manually specify the size of your GX framebuffer,
+          say Y here, otherwise say N to dynamically probe it.
+
+          Say N unless you know what you are doing.
+
+config FB_GEODE_GX_FBSIZE
+        hex "Size of the GX framebuffer, in bytes"
+        depends on FB_GEODE_GX_SET_FBSIZE
+        default "0x1600000"
+        ---help---
+          Specify the size of the GX framebuffer.  Normally, you will
+          want this to be MB aligned.  Common values are 0x80000 (8MB)
+          and 0x1600000 (16MB).  Don't change this unless you know what
+          you are doing
+
 config FB_GEODE_GX1
         tristate "AMD Geode GX1 framebuffer support (EXPERIMENTAL)"
         depends on FB && FB_GEODE && EXPERIMENTAL
diff --git a/drivers/video/geode/display_gx.c b/drivers/video/geode/display_gx.c
index 825c3405f5c2..0f16e4bffc6c 100644
--- a/drivers/video/geode/display_gx.c
+++ b/drivers/video/geode/display_gx.c
@@ -21,11 +21,27 @@
 #include "geodefb.h"
 #include "display_gx.h"
 
-int gx_frame_buffer_size(void)
+#ifdef CONFIG_FB_GEODE_GX_SET_FBSIZE
+unsigned int gx_frame_buffer_size(void)
 {
-        /* Assuming 16 MiB. */
-        return 16*1024*1024;
+        return CONFIG_FB_GEODE_GX_FBSIZE;
 }
+#else
+unsigned int gx_frame_buffer_size(void)
+{
+        unsigned int val;
+
+        /* FB size is reported by a virtual register */
+        /* Virtual register class = 0x02 */
+        /* VG_MEM_SIZE(512Kb units) = 0x00 */
+
+        outw(0xFC53, 0xAC1C);
+        outw(0x0200, 0xAC1C);
+
+        val = (unsigned int)(inw(0xAC1E)) & 0xFFl;
+        return (val << 19);
+}
+#endif
 
 int gx_line_delta(int xres, int bpp)
 {
@@ -81,6 +97,7 @@ static void gx_set_mode(struct fb_info *info)
         writel(((info->var.xres * info->var.bits_per_pixel/8) >> 3) + 2,
                par->dc_regs + DC_LINE_SIZE);
 
+
         /* Enable graphics and video data and unmask address lines. */
         dcfg |= DC_DCFG_GDEN | DC_DCFG_VDEN | DC_DCFG_A20M | DC_DCFG_A18M;
 
diff --git a/drivers/video/geode/display_gx.h b/drivers/video/geode/display_gx.h
index 86c623361305..0af33f329e88 100644
--- a/drivers/video/geode/display_gx.h
+++ b/drivers/video/geode/display_gx.h
@@ -11,11 +11,15 @@
 #ifndef __DISPLAY_GX_H__
 #define __DISPLAY_GX_H__
 
-int gx_frame_buffer_size(void);
+unsigned int gx_frame_buffer_size(void);
 int gx_line_delta(int xres, int bpp);
 
 extern struct geode_dc_ops gx_dc_ops;
 
+/* MSR that tells us if a TFT or CRT is attached */
+#define GLD_MSR_CONFIG   0xC0002001
+#define GLD_MSR_CONFIG_DM_FP 0x40
+
 /* Display controller registers */
 
 #define DC_UNLOCK 0x00
@@ -93,4 +97,5 @@ extern struct geode_dc_ops gx_dc_ops;
 #define DC_PAL_ADDRESS 0x70
 #define DC_PAL_DATA    0x74
 
+#define DC_GLIU0_MEM_OFFSET 0x84
 #endif /* !__DISPLAY_GX1_H__ */
diff --git a/drivers/video/geode/gxfb_core.c b/drivers/video/geode/gxfb_core.c
index 0d3643fc6293..cf841efa229a 100644
--- a/drivers/video/geode/gxfb_core.c
+++ b/drivers/video/geode/gxfb_core.c
@@ -35,10 +35,10 @@
 #include "display_gx.h"
 #include "video_gx.h"
 
-static char mode_option[32] = "640x480-16@60";
+static char *mode_option;
 
 /* Modes relevant to the GX (taken from modedb.c) */
-static const struct fb_videomode __initdata gx_modedb[] = {
+static const struct fb_videomode gx_modedb[] __initdata = {
         /* 640x480-60 VESA */
         { NULL, 60, 640, 480, 39682,  48, 16, 33, 10, 96, 2,
           0, FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA },
@@ -240,6 +240,12 @@ static int __init gxfb_map_video_memory(struct fb_info *info, struct pci_dev *de
         if (!info->screen_base)
                 return -ENOMEM;
 
+        /* Set the 16MB aligned base address of the graphics memory region
+         * in the display controller */
+
+        writel(info->fix.smem_start & 0xFF000000,
+                        par->dc_regs + DC_GLIU0_MEM_OFFSET);
+
         dev_info(&dev->dev, "%d Kibyte of video memory at 0x%lx\n",
                  info->fix.smem_len / 1024, info->fix.smem_start);
 
@@ -302,6 +308,7 @@ static int __init gxfb_probe(struct pci_dev *pdev, const struct pci_device_id *i
         struct geodefb_par *par;
         struct fb_info *info;
         int ret;
+        unsigned long val;
 
         info = gxfb_init_fbinfo(&pdev->dev);
         if (!info)
@@ -317,6 +324,15 @@ static int __init gxfb_probe(struct pci_dev *pdev, const struct pci_device_id *i
                 goto err;
         }
 
+        /* Figure out if this is a TFT or CRT part */
+
+        rdmsrl(GLD_MSR_CONFIG, val);
+
+        if ((val & GLD_MSR_CONFIG_DM_FP) == GLD_MSR_CONFIG_DM_FP)
+                par->enable_crt = 0;
+        else
+                par->enable_crt = 1;
+
         ret = fb_find_mode(&info->var, info, mode_option,
                            gx_modedb, ARRAY_SIZE(gx_modedb), NULL, 16);
         if (ret == 0 || ret == 4) {
@@ -325,7 +341,8 @@ static int __init gxfb_probe(struct pci_dev *pdev, const struct pci_device_id *i
                 goto err;
         }
 
-        /* Clear the frame buffer of garbage. */
+
+        /* Clear the frame buffer of garbage. */
         memset_io(info->screen_base, 0, info->fix.smem_len);
 
         gxfb_check_var(&info->var, info);
@@ -380,7 +397,7 @@ static void gxfb_remove(struct pci_dev *pdev)
 }
 
 static struct pci_device_id gxfb_id_table[] = {
-        { PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_CS5535_VIDEO,
+        { PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_GX_VIDEO,
           PCI_ANY_ID, PCI_ANY_ID, PCI_BASE_CLASS_DISPLAY << 16,
           0xff0000, 0 },
         { 0, }
@@ -395,11 +412,35 @@ static struct pci_driver gxfb_driver = {
         .remove         = gxfb_remove,
 };
 
+#ifndef MODULE
+static int __init gxfb_setup(char *options)
+{
+
+        char *opt;
+
+        if (!options || !*options)
+                return 0;
+
+        while ((opt = strsep(&options, ",")) != NULL) {
+                if (!*opt)
+                        continue;
+
+                mode_option = opt;
+        }
+
+        return 0;
+}
+#endif
+
 static int __init gxfb_init(void)
 {
 #ifndef MODULE
-        if (fb_get_options("gxfb", NULL))
+        char *option = NULL;
+
+        if (fb_get_options("gxfb", &option))
                 return -ENODEV;
+
+        gxfb_setup(option);
 #endif
         return pci_register_driver(&gxfb_driver);
 }
@@ -412,8 +453,8 @@ static void __exit gxfb_cleanup(void)
 module_init(gxfb_init);
 module_exit(gxfb_cleanup);
 
-module_param_string(mode, mode_option, sizeof(mode_option), 0444);
-MODULE_PARM_DESC(mode, "video mode (<x>x<y>[-<bpp>][@<refr>])");
+module_param(mode_option, charp, 0);
+MODULE_PARM_DESC(mode_option, "video mode (<x>x<y>[-<bpp>][@<refr>])");
 
 MODULE_DESCRIPTION("Framebuffer driver for the AMD Geode GX");
 MODULE_LICENSE("GPL");
diff --git a/drivers/video/geode/video_gx.c b/drivers/video/geode/video_gx.c
index 2b2a7880ea75..7f3f18d06718 100644
--- a/drivers/video/geode/video_gx.c
+++ b/drivers/video/geode/video_gx.c
@@ -175,13 +175,88 @@ static void gx_set_dclk_frequency(struct fb_info *info)
         } while (timeout-- && !(dotpll & MSR_GLCP_DOTPLL_LOCK));
 }
 
+static void
+gx_configure_tft(struct fb_info *info)
+{
+        struct geodefb_par *par = info->par;
+        unsigned long val;
+        unsigned long fp;
+
+        /* Set up the DF pad select MSR */
+
+        rdmsrl(GX_VP_MSR_PAD_SELECT, val);
+        val &= ~GX_VP_PAD_SELECT_MASK;
+        val |= GX_VP_PAD_SELECT_TFT;
+        wrmsrl(GX_VP_MSR_PAD_SELECT, val);
+
+        /* Turn off the panel */
+
+        fp = readl(par->vid_regs + GX_FP_PM);
+        fp &= ~GX_FP_PM_P;
+        writel(fp, par->vid_regs + GX_FP_PM);
+
+        /* Set timing 1 */
+
+        fp = readl(par->vid_regs + GX_FP_PT1);
+        fp &= GX_FP_PT1_VSIZE_MASK;
+        fp |= info->var.yres << GX_FP_PT1_VSIZE_SHIFT;
+        writel(fp, par->vid_regs + GX_FP_PT1);
+
+        /* Timing 2 */
+        /* Set bits that are always on for TFT */
+
+        fp = 0x0F100000;
+
+        /* Add sync polarity */
+
+        if (!(info->var.sync & FB_SYNC_VERT_HIGH_ACT))
+                fp |= GX_FP_PT2_VSP;
+
+        if (!(info->var.sync & FB_SYNC_HOR_HIGH_ACT))
+                fp |= GX_FP_PT2_HSP;
+
+        writel(fp, par->vid_regs + GX_FP_PT2);
+
+        /*  Set the dither control */
+        writel(0x70, par->vid_regs + GX_FP_DFC);
+
+        /* Enable the FP data and power (in case the BIOS didn't) */
+
+        fp = readl(par->vid_regs + GX_DCFG);
+        fp |= GX_DCFG_FP_PWR_EN | GX_DCFG_FP_DATA_EN;
+        writel(fp, par->vid_regs + GX_DCFG);
+
+        /* Unblank the panel */
+
+        fp = readl(par->vid_regs + GX_FP_PM);
+        fp |= GX_FP_PM_P;
+        writel(fp, par->vid_regs + GX_FP_PM);
+}
+
 static void gx_configure_display(struct fb_info *info)
 {
         struct geodefb_par *par = info->par;
-        u32 dcfg, fp_pm;
+        u32 dcfg, misc;
+
+        /* Set up the MISC register */
+
+        misc = readl(par->vid_regs + GX_MISC);
+
+        /* Power up the DAC */
+        misc &= ~(GX_MISC_A_PWRDN | GX_MISC_DAC_PWRDN);
+
+        /* Disable gamma correction */
+        misc |= GX_MISC_GAM_EN;
+
+        writel(misc, par->vid_regs + GX_MISC);
 
+        /* Write the display configuration */
         dcfg = readl(par->vid_regs + GX_DCFG);
 
+        /* Disable hsync and vsync */
+        dcfg &= ~(GX_DCFG_VSYNC_EN | GX_DCFG_HSYNC_EN);
+        writel(dcfg, par->vid_regs + GX_DCFG);
+
         /* Clear bits from existing mode. */
         dcfg &= ~(GX_DCFG_CRT_SYNC_SKW_MASK
                   | GX_DCFG_CRT_HSYNC_POL   | GX_DCFG_CRT_VSYNC_POL
@@ -199,12 +274,19 @@ static void gx_configure_display(struct fb_info *info)
         if (info->var.sync & FB_SYNC_VERT_HIGH_ACT)
                 dcfg |= GX_DCFG_CRT_VSYNC_POL;
 
+        /* Enable the display logic */
+        /* Set up the DACS to blank normally */
+
+        dcfg |= GX_DCFG_CRT_EN | GX_DCFG_DAC_BL_EN;
+
+        /* Enable the external DAC VREF? */
+
         writel(dcfg, par->vid_regs + GX_DCFG);
 
-        /* Power on flat panel. */
-        fp_pm = readl(par->vid_regs + GX_FP_PM);
-        fp_pm |= GX_FP_PM_P;
-        writel(fp_pm, par->vid_regs + GX_FP_PM);
+        /* Set up the flat panel (if it is enabled) */
+
+        if (par->enable_crt == 0)
+                gx_configure_tft(info);
 }
 
 static int gx_blank_display(struct fb_info *info, int blank_mode)
@@ -245,12 +327,15 @@ static int gx_blank_display(struct fb_info *info, int blank_mode)
         writel(dcfg, par->vid_regs + GX_DCFG);
 
         /* Power on/off flat panel. */
-        fp_pm = readl(par->vid_regs + GX_FP_PM);
-        if (blank_mode == FB_BLANK_POWERDOWN)
-                fp_pm &= ~GX_FP_PM_P;
-        else
-                fp_pm |= GX_FP_PM_P;
-        writel(fp_pm, par->vid_regs + GX_FP_PM);
+
+        if (par->enable_crt == 0) {
+                fp_pm = readl(par->vid_regs + GX_FP_PM);
+                if (blank_mode == FB_BLANK_POWERDOWN)
+                        fp_pm &= ~GX_FP_PM_P;
+                else
+                        fp_pm |= GX_FP_PM_P;
+                writel(fp_pm, par->vid_regs + GX_FP_PM);
+        }
 
         return 0;
 }
diff --git a/drivers/video/geode/video_gx.h b/drivers/video/geode/video_gx.h
index 2d9211f3ed84..ce28d8f382dc 100644
--- a/drivers/video/geode/video_gx.h
+++ b/drivers/video/geode/video_gx.h
@@ -13,6 +13,11 @@
 
 extern struct geode_vid_ops gx_vid_ops;
 
+/* GX Flatpanel control MSR */
+#define GX_VP_MSR_PAD_SELECT           0xC0002011
+#define GX_VP_PAD_SELECT_MASK          0x3FFFFFFF
+#define GX_VP_PAD_SELECT_TFT           0x1FFFFFFF
+
 /* Geode GX video processor registers */
 
 #define GX_DCFG         0x0008
@@ -20,6 +25,8 @@ extern struct geode_vid_ops gx_vid_ops;
 #  define GX_DCFG_HSYNC_EN              0x00000002
 #  define GX_DCFG_VSYNC_EN              0x00000004
 #  define GX_DCFG_DAC_BL_EN             0x00000008
+#  define GX_DCFG_FP_PWR_EN             0x00000040
+#  define GX_DCFG_FP_DATA_EN            0x00000080
 #  define GX_DCFG_CRT_HSYNC_POL         0x00000100
 #  define GX_DCFG_CRT_VSYNC_POL         0x00000200
 #  define GX_DCFG_CRT_SYNC_SKW_MASK     0x0001C000
@@ -28,10 +35,28 @@ extern struct geode_vid_ops gx_vid_ops;
 #  define GX_DCFG_GV_GAM                0x00200000
 #  define GX_DCFG_DAC_VREF              0x04000000
 
+/* Geode GX MISC video configuration */
+
+#define GX_MISC 0x50
+#define GX_MISC_GAM_EN     0x00000001
+#define GX_MISC_DAC_PWRDN  0x00000400
+#define GX_MISC_A_PWRDN    0x00000800
+
 /* Geode GX flat panel display control registers */
+
+#define GX_FP_PT1 0x0400
+#define GX_FP_PT1_VSIZE_MASK 0x7FF0000
+#define GX_FP_PT1_VSIZE_SHIFT 16
+
+#define GX_FP_PT2 0x408
+#define GX_FP_PT2_VSP (1 << 23)
+#define GX_FP_PT2_HSP (1 << 22)
+
 #define GX_FP_PM 0x410
 #  define GX_FP_PM_P 0x01000000
 
+#define GX_FP_DFC 0x418
+
 /* Geode GX clock control MSRs */
 
 #define MSR_GLCP_SYS_RSTPLL     0x4c000014
diff --git a/drivers/video/gxt4500.c b/drivers/video/gxt4500.c
new file mode 100644
index 000000000000..3adf6ab0768f
--- /dev/null
+++ b/drivers/video/gxt4500.c
@@ -0,0 +1,741 @@
+/*
+ * Frame buffer device for IBM GXT4500P display adaptor
+ *
+ * Copyright (C) 2006 Paul Mackerras, IBM Corp. <paulus@samba.org>
+ */
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/fb.h>
+#include <linux/console.h>
+#include <linux/pci.h>
+#include <linux/pci_ids.h>
+#include <linux/delay.h>
+
+#define PCI_DEVICE_ID_IBM_GXT4500P      0x21c
+
+/* GXT4500P registers */
+
+/* Registers in PCI config space */
+#define CFG_ENDIAN0             0x40
+
+/* Misc control/status registers */
+#define STATUS                  0x1000
+#define CTRL_REG0               0x1004
+#define   CR0_HALT_DMA                  0x4
+#define   CR0_RASTER_RESET              0x8
+#define   CR0_GEOM_RESET                0x10
+#define   CR0_MEM_CTRLER_RESET          0x20
+
+/* Framebuffer control registers */
+#define FB_AB_CTRL              0x1100
+#define FB_CD_CTRL              0x1104
+#define FB_WID_CTRL             0x1108
+#define FB_Z_CTRL               0x110c
+#define FB_VGA_CTRL             0x1110
+#define REFRESH_AB_CTRL         0x1114
+#define REFRESH_CD_CTRL         0x1118
+#define FB_OVL_CTRL             0x111c
+#define   FB_CTRL_TYPE                  0x80000000
+#define   FB_CTRL_WIDTH_MASK            0x007f0000
+#define   FB_CTRL_WIDTH_SHIFT           16
+#define   FB_CTRL_START_SEG_MASK        0x00003fff
+
+#define REFRESH_START           0x1098
+#define REFRESH_SIZE            0x109c
+
+/* "Direct" framebuffer access registers */
+#define DFA_FB_A                0x11e0
+#define DFA_FB_B                0x11e4
+#define DFA_FB_C                0x11e8
+#define DFA_FB_D                0x11ec
+#define   DFA_FB_ENABLE                 0x80000000
+#define   DFA_FB_BASE_MASK              0x03f00000
+#define   DFA_FB_STRIDE_1k              0x00000000
+#define   DFA_FB_STRIDE_2k              0x00000010
+#define   DFA_FB_STRIDE_4k              0x00000020
+#define   DFA_PIX_8BIT                  0x00000000
+#define   DFA_PIX_16BIT_565             0x00000001
+#define   DFA_PIX_16BIT_1555            0x00000002
+#define   DFA_PIX_24BIT                 0x00000004
+#define   DFA_PIX_32BIT                 0x00000005
+
+/* maps DFA_PIX_* to pixel size in bytes */
+static const unsigned char pixsize[] = {
+        1, 2, 2, 2, 4, 4
+};
+
+/* Display timing generator registers */
+#define DTG_CONTROL             0x1900
+#define   DTG_CTL_SCREEN_REFRESH        2
+#define   DTG_CTL_ENABLE                1
+#define DTG_HORIZ_EXTENT        0x1904
+#define DTG_HORIZ_DISPLAY       0x1908
+#define DTG_HSYNC_START         0x190c
+#define DTG_HSYNC_END           0x1910
+#define DTG_HSYNC_END_COMP      0x1914
+#define DTG_VERT_EXTENT         0x1918
+#define DTG_VERT_DISPLAY        0x191c
+#define DTG_VSYNC_START         0x1920
+#define DTG_VSYNC_END           0x1924
+#define DTG_VERT_SHORT          0x1928
+
+/* PLL/RAMDAC registers */
+#define DISP_CTL                0x402c
+#define   DISP_CTL_OFF                  2
+#define SYNC_CTL                0x4034
+#define   SYNC_CTL_SYNC_ON_RGB          1
+#define   SYNC_CTL_SYNC_OFF             2
+#define   SYNC_CTL_HSYNC_INV            8
+#define   SYNC_CTL_VSYNC_INV            0x10
+#define   SYNC_CTL_HSYNC_OFF            0x20
+#define   SYNC_CTL_VSYNC_OFF            0x40
+
+#define PLL_M                   0x4040
+#define PLL_N                   0x4044
+#define PLL_POSTDIV             0x4048
+
+/* Hardware cursor */
+#define CURSOR_X                0x4078
+#define CURSOR_Y                0x407c
+#define CURSOR_HOTSPOT          0x4080
+#define CURSOR_MODE             0x4084
+#define   CURSOR_MODE_OFF               0
+#define   CURSOR_MODE_4BPP              1
+#define CURSOR_PIXMAP           0x5000
+#define CURSOR_CMAP             0x7400
+
+/* Window attribute table */
+#define WAT_FMT                 0x4100
+#define   WAT_FMT_24BIT                 0
+#define   WAT_FMT_16BIT_565             1
+#define   WAT_FMT_16BIT_1555            2
+#define   WAT_FMT_32BIT                 3       /* 0 vs. 3 is a guess */
+#define   WAT_FMT_8BIT_332              9
+#define   WAT_FMT_8BIT                  0xa
+#define   WAT_FMT_NO_CMAP               4       /* ORd in to other values */
+#define WAT_CMAP_OFFSET         0x4104          /* 4-bit value gets << 6 */
+#define WAT_CTRL                0x4108
+#define   WAT_CTRL_SEL_B                1       /* select B buffer if 1 */
+#define   WAT_CTRL_NO_INC               2
+#define WAT_GAMMA_CTRL          0x410c
+#define   WAT_GAMMA_DISABLE             1       /* disables gamma cmap */
+#define WAT_OVL_CTRL            0x430c          /* controls overlay */
+
+/* Indexed by DFA_PIX_* values */
+static const unsigned char watfmt[] = {
+        WAT_FMT_8BIT, WAT_FMT_16BIT_565, WAT_FMT_16BIT_1555, 0,
+        WAT_FMT_24BIT, WAT_FMT_32BIT
+};
+
+/* Colormap array; 1k entries of 4 bytes each */
+#define CMAP                    0x6000
+
+#define readreg(par, reg)       readl((par)->regs + (reg))
+#define writereg(par, reg, val) writel((val), (par)->regs + (reg))
+
+struct gxt4500_par {
+        void __iomem *regs;
+
+        int pixfmt;             /* pixel format, see DFA_PIX_* values */
+
+        /* PLL parameters */
+        int pll_m;              /* ref clock divisor */
+        int pll_n;              /* VCO divisor */
+        int pll_pd1;            /* first post-divisor */
+        int pll_pd2;            /* second post-divisor */
+
+        u32 pseudo_palette[16]; /* used in color blits */
+};
+
+/* mode requested by user */
+static char *mode_option;
+
+/* default mode: 1280x1024 @ 60 Hz, 8 bpp */
+static const struct fb_videomode defaultmode __devinitdata = {
+        .refresh = 60,
+        .xres = 1280,
+        .yres = 1024,
+        .pixclock = 9295,
+        .left_margin = 248,
+        .right_margin = 48,
+        .upper_margin = 38,
+        .lower_margin = 1,
+        .hsync_len = 112,
+        .vsync_len = 3,
+        .vmode = FB_VMODE_NONINTERLACED
+};
+
+/*
+ * The refclk and VCO dividers appear to use a linear feedback shift
+ * register, which gets reloaded when it reaches a terminal value, at
+ * which point the divider output is toggled.  Thus one can obtain
+ * whatever divisor is required by putting the appropriate value into
+ * the reload register.  For a divisor of N, one puts the value from
+ * the LFSR sequence that comes N-1 places before the terminal value
+ * into the reload register.
+ */
+
+static const unsigned char mdivtab[] = {
+/* 1 */               0x3f, 0x00, 0x20, 0x10, 0x28, 0x14, 0x2a, 0x15, 0x0a,
+/* 10 */        0x25, 0x32, 0x19, 0x0c, 0x26, 0x13, 0x09, 0x04, 0x22, 0x11,
+/* 20 */        0x08, 0x24, 0x12, 0x29, 0x34, 0x1a, 0x2d, 0x36, 0x1b, 0x0d,
+/* 30 */        0x06, 0x23, 0x31, 0x38, 0x1c, 0x2e, 0x17, 0x0b, 0x05, 0x02,
+/* 40 */        0x21, 0x30, 0x18, 0x2c, 0x16, 0x2b, 0x35, 0x3a, 0x1d, 0x0e,
+/* 50 */        0x27, 0x33, 0x39, 0x3c, 0x1e, 0x2f, 0x37, 0x3b, 0x3d, 0x3e,
+/* 60 */        0x1f, 0x0f, 0x07, 0x03, 0x01,
+};
+
+static const unsigned char ndivtab[] = {
+/* 2 */                     0x00, 0x80, 0xc0, 0xe0, 0xf0, 0x78, 0xbc, 0x5e,
+/* 10 */        0x2f, 0x17, 0x0b, 0x85, 0xc2, 0xe1, 0x70, 0x38, 0x9c, 0x4e,
+/* 20 */        0xa7, 0xd3, 0xe9, 0xf4, 0xfa, 0xfd, 0xfe, 0x7f, 0xbf, 0xdf,
+/* 30 */        0xef, 0x77, 0x3b, 0x1d, 0x8e, 0xc7, 0xe3, 0x71, 0xb8, 0xdc,
+/* 40 */        0x6e, 0xb7, 0x5b, 0x2d, 0x16, 0x8b, 0xc5, 0xe2, 0xf1, 0xf8,
+/* 50 */        0xfc, 0x7e, 0x3f, 0x9f, 0xcf, 0x67, 0xb3, 0xd9, 0x6c, 0xb6,
+/* 60 */        0xdb, 0x6d, 0x36, 0x9b, 0x4d, 0x26, 0x13, 0x89, 0xc4, 0x62,
+/* 70 */        0xb1, 0xd8, 0xec, 0xf6, 0xfb, 0x7d, 0xbe, 0x5f, 0xaf, 0x57,
+/* 80 */        0x2b, 0x95, 0x4a, 0x25, 0x92, 0x49, 0xa4, 0x52, 0x29, 0x94,
+/* 90 */        0xca, 0x65, 0xb2, 0x59, 0x2c, 0x96, 0xcb, 0xe5, 0xf2, 0x79,
+/* 100 */       0x3c, 0x1e, 0x0f, 0x07, 0x83, 0x41, 0x20, 0x90, 0x48, 0x24,
+/* 110 */       0x12, 0x09, 0x84, 0x42, 0xa1, 0x50, 0x28, 0x14, 0x8a, 0x45,
+/* 120 */       0xa2, 0xd1, 0xe8, 0x74, 0xba, 0xdd, 0xee, 0xf7, 0x7b, 0x3d,
+/* 130 */       0x9e, 0x4f, 0x27, 0x93, 0xc9, 0xe4, 0x72, 0x39, 0x1c, 0x0e,
+/* 140 */       0x87, 0xc3, 0x61, 0x30, 0x18, 0x8c, 0xc6, 0x63, 0x31, 0x98,
+/* 150 */       0xcc, 0xe6, 0x73, 0xb9, 0x5c, 0x2e, 0x97, 0x4b, 0xa5, 0xd2,
+/* 160 */       0x69, 0xb4, 0xda, 0xed, 0x76, 0xbb, 0x5d, 0xae, 0xd7, 0x6b,
+/* 170 */       0xb5, 0x5a, 0xad, 0x56, 0xab, 0xd5, 0x6a, 0x35, 0x1a, 0x8d,
+/* 180 */       0x46, 0x23, 0x11, 0x88, 0x44, 0x22, 0x91, 0xc8, 0x64, 0x32,
+/* 190 */       0x19, 0x0c, 0x86, 0x43, 0x21, 0x10, 0x08, 0x04, 0x02, 0x81,
+/* 200 */       0x40, 0xa0, 0xd0, 0x68, 0x34, 0x9a, 0xcd, 0x66, 0x33, 0x99,
+/* 210 */       0x4c, 0xa6, 0x53, 0xa9, 0xd4, 0xea, 0x75, 0x3a, 0x9d, 0xce,
+/* 220 */       0xe7, 0xf3, 0xf9, 0x7c, 0x3e, 0x1f, 0x8f, 0x47, 0xa3, 0x51,
+/* 230 */       0xa8, 0x54, 0xaa, 0x55, 0x2a, 0x15, 0x0a, 0x05, 0x82, 0xc1,
+/* 240 */       0x60, 0xb0, 0x58, 0xac, 0xd6, 0xeb, 0xf5, 0x7a, 0xbd, 0xde,
+/* 250 */       0x6f, 0x37, 0x1b, 0x0d, 0x06, 0x03, 0x01,
+};
+
+#define REF_PERIOD_PS   9259    /* period of reference clock in ps */
+
+static int calc_pll(int period_ps, struct gxt4500_par *par)
+{
+        int m, n, pdiv1, pdiv2, postdiv;
+        int pll_period, best_error, t;
+
+        /* only deal with range 1MHz - 400MHz */
+        if (period_ps < 2500 || period_ps > 1000000)
+                return -1;
+
+        best_error = 1000000;
+        for (pdiv1 = 1; pdiv1 <= 8; ++pdiv1) {
+                for (pdiv2 = 1; pdiv2 <= pdiv1; ++pdiv2) {
+                        postdiv = pdiv1 * pdiv2;
+                        pll_period = (period_ps + postdiv - 1) / postdiv;
+                        /* keep pll in range 500..1250 MHz */
+                        if (pll_period < 800 || pll_period > 2000)
+                                continue;
+                        for (m = 3; m <= 40; ++m) {
+                                n = REF_PERIOD_PS * m * postdiv / period_ps;
+                                if (n < 5 || n > 256)
+                                        continue;
+                                t = REF_PERIOD_PS * m * postdiv / n;
+                                t -= period_ps;
+                                if (t >= 0 && t < best_error) {
+                                        par->pll_m = m;
+                                        par->pll_n = n;
+                                        par->pll_pd1 = pdiv1;
+                                        par->pll_pd2 = pdiv2;
+                                        best_error = t;
+                                }
+                        }
+                }
+        }
+        if (best_error == 1000000)
+                return -1;
+        return 0;
+}
+
+static int calc_pixclock(struct gxt4500_par *par)
+{
+        return REF_PERIOD_PS * par->pll_m * par->pll_pd1 * par->pll_pd2
+                / par->pll_n;
+}
+
+static int gxt4500_var_to_par(struct fb_var_screeninfo *var,
+                              struct gxt4500_par *par)
+{
+        if (var->xres + var->xoffset > var->xres_virtual ||
+            var->yres + var->yoffset > var->yres_virtual ||
+            var->xres_virtual > 4096)
+                return -EINVAL;
+        if ((var->vmode & FB_VMODE_MASK) != FB_VMODE_NONINTERLACED)
+                return -EINVAL;
+
+        if (calc_pll(var->pixclock, par) < 0)
+                return -EINVAL;
+
+        switch (var->bits_per_pixel) {
+        case 32:
+                if (var->transp.length)
+                        par->pixfmt = DFA_PIX_32BIT;
+                else
+                        par->pixfmt = DFA_PIX_24BIT;
+                break;
+        case 24:
+                par->pixfmt = DFA_PIX_24BIT;
+                break;
+        case 16:
+                if (var->green.length == 5)
+                        par->pixfmt = DFA_PIX_16BIT_1555;
+                else
+                        par->pixfmt = DFA_PIX_16BIT_565;
+                break;
+        case 8:
+                par->pixfmt = DFA_PIX_8BIT;
+                break;
+        default:
+                return -EINVAL;
+        }
+
+        return 0;
+}
+
+static const struct fb_bitfield eightbits = {0, 8};
+static const struct fb_bitfield nobits = {0, 0};
+
+static void gxt4500_unpack_pixfmt(struct fb_var_screeninfo *var,
+                                  int pixfmt)
+{
+        var->bits_per_pixel = pixsize[pixfmt] * 8;
+        var->red = eightbits;
+        var->green = eightbits;
+        var->blue = eightbits;
+        var->transp = nobits;
+
+        switch (pixfmt) {
+        case DFA_PIX_16BIT_565:
+                var->red.length = 5;
+                var->green.length = 6;
+                var->blue.length = 5;
+                break;
+        case DFA_PIX_16BIT_1555:
+                var->red.length = 5;
+                var->green.length = 5;
+                var->blue.length = 5;
+                var->transp.length = 1;
+                break;
+        case DFA_PIX_32BIT:
+                var->transp.length = 8;
+                break;
+        }
+        if (pixfmt != DFA_PIX_8BIT) {
+                var->green.offset = var->red.length;
+                var->blue.offset = var->green.offset + var->green.length;
+                if (var->transp.length)
+                        var->transp.offset =
+                                var->blue.offset + var->blue.length;
+        }
+}
+
+static int gxt4500_check_var(struct fb_var_screeninfo *var,
+                             struct fb_info *info)
+{
+        struct gxt4500_par par;
+        int err;
+
+        par = *(struct gxt4500_par *)info->par;
+        err = gxt4500_var_to_par(var, &par);
+        if (!err) {
+                var->pixclock = calc_pixclock(&par);
+                gxt4500_unpack_pixfmt(var, par.pixfmt);
+        }
+        return err;
+}
+
+static int gxt4500_set_par(struct fb_info *info)
+{
+        struct gxt4500_par *par = info->par;
+        struct fb_var_screeninfo *var = &info->var;
+        int err;
+        u32 ctrlreg;
+        unsigned int dfa_ctl, pixfmt, stride;
+        unsigned int wid_tiles, i;
+        unsigned int prefetch_pix, htot;
+        struct gxt4500_par save_par;
+
+        save_par = *par;
+        err = gxt4500_var_to_par(var, par);
+        if (err) {
+                *par = save_par;
+                return err;
+        }
+
+        /* turn off DTG for now */
+        ctrlreg = readreg(par, DTG_CONTROL);
+        ctrlreg &= ~(DTG_CTL_ENABLE | DTG_CTL_SCREEN_REFRESH);
+        writereg(par, DTG_CONTROL, ctrlreg);
+
+        /* set PLL registers */
+        writereg(par, PLL_M, mdivtab[par->pll_m - 1]);
+        writereg(par, PLL_N, ndivtab[par->pll_n - 2]);
+        writereg(par, PLL_POSTDIV,
+                 ((8 - par->pll_pd1) << 3) | (8 - par->pll_pd2));
+        msleep(20);
+
+        /* turn off hardware cursor */
+        writereg(par, CURSOR_MODE, CURSOR_MODE_OFF);
+
+        /* reset raster engine */
+        writereg(par, CTRL_REG0, CR0_RASTER_RESET | (CR0_RASTER_RESET << 16));
+        udelay(10);
+        writereg(par, CTRL_REG0, CR0_RASTER_RESET << 16);
+
+        /* set display timing generator registers */
+        htot = var->xres + var->left_margin + var->right_margin +
+                var->hsync_len;
+        writereg(par, DTG_HORIZ_EXTENT, htot - 1);
+        writereg(par, DTG_HORIZ_DISPLAY, var->xres - 1);
+        writereg(par, DTG_HSYNC_START, var->xres + var->right_margin - 1);
+        writereg(par, DTG_HSYNC_END,
+                 var->xres + var->right_margin + var->hsync_len - 1);
+        writereg(par, DTG_HSYNC_END_COMP,
+                 var->xres + var->right_margin + var->hsync_len - 1);
+        writereg(par, DTG_VERT_EXTENT,
+                 var->yres + var->upper_margin + var->lower_margin +
+                 var->vsync_len - 1);
+        writereg(par, DTG_VERT_DISPLAY, var->yres - 1);
+        writereg(par, DTG_VSYNC_START, var->yres + var->lower_margin - 1);
+        writereg(par, DTG_VSYNC_END,
+                 var->yres + var->lower_margin + var->vsync_len - 1);
+        prefetch_pix = 3300000 / var->pixclock;
+        if (prefetch_pix >= htot)
+                prefetch_pix = htot - 1;
+        writereg(par, DTG_VERT_SHORT, htot - prefetch_pix - 1);
+        ctrlreg |= DTG_CTL_ENABLE | DTG_CTL_SCREEN_REFRESH;
+        writereg(par, DTG_CONTROL, ctrlreg);
+
+        /* calculate stride in DFA aperture */
+        if (var->xres_virtual > 2048) {
+                stride = 4096;
+                dfa_ctl = DFA_FB_STRIDE_4k;
+        } else if (var->xres_virtual > 1024) {
+                stride = 2048;
+                dfa_ctl = DFA_FB_STRIDE_2k;
+        } else {
+                stride = 1024;
+                dfa_ctl = DFA_FB_STRIDE_1k;
+        }
+
+        /* Set up framebuffer definition */
+        wid_tiles = (var->xres_virtual + 63) >> 6;
+
+        /* XXX add proper FB allocation here someday */
+        writereg(par, FB_AB_CTRL, FB_CTRL_TYPE | (wid_tiles << 16) | 0);
+        writereg(par, REFRESH_AB_CTRL, FB_CTRL_TYPE | (wid_tiles << 16) | 0);
+        writereg(par, FB_CD_CTRL, FB_CTRL_TYPE | (wid_tiles << 16) | 0);
+        writereg(par, REFRESH_CD_CTRL, FB_CTRL_TYPE | (wid_tiles << 16) | 0);
+        writereg(par, REFRESH_START, (var->xoffset << 16) | var->yoffset);
+        writereg(par, REFRESH_SIZE, (var->xres << 16) | var->yres);
+
+        /* Set up framebuffer access by CPU */
+
+        pixfmt = par->pixfmt;
+        dfa_ctl |= DFA_FB_ENABLE | pixfmt;
+        writereg(par, DFA_FB_A, dfa_ctl);
+
+        /*
+         * Set up window attribute table.
+         * We set all WAT entries the same so it doesn't matter what the
+         * window ID (WID) plane contains.
+         */
+        for (i = 0; i < 32; ++i) {
+                writereg(par, WAT_FMT + (i << 4), watfmt[pixfmt]);
+                writereg(par, WAT_CMAP_OFFSET + (i << 4), 0);
+                writereg(par, WAT_CTRL + (i << 4), 0);
+                writereg(par, WAT_GAMMA_CTRL + (i << 4), WAT_GAMMA_DISABLE);
+        }
+
+        /* Set sync polarity etc. */
+        ctrlreg = readreg(par, SYNC_CTL) &
+                ~(SYNC_CTL_SYNC_ON_RGB | SYNC_CTL_HSYNC_INV |
+                  SYNC_CTL_VSYNC_INV);
+        if (var->sync & FB_SYNC_ON_GREEN)
+                ctrlreg |= SYNC_CTL_SYNC_ON_RGB;
+        if (!(var->sync & FB_SYNC_HOR_HIGH_ACT))
+                ctrlreg |= SYNC_CTL_HSYNC_INV;
+        if (!(var->sync & FB_SYNC_VERT_HIGH_ACT))
+                ctrlreg |= SYNC_CTL_VSYNC_INV;
+        writereg(par, SYNC_CTL, ctrlreg);
+
+        info->fix.line_length = stride * pixsize[pixfmt];
+        info->fix.visual = (pixfmt == DFA_PIX_8BIT)? FB_VISUAL_PSEUDOCOLOR:
+                FB_VISUAL_DIRECTCOLOR;
+
+        return 0;
+}
+
+static int gxt4500_setcolreg(unsigned int reg, unsigned int red,
+                             unsigned int green, unsigned int blue,
+                             unsigned int transp, struct fb_info *info)
+{
+        u32 cmap_entry;
+        struct gxt4500_par *par = info->par;
+
+        if (reg > 1023)
+                return 1;
+        cmap_entry = ((transp & 0xff00) << 16) | ((blue & 0xff00) << 8) |
+                (green & 0xff00) | (red >> 8);
+        writereg(par, CMAP + reg * 4, cmap_entry);
+
+        if (reg < 16 && par->pixfmt != DFA_PIX_8BIT) {
+                u32 *pal = info->pseudo_palette;
+                u32 val = reg;
+                switch (par->pixfmt) {
+                case DFA_PIX_16BIT_565:
+                        val |= (reg << 11) | (reg << 6);
+                        break;
+                case DFA_PIX_16BIT_1555:
+                        val |= (reg << 10) | (reg << 5);
+                        break;
+                case DFA_PIX_32BIT:
+                        val |= (reg << 24);
+                        /* fall through */
+                case DFA_PIX_24BIT:
+                        val |= (reg << 16) | (reg << 8);
+                        break;
+                }
+                pal[reg] = val;
+        }
+
+        return 0;
+}
+
+static int gxt4500_pan_display(struct fb_var_screeninfo *var,
+                               struct fb_info *info)
+{
+        struct gxt4500_par *par = info->par;
+
+        if (var->xoffset & 7)
+                return -EINVAL;
+        if (var->xoffset + var->xres > var->xres_virtual ||
+            var->yoffset + var->yres > var->yres_virtual)
+                return -EINVAL;
+
+        writereg(par, REFRESH_START, (var->xoffset << 16) | var->yoffset);
+        return 0;
+}
+
+static int gxt4500_blank(int blank, struct fb_info *info)
+{
+        struct gxt4500_par *par = info->par;
+        int ctrl, dctl;
+
+        ctrl = readreg(par, SYNC_CTL);
+        ctrl &= ~(SYNC_CTL_SYNC_OFF | SYNC_CTL_HSYNC_OFF | SYNC_CTL_VSYNC_OFF);
+        dctl = readreg(par, DISP_CTL);
+        dctl |= DISP_CTL_OFF;
+        switch (blank) {
+        case FB_BLANK_UNBLANK:
+                dctl &= ~DISP_CTL_OFF;
+                break;
+        case FB_BLANK_POWERDOWN:
+                ctrl |= SYNC_CTL_SYNC_OFF;
+                break;
+        case FB_BLANK_HSYNC_SUSPEND:
+                ctrl |= SYNC_CTL_HSYNC_OFF;
+                break;
+        case FB_BLANK_VSYNC_SUSPEND:
+                ctrl |= SYNC_CTL_VSYNC_OFF;
+                break;
+        default: ;
+        }
+        writereg(par, SYNC_CTL, ctrl);
+        writereg(par, DISP_CTL, dctl);
+
+        return 0;
+}
+
+static const struct fb_fix_screeninfo gxt4500_fix __devinitdata = {
+        .id = "IBM GXT4500P",
+        .type = FB_TYPE_PACKED_PIXELS,
+        .visual = FB_VISUAL_PSEUDOCOLOR,
+        .xpanstep = 8,
+        .ypanstep = 1,
+        .mmio_len = 0x20000,
+};
+
+static struct fb_ops gxt4500_ops = {
+        .owner = THIS_MODULE,
+        .fb_check_var = gxt4500_check_var,
+        .fb_set_par = gxt4500_set_par,
+        .fb_setcolreg = gxt4500_setcolreg,
+        .fb_pan_display = gxt4500_pan_display,
+        .fb_blank = gxt4500_blank,
+        .fb_fillrect = cfb_fillrect,
+        .fb_copyarea = cfb_copyarea,
+        .fb_imageblit = cfb_imageblit,
+};
+
+/* PCI functions */
+static int __devinit gxt4500_probe(struct pci_dev *pdev,
+                                   const struct pci_device_id *ent)
+{
+        int err;
+        unsigned long reg_phys, fb_phys;
+        struct gxt4500_par *par;
+        struct fb_info *info;
+        struct fb_var_screeninfo var;
+
+        err = pci_enable_device(pdev);
+        if (err) {
+                dev_err(&pdev->dev, "gxt4500: cannot enable PCI device: %d\n",
+                        err);
+                return err;
+        }
+
+        reg_phys = pci_resource_start(pdev, 0);
+        if (!request_mem_region(reg_phys, pci_resource_len(pdev, 0),
+                                "gxt4500 regs")) {
+                dev_err(&pdev->dev, "gxt4500: cannot get registers\n");
+                goto err_nodev;
+        }
+
+        fb_phys = pci_resource_start(pdev, 1);
+        if (!request_mem_region(fb_phys, pci_resource_len(pdev, 1),
+                                "gxt4500 FB")) {
+                dev_err(&pdev->dev, "gxt4500: cannot get framebuffer\n");
+                goto err_free_regs;
+        }
+
+        info = framebuffer_alloc(sizeof(struct gxt4500_par), &pdev->dev);
+        if (!info) {
+                dev_err(&pdev->dev, "gxt4500: cannot alloc FB info record");
+                goto err_free_fb;
+        }
+        par = info->par;
+        info->fix = gxt4500_fix;
+        info->pseudo_palette = par->pseudo_palette;
+
+        info->fix.mmio_start = reg_phys;
+        par->regs = ioremap(reg_phys, pci_resource_len(pdev, 0));
+        if (!par->regs) {
+                dev_err(&pdev->dev, "gxt4500: cannot map registers\n");
+                goto err_free_all;
+        }
+
+        info->fix.smem_start = fb_phys;
+        info->fix.smem_len = pci_resource_len(pdev, 1);
+        info->screen_base = ioremap(fb_phys, pci_resource_len(pdev, 1));
+        if (!info->screen_base) {
+                dev_err(&pdev->dev, "gxt4500: cannot map framebuffer\n");
+                goto err_unmap_regs;
+        }
+
+        pci_set_drvdata(pdev, info);
+
+        /* Set byte-swapping for DFA aperture for all pixel sizes */
+        pci_write_config_dword(pdev, CFG_ENDIAN0, 0x333300);
+
+        info->fbops = &gxt4500_ops;
+        info->flags = FBINFO_FLAG_DEFAULT;
+
+        err = fb_alloc_cmap(&info->cmap, 256, 0);
+        if (err) {
+                dev_err(&pdev->dev, "gxt4500: cannot allocate cmap\n");
+                goto err_unmap_all;
+        }
+
+        gxt4500_blank(FB_BLANK_UNBLANK, info);
+
+        if (!fb_find_mode(&var, info, mode_option, NULL, 0, &defaultmode, 8)) {
+                dev_err(&pdev->dev, "gxt4500: cannot find valid video mode\n");
+                goto err_free_cmap;
+        }
+        info->var = var;
+        if (gxt4500_set_par(info)) {
+                printk(KERN_ERR "gxt4500: cannot set video mode\n");
+                goto err_free_cmap;
+        }
+
+        if (register_framebuffer(info) < 0) {
+                dev_err(&pdev->dev, "gxt4500: cannot register framebuffer\n");
+                goto err_free_cmap;
+        }
+        printk(KERN_INFO "fb%d: %s frame buffer device\n",
+               info->node, info->fix.id);
+
+        return 0;
+
+ err_free_cmap:
+        fb_dealloc_cmap(&info->cmap);
+ err_unmap_all:
+        iounmap(info->screen_base);
+ err_unmap_regs:
+        iounmap(par->regs);
+ err_free_all:
+        framebuffer_release(info);
+ err_free_fb:
+        release_mem_region(fb_phys, pci_resource_len(pdev, 1));
+ err_free_regs:
+        release_mem_region(reg_phys, pci_resource_len(pdev, 0));
+ err_nodev:
+        return -ENODEV;
+}
+
+static void __devexit gxt4500_remove(struct pci_dev *pdev)
+{
+        struct fb_info *info = pci_get_drvdata(pdev);
+        struct gxt4500_par *par;
+
+        if (!info)
+                return;
+        par = info->par;
+        unregister_framebuffer(info);
+        fb_dealloc_cmap(&info->cmap);
+        iounmap(par->regs);
+        iounmap(info->screen_base);
+        release_mem_region(pci_resource_start(pdev, 0),
+                           pci_resource_len(pdev, 0));
+        release_mem_region(pci_resource_start(pdev, 1),
+                           pci_resource_len(pdev, 1));
+        framebuffer_release(info);
+}
+
+/* supported chipsets */
+static const struct pci_device_id gxt4500_pci_tbl[] = {
+        { PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_GXT4500P,
+          PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
+        { 0 }
+};
+
+MODULE_DEVICE_TABLE(pci, gxt4500_pci_tbl);
+
+static struct pci_driver gxt4500_driver = {
+        .name = "gxt4500",
+        .id_table = gxt4500_pci_tbl,
+        .probe = gxt4500_probe,
+        .remove = __devexit_p(gxt4500_remove),
+};
+
+static int __devinit gxt4500_init(void)
+{
+#ifndef MODULE
+        if (fb_get_options("gxt4500", &mode_option))
+                return -ENODEV;
+#endif
+
+        return pci_register_driver(&gxt4500_driver);
+}
+module_init(gxt4500_init);
+
+static void __exit gxt4500_exit(void)
+{
+        pci_unregister_driver(&gxt4500_driver);
+}
+module_exit(gxt4500_exit);
+
+MODULE_AUTHOR("Paul Mackerras <paulus@samba.org>");
+MODULE_DESCRIPTION("FBDev driver for IBM GXT4500P");
+MODULE_LICENSE("GPL");
+module_param(mode_option, charp, 0);
+MODULE_PARM_DESC(mode_option, "Specify resolution as \"<xres>x<yres>[-<bpp>][@<refresh>]\"");
diff --git a/drivers/video/hitfb.c b/drivers/video/hitfb.c
index 3afb472763c0..3dc49424dc75 100644
--- a/drivers/video/hitfb.c
+++ b/drivers/video/hitfb.c
@@ -29,7 +29,6 @@
 #include <asm/io.h>
 #include <asm/hd64461.h>
 #include <asm/cpu/dac.h>
-#include <asm/hp6xx/hp6xx.h>
 
 #define WIDTH 640
 
diff --git a/drivers/video/hpfb.c b/drivers/video/hpfb.c
index 91cf3b577d15..9ab9b839a0f5 100644
--- a/drivers/video/hpfb.c
+++ b/drivers/video/hpfb.c
@@ -295,6 +295,8 @@ static int __init hpfb_init_one(unsigned long phys_base, unsigned long virt_base
 
         if (register_framebuffer(&fb_info) < 0) {
                 fb_dealloc_cmap(&fb_info.cmap);
+                iounmap(fb_info.screen_base);
+                fb_info.screen_base = NULL;
                 return 1;
         }
 
diff --git a/drivers/video/i810/i810-i2c.c b/drivers/video/i810/i810-i2c.c
index b38d805db313..961f4d404467 100644
--- a/drivers/video/i810/i810-i2c.c
+++ b/drivers/video/i810/i810-i2c.c
@@ -137,15 +137,15 @@ void i810_create_i2c_busses(struct i810fb_par *par)
 void i810_delete_i2c_busses(struct i810fb_par *par)
 {
         if (par->chan[0].par)
-                i2c_bit_del_bus(&par->chan[0].adapter);
+                i2c_del_adapter(&par->chan[0].adapter);
         par->chan[0].par = NULL;
 
         if (par->chan[1].par)
-                i2c_bit_del_bus(&par->chan[1].adapter);
+                i2c_del_adapter(&par->chan[1].adapter);
         par->chan[1].par = NULL;
 
         if (par->chan[2].par)
-                i2c_bit_del_bus(&par->chan[2].adapter);
+                i2c_del_adapter(&par->chan[2].adapter);
         par->chan[2].par = NULL;
 }
 
@@ -162,9 +162,7 @@ int i810_probe_i2c_connector(struct fb_info *info, u8 **out_edid, int conn)
 
                 if (e != NULL) {
                         DPRINTK("i810-i2c: Getting EDID from BIOS\n");
-                        edid = kmalloc(EDID_LENGTH, GFP_KERNEL);
-                        if (edid)
-                                memcpy(edid, e, EDID_LENGTH);
+                        edid = kmemdup(e, EDID_LENGTH, GFP_KERNEL);
                 }
         }
 
diff --git a/drivers/video/igafb.c b/drivers/video/igafb.c
index e6df492c22a5..655ae0fa99ca 100644
--- a/drivers/video/igafb.c
+++ b/drivers/video/igafb.c
@@ -384,19 +384,21 @@ int __init igafb_init(void)
         if (!con_is_present())
                 return -ENXIO;
 
-        pdev = pci_find_device(PCI_VENDOR_ID_INTERG, 
+        pdev = pci_get_device(PCI_VENDOR_ID_INTERG,
                                PCI_DEVICE_ID_INTERG_1682, 0);
         if (pdev == NULL) {
                 /*
                  * XXX We tried to use cyber2000fb.c for IGS 2000.
                  * But it does not initialize the chip in JavaStation-E, alas.
                  */
-                pdev = pci_find_device(PCI_VENDOR_ID_INTERG, 0x2000, 0);
+                pdev = pci_get_device(PCI_VENDOR_ID_INTERG, 0x2000, 0);
                 if(pdev == NULL) {
                         return -ENXIO;
                 }
                 iga2000 = 1;
         }
+        /* We leak a reference here but as it cannot be unloaded this is
+           fine. If you write unload code remember to free it in unload */
         
         size = sizeof(struct fb_info) + sizeof(struct iga_par) + sizeof(u32)*16;
 
diff --git a/drivers/video/intelfb/intelfb_i2c.c b/drivers/video/intelfb/intelfb_i2c.c
index 5686e2164e39..33bc41f50540 100644
--- a/drivers/video/intelfb/intelfb_i2c.c
+++ b/drivers/video/intelfb/intelfb_i2c.c
@@ -188,11 +188,11 @@ void intelfb_delete_i2c_busses(struct intelfb_info *dinfo)
 
         for (i = 0; i < MAX_OUTPUTS; i++) {
                 if (dinfo->output[i].i2c_bus.dinfo) {
-                        i2c_bit_del_bus(&dinfo->output[i].i2c_bus.adapter);
+                        i2c_del_adapter(&dinfo->output[i].i2c_bus.adapter);
                         dinfo->output[i].i2c_bus.dinfo = NULL;
                 }
                 if (dinfo->output[i].ddc_bus.dinfo) {
-                        i2c_bit_del_bus(&dinfo->output[i].ddc_bus.adapter);
+                        i2c_del_adapter(&dinfo->output[i].ddc_bus.adapter);
                         dinfo->output[i].ddc_bus.dinfo = NULL;
                 }
         }
diff --git a/drivers/video/intelfb/intelfbdrv.c b/drivers/video/intelfb/intelfbdrv.c
index 6f9de04193d2..664fc5cf962a 100644
--- a/drivers/video/intelfb/intelfbdrv.c
+++ b/drivers/video/intelfb/intelfbdrv.c
@@ -1058,10 +1058,9 @@ intelfb_init_var(struct intelfb_info *dinfo)
                 u8 *edid_d = NULL;
 
                 if (edid_s) {
-                        edid_d = kmalloc(EDID_LENGTH, GFP_KERNEL);
+                        edid_d = kmemdup(edid_s, EDID_LENGTH, GFP_KERNEL);
 
                         if (edid_d) {
-                                memcpy(edid_d, edid_s, EDID_LENGTH);
                                 fb_edid_to_monspecs(edid_d,
                                                     &dinfo->info->monspecs);
                                 kfree(edid_d);
diff --git a/drivers/video/intelfb/intelfbhw.c b/drivers/video/intelfb/intelfbhw.c
index eeeeff9a09eb..a95836839e1e 100644
--- a/drivers/video/intelfb/intelfbhw.c
+++ b/drivers/video/intelfb/intelfbhw.c
@@ -161,7 +161,7 @@ intelfbhw_get_memory(struct pci_dev *pdev, int *aperture_size,
                 return 1;
 
         /* Find the bridge device.  It is always 0:0.0 */
-        if (!(bridge_dev = pci_find_slot(0, PCI_DEVFN(0, 0)))) {
+        if (!(bridge_dev = pci_get_bus_and_slot(0, PCI_DEVFN(0, 0)))) {
                 ERR_MSG("cannot find bridge device\n");
                 return 1;
         }
@@ -169,6 +169,8 @@ intelfbhw_get_memory(struct pci_dev *pdev, int *aperture_size,
         /* Get the fb aperture size and "stolen" memory amount. */
         tmp = 0;
         pci_read_config_word(bridge_dev, INTEL_GMCH_CTRL, &tmp);
+        pci_dev_put(bridge_dev);
+
         switch (pdev->device) {
         case PCI_DEVICE_ID_INTEL_915G:
         case PCI_DEVICE_ID_INTEL_915GM:
@@ -662,7 +664,7 @@ intelfbhw_print_hw_state(struct intelfb_info *dinfo, struct intelfb_hwstate *hw)
         int index = dinfo->pll_index;
         DBG_MSG("intelfbhw_print_hw_state\n");
 
-        if (!hw || !dinfo)
+        if (!hw)
                 return;
         /* Read in as much of the HW state as possible. */
         printk("hw state dump start\n");
diff --git a/drivers/video/macfb.c b/drivers/video/macfb.c
index 80a043807161..180d94c2b4d2 100644
--- a/drivers/video/macfb.c
+++ b/drivers/video/macfb.c
@@ -608,6 +608,22 @@ void __init macfb_setup(char *options)
         }
 }
 
+static void __init iounmap_macfb(void)
+{
+        if (valkyrie_cmap_regs)
+                iounmap(valkyrie_cmap_regs);
+        if (dafb_cmap_regs)
+                iounmap(dafb_cmap_regs);
+        if (v8_brazil_cmap_regs)
+                iounmap(v8_brazil_cmap_regs);
+        if (rbv_cmap_regs)
+                iounmap(rbv_cmap_regs);
+        if (civic_cmap_regs)
+                iounmap(civic_cmap_regs);
+        if (csc_cmap_regs)
+                iounmap(csc_cmap_regs);
+}
+
 static int __init macfb_init(void)
 {
         int video_cmap_len, video_is_nubus = 0;
@@ -962,6 +978,10 @@ static int __init macfb_init(void)
         if (!err)
                 printk("fb%d: %s frame buffer device\n",
                        fb_info.node, fb_info.fix.id);
+        else {
+                iounmap(fb_info.screen_base);
+                iounmap_macfb();
+        }
         return err;
 }
 
diff --git a/drivers/video/matrox/i2c-matroxfb.c b/drivers/video/matrox/i2c-matroxfb.c
index 795c1a99a680..fe28848e7b52 100644
--- a/drivers/video/matrox/i2c-matroxfb.c
+++ b/drivers/video/matrox/i2c-matroxfb.c
@@ -124,7 +124,7 @@ static int i2c_bus_reg(struct i2c_bit_adapter* b, struct matrox_fb_info* minfo,
 
 static void i2c_bit_bus_del(struct i2c_bit_adapter* b) {
         if (b->initialized) {
-                i2c_bit_del_bus(&b->adapter);
+                i2c_del_adapter(&b->adapter);
                 b->initialized = 0;
         }
 }
@@ -146,7 +146,7 @@ static void* i2c_matroxfb_probe(struct matrox_fb_info* minfo) {
         unsigned long flags;
         struct matroxfb_dh_maven_info* m2info;
 
-        m2info = (struct matroxfb_dh_maven_info*)kmalloc(sizeof(*m2info), GFP_KERNEL);
+        m2info = kmalloc(sizeof(*m2info), GFP_KERNEL);
         if (!m2info)
                 return NULL;
 
diff --git a/drivers/video/matrox/matroxfb_base.c b/drivers/video/matrox/matroxfb_base.c
index e9b4115fcad0..cb2aa402ddfd 100644
--- a/drivers/video/matrox/matroxfb_base.c
+++ b/drivers/video/matrox/matroxfb_base.c
@@ -2028,7 +2028,7 @@ static int matroxfb_probe(struct pci_dev* pdev, const struct pci_device_id* dumm
         }
 
 #ifdef CONFIG_FB_MATROX_MULTIHEAD
-        minfo = (struct matrox_fb_info*)kmalloc(sizeof(*minfo), GFP_KERNEL);
+        minfo = kmalloc(sizeof(*minfo), GFP_KERNEL);
         if (!minfo)
                 return -1;
 #else
diff --git a/drivers/video/matrox/matroxfb_crtc2.c b/drivers/video/matrox/matroxfb_crtc2.c
index 27eb4bb4f89f..2c9801090fae 100644
--- a/drivers/video/matrox/matroxfb_crtc2.c
+++ b/drivers/video/matrox/matroxfb_crtc2.c
@@ -694,7 +694,7 @@ static void* matroxfb_crtc2_probe(struct matrox_fb_info* minfo) {
         /* hardware is CRTC2 incapable... */
         if (!ACCESS_FBINFO(devflags.crtc2))
                 return NULL;
-        m2info = (struct matroxfb_dh_fb_info*)kmalloc(sizeof(*m2info), GFP_KERNEL);
+        m2info = kmalloc(sizeof(*m2info), GFP_KERNEL);
         if (!m2info) {
                 printk(KERN_ERR "matroxfb_crtc2: Not enough memory for CRTC2 control structs\n");
                 return NULL;
diff --git a/drivers/video/mbx/mbxdebugfs.c b/drivers/video/mbx/mbxdebugfs.c
index 84aab3ad024e..472a3ca3d92d 100644
--- a/drivers/video/mbx/mbxdebugfs.c
+++ b/drivers/video/mbx/mbxdebugfs.c
@@ -10,6 +10,8 @@ struct mbxfb_debugfs_data {
         struct dentry *clock;
         struct dentry *display;
         struct dentry *gsctl;
+        struct dentry *sdram;
+        struct dentry *misc;
 };
 
 static int open_file_generic(struct inode *inode, struct file *file)
@@ -29,11 +31,11 @@ static ssize_t sysconf_read_file(struct file *file, char __user *userbuf,
 {
         char * s = big_buffer;
 
-        s += sprintf(s, "SYSCFG = %08lx\n", SYSCFG);
-        s += sprintf(s, "PFBASE = %08lx\n", PFBASE);
-        s += sprintf(s, "PFCEIL = %08lx\n", PFCEIL);
-        s += sprintf(s, "POLLFLAG = %08lx\n", POLLFLAG);
-        s += sprintf(s, "SYSRST = %08lx\n", SYSRST);
+        s += sprintf(s, "SYSCFG = %08x\n", readl(SYSCFG));
+        s += sprintf(s, "PFBASE = %08x\n", readl(PFBASE));
+        s += sprintf(s, "PFCEIL = %08x\n", readl(PFCEIL));
+        s += sprintf(s, "POLLFLAG = %08x\n", readl(POLLFLAG));
+        s += sprintf(s, "SYSRST = %08x\n", readl(SYSRST));
 
         return  simple_read_from_buffer(userbuf, count, ppos,
                                         big_buffer, s-big_buffer);
@@ -45,24 +47,24 @@ static ssize_t gsctl_read_file(struct file *file, char __user *userbuf,
 {
         char * s = big_buffer;
 
-        s += sprintf(s, "GSCTRL = %08lx\n", GSCTRL);
-        s += sprintf(s, "VSCTRL = %08lx\n", VSCTRL);
-        s += sprintf(s, "GBBASE = %08lx\n", GBBASE);
-        s += sprintf(s, "VBBASE = %08lx\n", VBBASE);
-        s += sprintf(s, "GDRCTRL = %08lx\n", GDRCTRL);
-        s += sprintf(s, "VCMSK = %08lx\n", VCMSK);
-        s += sprintf(s, "GSCADR = %08lx\n", GSCADR);
-        s += sprintf(s, "VSCADR = %08lx\n", VSCADR);
-        s += sprintf(s, "VUBASE = %08lx\n", VUBASE);
-        s += sprintf(s, "VVBASE = %08lx\n", VVBASE);
-        s += sprintf(s, "GSADR = %08lx\n", GSADR);
-        s += sprintf(s, "VSADR = %08lx\n", VSADR);
-        s += sprintf(s, "HCCTRL = %08lx\n", HCCTRL);
-        s += sprintf(s, "HCSIZE = %08lx\n", HCSIZE);
-        s += sprintf(s, "HCPOS = %08lx\n", HCPOS);
-        s += sprintf(s, "HCBADR = %08lx\n", HCBADR);
-        s += sprintf(s, "HCCKMSK = %08lx\n", HCCKMSK);
-        s += sprintf(s, "GPLUT = %08lx\n", GPLUT);
+        s += sprintf(s, "GSCTRL = %08x\n", readl(GSCTRL));
+        s += sprintf(s, "VSCTRL = %08x\n", readl(VSCTRL));
+        s += sprintf(s, "GBBASE = %08x\n", readl(GBBASE));
+        s += sprintf(s, "VBBASE = %08x\n", readl(VBBASE));
+        s += sprintf(s, "GDRCTRL = %08x\n", readl(GDRCTRL));
+        s += sprintf(s, "VCMSK = %08x\n", readl(VCMSK));
+        s += sprintf(s, "GSCADR = %08x\n", readl(GSCADR));
+        s += sprintf(s, "VSCADR = %08x\n", readl(VSCADR));
+        s += sprintf(s, "VUBASE = %08x\n", readl(VUBASE));
+        s += sprintf(s, "VVBASE = %08x\n", readl(VVBASE));
+        s += sprintf(s, "GSADR = %08x\n", readl(GSADR));
+        s += sprintf(s, "VSADR = %08x\n", readl(VSADR));
+        s += sprintf(s, "HCCTRL = %08x\n", readl(HCCTRL));
+        s += sprintf(s, "HCSIZE = %08x\n", readl(HCSIZE));
+        s += sprintf(s, "HCPOS = %08x\n", readl(HCPOS));
+        s += sprintf(s, "HCBADR = %08x\n", readl(HCBADR));
+        s += sprintf(s, "HCCKMSK = %08x\n", readl(HCCKMSK));
+        s += sprintf(s, "GPLUT = %08x\n", readl(GPLUT));
 
         return  simple_read_from_buffer(userbuf, count, ppos,
                                         big_buffer, s-big_buffer);
@@ -73,36 +75,36 @@ static ssize_t display_read_file(struct file *file, char __user *userbuf,
 {
         char * s = big_buffer;
 
-        s += sprintf(s, "DSCTRL = %08lx\n", DSCTRL);
-        s += sprintf(s, "DHT01 = %08lx\n", DHT01);
-        s += sprintf(s, "DHT02 = %08lx\n", DHT02);
-        s += sprintf(s, "DHT03 = %08lx\n", DHT03);
-        s += sprintf(s, "DVT01 = %08lx\n", DVT01);
-        s += sprintf(s, "DVT02 = %08lx\n", DVT02);
-        s += sprintf(s, "DVT03 = %08lx\n", DVT03);
-        s += sprintf(s, "DBCOL = %08lx\n", DBCOL);
-        s += sprintf(s, "BGCOLOR = %08lx\n", BGCOLOR);
-        s += sprintf(s, "DINTRS = %08lx\n", DINTRS);
-        s += sprintf(s, "DINTRE = %08lx\n", DINTRE);
-        s += sprintf(s, "DINTRCNT = %08lx\n", DINTRCNT);
-        s += sprintf(s, "DSIG = %08lx\n", DSIG);
-        s += sprintf(s, "DMCTRL = %08lx\n", DMCTRL);
-        s += sprintf(s, "CLIPCTRL = %08lx\n", CLIPCTRL);
-        s += sprintf(s, "SPOCTRL = %08lx\n", SPOCTRL);
-        s += sprintf(s, "SVCTRL = %08lx\n", SVCTRL);
-        s += sprintf(s, "DLSTS = %08lx\n", DLSTS);
-        s += sprintf(s, "DLLCTRL = %08lx\n", DLLCTRL);
-        s += sprintf(s, "DVLNUM = %08lx\n", DVLNUM);
-        s += sprintf(s, "DUCTRL = %08lx\n", DUCTRL);
-        s += sprintf(s, "DVECTRL = %08lx\n", DVECTRL);
-        s += sprintf(s, "DHDET = %08lx\n", DHDET);
-        s += sprintf(s, "DVDET = %08lx\n", DVDET);
-        s += sprintf(s, "DODMSK = %08lx\n", DODMSK);
-        s += sprintf(s, "CSC01 = %08lx\n", CSC01);
-        s += sprintf(s, "CSC02 = %08lx\n", CSC02);
-        s += sprintf(s, "CSC03 = %08lx\n", CSC03);
-        s += sprintf(s, "CSC04 = %08lx\n", CSC04);
-        s += sprintf(s, "CSC05 = %08lx\n", CSC05);
+        s += sprintf(s, "DSCTRL = %08x\n", readl(DSCTRL));
+        s += sprintf(s, "DHT01 = %08x\n", readl(DHT01));
+        s += sprintf(s, "DHT02 = %08x\n", readl(DHT02));
+        s += sprintf(s, "DHT03 = %08x\n", readl(DHT03));
+        s += sprintf(s, "DVT01 = %08x\n", readl(DVT01));
+        s += sprintf(s, "DVT02 = %08x\n", readl(DVT02));
+        s += sprintf(s, "DVT03 = %08x\n", readl(DVT03));
+        s += sprintf(s, "DBCOL = %08x\n", readl(DBCOL));
+        s += sprintf(s, "BGCOLOR = %08x\n", readl(BGCOLOR));
+        s += sprintf(s, "DINTRS = %08x\n", readl(DINTRS));
+        s += sprintf(s, "DINTRE = %08x\n", readl(DINTRE));
+        s += sprintf(s, "DINTRCNT = %08x\n", readl(DINTRCNT));
+        s += sprintf(s, "DSIG = %08x\n", readl(DSIG));
+        s += sprintf(s, "DMCTRL = %08x\n", readl(DMCTRL));
+        s += sprintf(s, "CLIPCTRL = %08x\n", readl(CLIPCTRL));
+        s += sprintf(s, "SPOCTRL = %08x\n", readl(SPOCTRL));
+        s += sprintf(s, "SVCTRL = %08x\n", readl(SVCTRL));
+        s += sprintf(s, "DLSTS = %08x\n", readl(DLSTS));
+        s += sprintf(s, "DLLCTRL = %08x\n", readl(DLLCTRL));
+        s += sprintf(s, "DVLNUM = %08x\n", readl(DVLNUM));
+        s += sprintf(s, "DUCTRL = %08x\n", readl(DUCTRL));
+        s += sprintf(s, "DVECTRL = %08x\n", readl(DVECTRL));
+        s += sprintf(s, "DHDET = %08x\n", readl(DHDET));
+        s += sprintf(s, "DVDET = %08x\n", readl(DVDET));
+        s += sprintf(s, "DODMSK = %08x\n", readl(DODMSK));
+        s += sprintf(s, "CSC01 = %08x\n", readl(CSC01));
+        s += sprintf(s, "CSC02 = %08x\n", readl(CSC02));
+        s += sprintf(s, "CSC03 = %08x\n", readl(CSC03));
+        s += sprintf(s, "CSC04 = %08x\n", readl(CSC04));
+        s += sprintf(s, "CSC05 = %08x\n", readl(CSC05));
 
         return  simple_read_from_buffer(userbuf, count, ppos,
                                         big_buffer, s-big_buffer);
@@ -113,24 +115,61 @@ static ssize_t clock_read_file(struct file *file, char __user *userbuf,
 {
         char * s = big_buffer;
 
-        s += sprintf(s, "SYSCLKSRC = %08lx\n", SYSCLKSRC);
-        s += sprintf(s, "PIXCLKSRC = %08lx\n", PIXCLKSRC);
-        s += sprintf(s, "CLKSLEEP = %08lx\n", CLKSLEEP);
-        s += sprintf(s, "COREPLL = %08lx\n", COREPLL);
-        s += sprintf(s, "DISPPLL = %08lx\n", DISPPLL);
-        s += sprintf(s, "PLLSTAT = %08lx\n", PLLSTAT);
-        s += sprintf(s, "VOVRCLK = %08lx\n", VOVRCLK);
-        s += sprintf(s, "PIXCLK = %08lx\n", PIXCLK);
-        s += sprintf(s, "MEMCLK = %08lx\n", MEMCLK);
-        s += sprintf(s, "M24CLK = %08lx\n", M24CLK);
-        s += sprintf(s, "MBXCLK = %08lx\n", MBXCLK);
-        s += sprintf(s, "SDCLK = %08lx\n", SDCLK);
-        s += sprintf(s, "PIXCLKDIV = %08lx\n", PIXCLKDIV);
+        s += sprintf(s, "SYSCLKSRC = %08x\n", readl(SYSCLKSRC));
+        s += sprintf(s, "PIXCLKSRC = %08x\n", readl(PIXCLKSRC));
+        s += sprintf(s, "CLKSLEEP = %08x\n", readl(CLKSLEEP));
+        s += sprintf(s, "COREPLL = %08x\n", readl(COREPLL));
+        s += sprintf(s, "DISPPLL = %08x\n", readl(DISPPLL));
+        s += sprintf(s, "PLLSTAT = %08x\n", readl(PLLSTAT));
+        s += sprintf(s, "VOVRCLK = %08x\n", readl(VOVRCLK));
+        s += sprintf(s, "PIXCLK = %08x\n", readl(PIXCLK));
+        s += sprintf(s, "MEMCLK = %08x\n", readl(MEMCLK));
+        s += sprintf(s, "M24CLK = %08x\n", readl(M24CLK));
+        s += sprintf(s, "MBXCLK = %08x\n", readl(MBXCLK));
+        s += sprintf(s, "SDCLK = %08x\n", readl(SDCLK));
+        s += sprintf(s, "PIXCLKDIV = %08x\n", readl(PIXCLKDIV));
 
         return  simple_read_from_buffer(userbuf, count, ppos,
                                         big_buffer, s-big_buffer);
 }
 
+static ssize_t sdram_read_file(struct file *file, char __user *userbuf,
+                               size_t count, loff_t *ppos)
+{
+        char * s = big_buffer;
+
+        s += sprintf(s, "LMRST = %08x\n", readl(LMRST));
+        s += sprintf(s, "LMCFG = %08x\n", readl(LMCFG));
+        s += sprintf(s, "LMPWR = %08x\n", readl(LMPWR));
+        s += sprintf(s, "LMPWRSTAT = %08x\n", readl(LMPWRSTAT));
+        s += sprintf(s, "LMCEMR = %08x\n", readl(LMCEMR));
+        s += sprintf(s, "LMTYPE = %08x\n", readl(LMTYPE));
+        s += sprintf(s, "LMTIM = %08x\n", readl(LMTIM));
+        s += sprintf(s, "LMREFRESH = %08x\n", readl(LMREFRESH));
+        s += sprintf(s, "LMPROTMIN = %08x\n", readl(LMPROTMIN));
+        s += sprintf(s, "LMPROTMAX = %08x\n", readl(LMPROTMAX));
+        s += sprintf(s, "LMPROTCFG = %08x\n", readl(LMPROTCFG));
+        s += sprintf(s, "LMPROTERR = %08x\n", readl(LMPROTERR));
+
+        return  simple_read_from_buffer(userbuf, count, ppos,
+                                        big_buffer, s-big_buffer);
+}
+
+static ssize_t misc_read_file(struct file *file, char __user *userbuf,
+                               size_t count, loff_t *ppos)
+{
+        char * s = big_buffer;
+
+        s += sprintf(s, "LCD_CONFIG = %08x\n", readl(LCD_CONFIG));
+        s += sprintf(s, "ODFBPWR = %08x\n", readl(ODFBPWR));
+        s += sprintf(s, "ODFBSTAT = %08x\n", readl(ODFBSTAT));
+        s += sprintf(s, "ID = %08x\n", readl(ID));
+
+        return  simple_read_from_buffer(userbuf, count, ppos,
+                                        big_buffer, s-big_buffer);
+}
+
+
 static struct file_operations sysconf_fops = {
         .read = sysconf_read_file,
         .write = write_file_dummy,
@@ -155,6 +194,17 @@ static struct file_operations gsctl_fops = {
         .open = open_file_generic,
 };
 
+static struct file_operations sdram_fops = {
+        .read = sdram_read_file,
+        .write = write_file_dummy,
+        .open = open_file_generic,
+};
+
+static struct file_operations misc_fops = {
+        .read = misc_read_file,
+        .write = write_file_dummy,
+        .open = open_file_generic,
+};
 
 static void __devinit mbxfb_debugfs_init(struct fb_info *fbi)
 {
@@ -173,6 +223,10 @@ static void __devinit mbxfb_debugfs_init(struct fb_info *fbi)
                                       fbi, &display_fops);
         dbg->gsctl = debugfs_create_file("gsctl", 0444, dbg->dir,
                                     fbi, &gsctl_fops);
+        dbg->sdram = debugfs_create_file("sdram", 0444, dbg->dir,
+                                        fbi, &sdram_fops);
+        dbg->misc = debugfs_create_file("misc", 0444, dbg->dir,
+                                        fbi, &misc_fops);
 }
 
 static void __devexit mbxfb_debugfs_remove(struct fb_info *fbi)
@@ -180,6 +234,8 @@ static void __devexit mbxfb_debugfs_remove(struct fb_info *fbi)
         struct mbxfb_info *mfbi = fbi->par;
         struct mbxfb_debugfs_data *dbg = mfbi->debugfs_data;
 
+        debugfs_remove(dbg->misc);
+        debugfs_remove(dbg->sdram);
         debugfs_remove(dbg->gsctl);
         debugfs_remove(dbg->display);
         debugfs_remove(dbg->clock);
diff --git a/drivers/video/mbx/mbxfb.c b/drivers/video/mbx/mbxfb.c
index a32d1af79e07..980d5f623902 100644
--- a/drivers/video/mbx/mbxfb.c
+++ b/drivers/video/mbx/mbxfb.c
@@ -1,8 +1,14 @@
 /*
  *  linux/drivers/video/mbx/mbxfb.c
  *
+ *  Copyright (C) 2006 8D Technologies inc
+ *  Raphael Assenat <raph@8d.com>
+ *      - Added video overlay support
+ *      - Various improvements
+ *
  *  Copyright (C) 2006 Compulab, Ltd.
  *  Mike Rapoport <mike@compulab.co.il>
+ *      - Creation of driver
  *
  *   Based on pxafb.c
  *
@@ -19,6 +25,7 @@
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
+#include <linux/uaccess.h>
 
 #include <asm/io.h>
 
@@ -29,6 +36,14 @@
 
 static unsigned long virt_base_2700;
 
+#define write_reg(val, reg) do { writel((val), (reg)); } while(0)
+
+/* Without this delay, the graphics appears somehow scaled and
+ * there is a lot of jitter in scanlines. This delay is probably
+ * needed only after setting some specific register(s) somewhere,
+ * not all over the place... */
+#define write_reg_dly(val, reg) do { writel((val), reg); udelay(1000); } while(0)
+
 #define MIN_XRES        16
 #define MIN_YRES        16
 #define MAX_XRES        2048
@@ -257,19 +272,17 @@ static int mbxfb_set_par(struct fb_info *info)
         gsctrl &= ~(FMsk(GSCTRL_GSWIDTH) | FMsk(GSCTRL_GSHEIGHT));
         gsctrl |= Gsctrl_Width(info->var.xres) |
                 Gsctrl_Height(info->var.yres);
-        writel(gsctrl, GSCTRL);
-        udelay(1000);
+        write_reg_dly(gsctrl, GSCTRL);
 
         gsadr &= ~(FMsk(GSADR_SRCSTRIDE));
         gsadr |= Gsadr_Srcstride(info->var.xres * info->var.bits_per_pixel /
                                  (8 * 16) - 1);
-        writel(gsadr, GSADR);
-        udelay(1000);
+        write_reg_dly(gsadr, GSADR);
 
         /* setup timings */
         var->pixclock = mbxfb_get_pixclock(info->var.pixclock, &div);
 
-        writel((Disp_Pll_M(div.m) | Disp_Pll_N(div.n) |
+        write_reg_dly((Disp_Pll_M(div.m) | Disp_Pll_N(div.n) |
                 Disp_Pll_P(div.p) | DISP_PLL_EN), DISPPLL);
 
         hbps = var->hsync_len;
@@ -282,18 +295,20 @@ static int mbxfb_set_par(struct fb_info *info)
         vfps = vas + var->yres;
         vt = vfps + var->lower_margin;
 
-        writel((Dht01_Hbps(hbps) | Dht01_Ht(ht)), DHT01);
-        writel((Dht02_Hlbs(has) | Dht02_Has(has)), DHT02);
-        writel((Dht03_Hfps(hfps) | Dht03_Hrbs(hfps)), DHT03);
-        writel((Dhdet_Hdes(has) | Dhdet_Hdef(hfps)), DHDET);
+        write_reg_dly((Dht01_Hbps(hbps) | Dht01_Ht(ht)), DHT01);
+        write_reg_dly((Dht02_Hlbs(has) | Dht02_Has(has)), DHT02);
+        write_reg_dly((Dht03_Hfps(hfps) | Dht03_Hrbs(hfps)), DHT03);
+        write_reg_dly((Dhdet_Hdes(has) | Dhdet_Hdef(hfps)), DHDET);
 
-        writel((Dvt01_Vbps(vbps) | Dvt01_Vt(vt)), DVT01);
-        writel((Dvt02_Vtbs(vas) | Dvt02_Vas(vas)), DVT02);
-        writel((Dvt03_Vfps(vfps) | Dvt03_Vbbs(vfps)), DVT03);
-        writel((Dvdet_Vdes(vas) | Dvdet_Vdef(vfps)), DVDET);
-        writel((Dvectrl_Vevent(vfps) | Dvectrl_Vfetch(vbps)), DVECTRL);
+        write_reg_dly((Dvt01_Vbps(vbps) | Dvt01_Vt(vt)), DVT01);
+        write_reg_dly((Dvt02_Vtbs(vas) | Dvt02_Vas(vas)), DVT02);
+        write_reg_dly((Dvt03_Vfps(vfps) | Dvt03_Vbbs(vfps)), DVT03);
+        write_reg_dly((Dvdet_Vdes(vas) | Dvdet_Vdef(vfps)), DVDET);
+        write_reg_dly((Dvectrl_Vevent(vfps) | Dvectrl_Vfetch(vbps)), DVECTRL);
 
-        writel((readl(DSCTRL) | DSCTRL_SYNCGEN_EN), DSCTRL);
+        write_reg_dly((readl(DSCTRL) | DSCTRL_SYNCGEN_EN), DSCTRL);
+
+        write_reg_dly(DINTRE_VEVENT0_EN, DINTRE);
 
         return 0;
 }
@@ -305,23 +320,203 @@ static int mbxfb_blank(int blank, struct fb_info *info)
         case FB_BLANK_VSYNC_SUSPEND:
         case FB_BLANK_HSYNC_SUSPEND:
         case FB_BLANK_NORMAL:
-                writel((readl(DSCTRL) & ~DSCTRL_SYNCGEN_EN), DSCTRL);
-                udelay(1000);
-                writel((readl(PIXCLK) & ~PIXCLK_EN), PIXCLK);
-                udelay(1000);
-                writel((readl(VOVRCLK) & ~VOVRCLK_EN), VOVRCLK);
-                udelay(1000);
+                write_reg_dly((readl(DSCTRL) & ~DSCTRL_SYNCGEN_EN), DSCTRL);
+                write_reg_dly((readl(PIXCLK) & ~PIXCLK_EN), PIXCLK);
+                write_reg_dly((readl(VOVRCLK) & ~VOVRCLK_EN), VOVRCLK);
                 break;
         case FB_BLANK_UNBLANK:
-                writel((readl(DSCTRL) | DSCTRL_SYNCGEN_EN), DSCTRL);
-                udelay(1000);
-                writel((readl(PIXCLK) | PIXCLK_EN), PIXCLK);
-                udelay(1000);
+                write_reg_dly((readl(DSCTRL) | DSCTRL_SYNCGEN_EN), DSCTRL);
+                write_reg_dly((readl(PIXCLK) | PIXCLK_EN), PIXCLK);
                 break;
         }
         return 0;
 }
 
+static int mbxfb_setupOverlay(struct mbxfb_overlaySetup *set)
+{
+        u32 vsctrl, vbbase, vscadr, vsadr;
+        u32 sssize, spoctrl, svctrl, shctrl;
+        u32 vubase, vvbase;
+        u32 vovrclk;
+
+        if (set->scaled_width==0 || set->scaled_height==0)
+                return -EINVAL;
+
+        /* read registers which have reserved bits
+         * so we can write them back as-is. */
+        vovrclk = readl(VOVRCLK);
+        vsctrl = readl(VSCTRL);
+        vscadr = readl(VSCADR);
+        vubase = readl(VUBASE);
+        vvbase = readl(VVBASE);
+
+        spoctrl = readl(SPOCTRL);
+        sssize = readl(SSSIZE);
+
+
+        vbbase = Vbbase_Glalpha(set->alpha);
+
+        vsctrl &= ~(    FMsk(VSCTRL_VSWIDTH) |
+                                        FMsk(VSCTRL_VSHEIGHT) |
+                                        FMsk(VSCTRL_VPIXFMT) |
+                                        VSCTRL_GAMMA_EN | VSCTRL_CSC_EN |
+                                        VSCTRL_COSITED );
+        vsctrl |= Vsctrl_Width(set->width) | Vsctrl_Height(set->height) |
+                                VSCTRL_CSC_EN;
+
+        vscadr &= ~(VSCADR_STR_EN | VSCADR_COLKEY_EN | VSCADR_COLKEYSRC |
+                                FMsk(VSCADR_BLEND_M) | FMsk(VSCADR_BLEND_POS) |
+                                FMsk(VSCADR_VBASE_ADR) );
+        vubase &= ~(VUBASE_UVHALFSTR | FMsk(VUBASE_UBASE_ADR));
+        vvbase &= ~(FMsk(VVBASE_VBASE_ADR));
+
+        switch (set->fmt)
+        {
+                case MBXFB_FMT_YUV12:
+                        vsctrl |= VSCTRL_VPIXFMT_YUV12;
+
+                        set->Y_stride = ((set->width) + 0xf ) & ~0xf;
+
+                        break;
+                case MBXFB_FMT_UY0VY1:
+                        vsctrl |= VSCTRL_VPIXFMT_UY0VY1;
+                        set->Y_stride = (set->width*2 + 0xf ) & ~0xf;
+                        break;
+                case MBXFB_FMT_VY0UY1:
+                        vsctrl |= VSCTRL_VPIXFMT_VY0UY1;
+                        set->Y_stride = (set->width*2 + 0xf ) & ~0xf;
+                        break;
+                case MBXFB_FMT_Y0UY1V:
+                        vsctrl |= VSCTRL_VPIXFMT_Y0UY1V;
+                        set->Y_stride = (set->width*2 + 0xf ) & ~0xf;
+                        break;
+                case MBXFB_FMT_Y0VY1U:
+                        vsctrl |= VSCTRL_VPIXFMT_Y0VY1U;
+                        set->Y_stride = (set->width*2 + 0xf ) & ~0xf;
+                        break;
+                default:
+                        return -EINVAL;
+        }
+
+        /* VSCTRL has the bits which sets the Video Pixel Format.
+         * When passing from a packed to planar format,
+         * if we write VSCTRL first, VVBASE and VUBASE would
+         * be zero if we would not set them here. (And then,
+         * the chips hangs and only a reset seems to fix it).
+         *
+         * If course, the values calculated here have no meaning
+         * for packed formats.
+         */
+        set->UV_stride = ((set->width/2) + 0x7 ) & ~0x7;
+                set->U_offset = set->height * set->Y_stride;
+                set->V_offset = set->U_offset +
+                                                set->height * set->UV_stride;
+        vubase |= Vubase_Ubase_Adr(
+                        (0x60000 + set->mem_offset + set->U_offset)>>3);
+        vvbase |= Vvbase_Vbase_Adr(
+                        (0x60000 + set->mem_offset + set->V_offset)>>3);
+
+
+        vscadr |= VSCADR_BLEND_VID | VSCADR_BLEND_GLOB |
+                Vscadr_Vbase_Adr((0x60000 + set->mem_offset)>>4);
+
+        if (set->enable)
+                vscadr |= VSCADR_STR_EN;
+
+
+        vsadr = Vsadr_Srcstride((set->Y_stride)/16-1) |
+                Vsadr_Xstart(set->x) | Vsadr_Ystart(set->y);
+
+        sssize &= ~(FMsk(SSSIZE_SC_WIDTH) | FMsk(SSSIZE_SC_HEIGHT));
+        sssize = Sssize_Sc_Width(set->scaled_width-1) |
+                        Sssize_Sc_Height(set->scaled_height-1);
+
+        spoctrl &= ~(SPOCTRL_H_SC_BP | SPOCTRL_V_SC_BP |
+                        SPOCTRL_HV_SC_OR | SPOCTRL_VS_UR_C |
+                        FMsk(SPOCTRL_VORDER) | FMsk(SPOCTRL_VPITCH));
+        spoctrl = Spoctrl_Vpitch((set->height<<11)/set->scaled_height)
+                                                        | SPOCTRL_VORDER_2TAP;
+
+        /* Bypass horiz/vert scaler when same size */
+        if (set->scaled_width == set->width)
+                spoctrl |= SPOCTRL_H_SC_BP;
+        if (set->scaled_height == set->height)
+                spoctrl |= SPOCTRL_V_SC_BP;
+
+        svctrl = Svctrl_Initial1(1<<10) | Svctrl_Initial2(1<<10);
+
+        shctrl = Shctrl_Hinitial(4<<11)
+                        | Shctrl_Hpitch((set->width<<11)/set->scaled_width);
+
+        /* Video plane registers */
+        write_reg(vsctrl, VSCTRL);
+        write_reg(vbbase, VBBASE);
+        write_reg(vscadr, VSCADR);
+        write_reg(vubase, VUBASE);
+        write_reg(vvbase, VVBASE);
+        write_reg(vsadr, VSADR);
+
+        /* Video scaler registers */
+        write_reg(sssize, SSSIZE);
+        write_reg(spoctrl, SPOCTRL);
+        write_reg(svctrl, SVCTRL);
+        write_reg(shctrl, SHCTRL);
+
+        /* RAPH: Using those coefficients, the scaled
+         * image is quite blurry. I dont know how
+         * to improve them ; The chip documentation
+         * was not helpful.. */
+        write_reg(0x21212121, VSCOEFF0);
+        write_reg(0x21212121, VSCOEFF1);
+        write_reg(0x21212121, VSCOEFF2);
+        write_reg(0x21212121, VSCOEFF3);
+        write_reg(0x21212121, VSCOEFF4);
+        write_reg(0x00000000, HSCOEFF0);
+        write_reg(0x00000000, HSCOEFF1);
+        write_reg(0x00000000, HSCOEFF2);
+        write_reg(0x03020201, HSCOEFF3);
+        write_reg(0x09070604, HSCOEFF4);
+        write_reg(0x0f0e0c0a, HSCOEFF5);
+        write_reg(0x15141211, HSCOEFF6);
+        write_reg(0x19181716, HSCOEFF7);
+        write_reg(0x00000019, HSCOEFF8);
+
+        /* Clock */
+        if (set->enable)
+                vovrclk |= 1;
+        else
+                vovrclk &= ~1;
+
+        write_reg(vovrclk, VOVRCLK);
+
+        return 0;
+}
+
+static int mbxfb_ioctl(struct fb_info *info, unsigned int cmd,
+                                unsigned long arg)
+{
+        struct mbxfb_overlaySetup setup;
+        int res;
+
+        if (cmd == MBXFB_IOCX_OVERLAY)
+        {
+                if (copy_from_user(&setup, (void __user*)arg,
+                                        sizeof(struct mbxfb_overlaySetup)))
+                        return -EFAULT;
+
+                res = mbxfb_setupOverlay(&setup);
+                if (res)
+                        return res;
+
+                if (copy_to_user((void __user*)arg, &setup,
+                                        sizeof(struct mbxfb_overlaySetup)))
+                        return -EFAULT;
+
+                return 0;
+        }
+        return -EINVAL;
+}
+
 static struct fb_ops mbxfb_ops = {
         .owner = THIS_MODULE,
         .fb_check_var = mbxfb_check_var,
@@ -331,6 +526,7 @@ static struct fb_ops mbxfb_ops = {
         .fb_copyarea = cfb_copyarea,
         .fb_imageblit = cfb_imageblit,
         .fb_blank = mbxfb_blank,
+        .fb_ioctl = mbxfb_ioctl,
 };
 
 /*
@@ -339,36 +535,29 @@ static struct fb_ops mbxfb_ops = {
 */
 static void __devinit setup_memc(struct fb_info *fbi)
 {
-        struct mbxfb_info *mfbi = fbi->par;
         unsigned long tmp;
         int i;
 
         /* FIXME: use platfrom specific parameters */
         /* setup SDRAM controller */
-        writel((LMCFG_LMC_DS | LMCFG_LMC_TS | LMCFG_LMD_TS |
+        write_reg_dly((LMCFG_LMC_DS | LMCFG_LMC_TS | LMCFG_LMD_TS |
                 LMCFG_LMA_TS),
                LMCFG);
-        udelay(1000);
 
-        writel(LMPWR_MC_PWR_ACT, LMPWR);
-        udelay(1000);
+        write_reg_dly(LMPWR_MC_PWR_ACT, LMPWR);
 
         /* setup SDRAM timings */
-        writel((Lmtim_Tras(7) | Lmtim_Trp(3) | Lmtim_Trcd(3) |
+        write_reg_dly((Lmtim_Tras(7) | Lmtim_Trp(3) | Lmtim_Trcd(3) |
                 Lmtim_Trc(9) | Lmtim_Tdpl(2)),
                LMTIM);
-        udelay(1000);
         /* setup SDRAM refresh rate */
-        writel(0xc2b, LMREFRESH);
-        udelay(1000);
+        write_reg_dly(0xc2b, LMREFRESH);
         /* setup SDRAM type parameters */
-        writel((LMTYPE_CASLAT_3 | LMTYPE_BKSZ_2 | LMTYPE_ROWSZ_11 |
+        write_reg_dly((LMTYPE_CASLAT_3 | LMTYPE_BKSZ_2 | LMTYPE_ROWSZ_11 |
                 LMTYPE_COLSZ_8),
                LMTYPE);
-        udelay(1000);
         /* enable memory controller */
-        writel(LMPWR_MC_PWR_ACT, LMPWR);
-        udelay(1000);
+        write_reg_dly(LMPWR_MC_PWR_ACT, LMPWR);
 
         /* perform dummy reads */
         for ( i = 0; i < 16; i++ ) {
@@ -379,34 +568,30 @@ static void __devinit setup_memc(struct fb_info *fbi)
 static void enable_clocks(struct fb_info *fbi)
 {
         /* enable clocks */
-        writel(SYSCLKSRC_PLL_2, SYSCLKSRC);
-        udelay(1000);
-        writel(PIXCLKSRC_PLL_1, PIXCLKSRC);
-        udelay(1000);
-        writel(0x00000000, CLKSLEEP);
-        udelay(1000);
-        writel((Core_Pll_M(0x17) | Core_Pll_N(0x3) | Core_Pll_P(0x0) |
+        write_reg_dly(SYSCLKSRC_PLL_2, SYSCLKSRC);
+        write_reg_dly(PIXCLKSRC_PLL_1, PIXCLKSRC);
+        write_reg_dly(0x00000000, CLKSLEEP);
+
+        /* PLL output = (Frefclk * M) / (N * 2^P )
+         *
+         * M: 0x17, N: 0x3, P: 0x0 == 100 Mhz!
+         * M: 0xb, N: 0x1, P: 0x1 == 71 Mhz
+         * */
+        write_reg_dly((Core_Pll_M(0xb) | Core_Pll_N(0x1) | Core_Pll_P(0x1) |
                 CORE_PLL_EN),
                COREPLL);
-        udelay(1000);
-        writel((Disp_Pll_M(0x1b) | Disp_Pll_N(0x7) | Disp_Pll_P(0x1) |
+
+        write_reg_dly((Disp_Pll_M(0x1b) | Disp_Pll_N(0x7) | Disp_Pll_P(0x1) |
                 DISP_PLL_EN),
                DISPPLL);
 
-        writel(0x00000000, VOVRCLK);
-        udelay(1000);
-        writel(PIXCLK_EN, PIXCLK);
-        udelay(1000);
-        writel(MEMCLK_EN, MEMCLK);
-        udelay(1000);
-        writel(0x00000006, M24CLK);
-        udelay(1000);
-        writel(0x00000006, MBXCLK);
-        udelay(1000);
-        writel(SDCLK_EN, SDCLK);
-        udelay(1000);
-        writel(0x00000001, PIXCLKDIV);
-        udelay(1000);
+        write_reg_dly(0x00000000, VOVRCLK);
+        write_reg_dly(PIXCLK_EN, PIXCLK);
+        write_reg_dly(MEMCLK_EN, MEMCLK);
+        write_reg_dly(0x00000006, M24CLK);
+        write_reg_dly(0x00000006, MBXCLK);
+        write_reg_dly(SDCLK_EN, SDCLK);
+        write_reg_dly(0x00000001, PIXCLKDIV);
 }
 
 static void __devinit setup_graphics(struct fb_info *fbi)
@@ -430,16 +615,11 @@ static void __devinit setup_graphics(struct fb_info *fbi)
                 break;
         }
 
-        writel(gsctrl, GSCTRL);
-        udelay(1000);
-        writel(0x00000000, GBBASE);
-        udelay(1000);
-        writel(0x00ffffff, GDRCTRL);
-        udelay(1000);
-        writel((GSCADR_STR_EN | Gscadr_Gbase_Adr(0x6000)), GSCADR);
-        udelay(1000);
-        writel(0x00000000, GPLUT);
-        udelay(1000);
+        write_reg_dly(gsctrl, GSCTRL);
+        write_reg_dly(0x00000000, GBBASE);
+        write_reg_dly(0x00ffffff, GDRCTRL);
+        write_reg_dly((GSCADR_STR_EN | Gscadr_Gbase_Adr(0x6000)), GSCADR);
+        write_reg_dly(0x00000000, GPLUT);
 }
 
 static void __devinit setup_display(struct fb_info *fbi)
@@ -451,17 +631,14 @@ static void __devinit setup_display(struct fb_info *fbi)
                 dsctrl |= DSCTRL_HS_POL;
         if (fbi->var.sync & FB_SYNC_VERT_HIGH_ACT)
                 dsctrl |= DSCTRL_VS_POL;
-        writel(dsctrl, DSCTRL);
-        udelay(1000);
-        writel(0xd0303010, DMCTRL);
-        udelay(1000);
-        writel((readl(DSCTRL) | DSCTRL_SYNCGEN_EN), DSCTRL);
+        write_reg_dly(dsctrl, DSCTRL);
+        write_reg_dly(0xd0303010, DMCTRL);
+        write_reg_dly((readl(DSCTRL) | DSCTRL_SYNCGEN_EN), DSCTRL);
 }
 
 static void __devinit enable_controller(struct fb_info *fbi)
 {
-        writel(SYSRST_RST, SYSRST);
-        udelay(1000);
+        write_reg_dly(SYSRST_RST, SYSRST);
 
 
         enable_clocks(fbi);
@@ -478,12 +655,12 @@ static void __devinit enable_controller(struct fb_info *fbi)
 static int mbxfb_suspend(struct platform_device *dev, pm_message_t state)
 {
         /* make frame buffer memory enter self-refresh mode */
-        writel(LMPWR_MC_PWR_SRM, LMPWR);
+        write_reg_dly(LMPWR_MC_PWR_SRM, LMPWR);
         while (LMPWRSTAT != LMPWRSTAT_MC_PWR_SRM)
                 ; /* empty statement */
 
         /* reset the device, since it's initial state is 'mostly sleeping' */
-        writel(SYSRST_RST, SYSRST);
+        write_reg_dly(SYSRST_RST, SYSRST);
         return 0;
 }
 
@@ -495,7 +672,7 @@ static int mbxfb_resume(struct platform_device *dev)
 /*      setup_graphics(fbi); */
 /*      setup_display(fbi); */
 
-        writel((readl(DSCTRL) | DSCTRL_SYNCGEN_EN), DSCTRL);
+        write_reg_dly((readl(DSCTRL) | DSCTRL_SYNCGEN_EN), DSCTRL);
         return 0;
 }
 #else
@@ -520,6 +697,12 @@ static int __devinit mbxfb_probe(struct platform_device *dev)
 
         dev_dbg(dev, "mbxfb_probe\n");
 
+        pdata = dev->dev.platform_data;
+        if (!pdata) {
+                dev_err(&dev->dev, "platform data is required\n");
+                return -EINVAL;
+        }
+
         fbi = framebuffer_alloc(sizeof(struct mbxfb_info), &dev->dev);
         if (fbi == NULL) {
                 dev_err(&dev->dev, "framebuffer_alloc failed\n");
@@ -528,7 +711,8 @@ static int __devinit mbxfb_probe(struct platform_device *dev)
 
         mfbi = fbi->par;
         fbi->pseudo_palette = mfbi->pseudo_palette;
-        pdata = dev->dev.platform_data;
+
+
         if (pdata->probe)
                 mfbi->platform_probe = pdata->probe;
         if (pdata->remove)
@@ -578,16 +762,16 @@ static int __devinit mbxfb_probe(struct platform_device *dev)
                 goto err4;
         }
 
-        /* FIXME: get from platform */
         fbi->screen_base = (char __iomem *)(mfbi->fb_virt_addr + 0x60000);
-        fbi->screen_size = 8 * 1024 * 1024;     /* 8 Megs */
+        fbi->screen_size = pdata->memsize;
         fbi->fbops = &mbxfb_ops;
 
         fbi->var = mbxfb_default;
         fbi->fix = mbxfb_fix;
         fbi->fix.smem_start = mfbi->fb_phys_addr + 0x60000;
-        fbi->fix.smem_len = 8 * 1024 * 1024;
-        fbi->fix.line_length = 640 * 2;
+        fbi->fix.smem_len = pdata->memsize;
+        fbi->fix.line_length = mbxfb_default.xres_virtual *
+                                        mbxfb_default.bits_per_pixel / 8;
 
         ret = fb_alloc_cmap(&fbi->cmap, 256, 0);
         if (ret < 0) {
@@ -636,8 +820,7 @@ static int __devexit mbxfb_remove(struct platform_device *dev)
 {
         struct fb_info *fbi = platform_get_drvdata(dev);
 
-        writel(SYSRST_RST, SYSRST);
-        udelay(1000);
+        write_reg_dly(SYSRST_RST, SYSRST);
 
         mbxfb_debugfs_remove(fbi);
 
diff --git a/drivers/video/mbx/reg_bits.h b/drivers/video/mbx/reg_bits.h
index c226a8e45312..9a24fb0c7d48 100644
--- a/drivers/video/mbx/reg_bits.h
+++ b/drivers/video/mbx/reg_bits.h
@@ -242,6 +242,67 @@
 #define GPLUT_LUTDATA   Fld(24,0)
 #define Gplut_Lutdata(x)        ((x) << FShft(GPLUT_LUTDATA))
 
+/* VSCTRL - Video Surface Control Register */
+#define VSCTRL_VPIXFMT          Fld(4,27)
+#define VSCTRL_VPIXFMT_YUV12    ((0x9) << FShft(VSCTRL_VPIXFMT))
+#define VSCTRL_VPIXFMT_UY0VY1   ((0xc) << FShft(VSCTRL_VPIXFMT))
+#define VSCTRL_VPIXFMT_VY0UY1   ((0xd) << FShft(VSCTRL_VPIXFMT))
+#define VSCTRL_VPIXFMT_Y0UY1V   ((0xe) << FShft(VSCTRL_VPIXFMT))
+#define VSCTRL_VPIXFMT_Y0VY1U   ((0xf) << FShft(VSCTRL_VPIXFMT))
+#define VSCTRL_GAMMA_EN         (1 << 26)
+#define VSCTRL_CSC_EN           (1 << 25)
+#define VSCTRL_COSITED          (1 << 22)
+#define VSCTRL_VSWIDTH          Fld(11,11)
+#define Vsctrl_Width(Pixels) /* Video Width [1-2048] */ \
+                        (((Pixels) - 1) << FShft(VSCTRL_VSWIDTH))
+#define VSCTRL_VSHEIGHT         Fld(11,0)
+#define Vsctrl_Height(Pixels) /* Video Height [1-2048] */ \
+                        (((Pixels) - 1) << FShft(VSCTRL_VSHEIGHT))
+
+/* VBBASE - Video Blending Base Register */
+#define VBBASE_GLALPHA          Fld(8,24)
+#define Vbbase_Glalpha(x)       ((x) << FShft(VBBASE_GLALPHA))
+
+#define VBBASE_COLKEY           Fld(24,0)
+#define Vbbase_Colkey(x)        ((x) << FShft(VBBASE_COLKEY))
+
+/* VCMSK - Video Color Key Mask Register */
+#define VCMSK_COLKEY_M          Fld(24,0)
+#define Vcmsk_colkey_m(x)       ((x) << FShft(VCMSK_COLKEY_M))
+
+/* VSCADR - Video Stream Control Rddress Register */
+#define VSCADR_STR_EN           (1 << 31)
+#define VSCADR_COLKEY_EN        (1 << 30)
+#define VSCADR_COLKEYSRC        (1 << 29)
+#define VSCADR_BLEND_M          Fld(2,27)
+#define VSCADR_BLEND_NONE       ((0x0) << FShft(VSCADR_BLEND_M))
+#define VSCADR_BLEND_INV        ((0x1) << FShft(VSCADR_BLEND_M))
+#define VSCADR_BLEND_GLOB       ((0x2) << FShft(VSCADR_BLEND_M))
+#define VSCADR_BLEND_PIX        ((0x3) << FShft(VSCADR_BLEND_M))
+#define VSCADR_BLEND_POS        Fld(2,24)
+#define VSCADR_BLEND_GFX        ((0x0) << FShft(VSCADR_BLEND_POS))
+#define VSCADR_BLEND_VID        ((0x1) << FShft(VSCADR_BLEND_POS))
+#define VSCADR_BLEND_CUR        ((0x2) << FShft(VSCADR_BLEND_POS))
+#define VSCADR_VBASE_ADR        Fld(23,0)
+#define Vscadr_Vbase_Adr(x)     ((x) << FShft(VSCADR_VBASE_ADR))
+
+/* VUBASE - Video U Base Register */
+#define VUBASE_UVHALFSTR        (1 << 31)
+#define VUBASE_UBASE_ADR        Fld(24,0)
+#define Vubase_Ubase_Adr(x)     ((x) << FShft(VUBASE_UBASE_ADR))
+
+/* VVBASE - Video V Base Register */
+#define VVBASE_VBASE_ADR        Fld(24,0)
+#define Vvbase_Vbase_Adr(x)     ((x) << FShft(VVBASE_VBASE_ADR))
+
+/* VSADR - Video Stride Address Register */
+#define VSADR_SRCSTRIDE         Fld(10,22)
+#define Vsadr_Srcstride(x)      ((x) << FShft(VSADR_SRCSTRIDE))
+#define VSADR_XSTART            Fld(11,11)
+#define Vsadr_Xstart(x)         ((x) << FShft(VSADR_XSTART))
+#define VSADR_YSTART            Fld(11,0)
+#define Vsadr_Ystart(x)         ((x) << FShft(VSADR_YSTART))
+
 /* HCCTRL - Hardware Cursor Register fields */
 #define HCCTRL_CUR_EN   (1 << 31)
 #define HCCTRL_COLKEY_EN        (1 << 29)
@@ -394,6 +455,30 @@
 #define DMCTRL_BURSTLEN Fld(6,0)
 #define Dmctrl_Burstlen(x)      ((x) << FShft(DMCTRL_BURSTLEN))
 
+/* DINTRS - Display Interrupt Status Register */
+#define DINTRS_CUR_OR_S         (1 << 18)
+#define DINTRS_STR2_OR_S        (1 << 17)
+#define DINTRS_STR1_OR_S        (1 << 16)
+#define DINTRS_CUR_UR_S         (1 << 6)
+#define DINTRS_STR2_UR_S        (1 << 5)
+#define DINTRS_STR1_UR_S        (1 << 4)
+#define DINTRS_VEVENT1_S        (1 << 3)
+#define DINTRS_VEVENT0_S        (1 << 2)
+#define DINTRS_HBLNK1_S         (1 << 1)
+#define DINTRS_HBLNK0_S         (1 << 0)
+
+/* DINTRE - Display Interrupt Enable Register */
+#define DINTRE_CUR_OR_EN        (1 << 18)
+#define DINTRE_STR2_OR_EN       (1 << 17)
+#define DINTRE_STR1_OR_EN       (1 << 16)
+#define DINTRE_CUR_UR_EN        (1 << 6)
+#define DINTRE_STR2_UR_EN       (1 << 5)
+#define DINTRE_STR1_UR_EN       (1 << 4)
+#define DINTRE_VEVENT1_EN       (1 << 3)
+#define DINTRE_VEVENT0_EN       (1 << 2)
+#define DINTRE_HBLNK1_EN        (1 << 1)
+#define DINTRE_HBLNK0_EN        (1 << 0)
+
 
 /* DLSTS - display load status register */
 #define DLSTS_RLD_ADONE (1 << 23)
@@ -403,16 +488,41 @@
 #define DLLCTRL_RLD_ADRLN       Fld(8,24)
 #define Dllctrl_Rld_Adrln(x)    ((x) << FShft(DLLCTRL_RLD_ADRLN))
 
+/* CLIPCTRL - Clipping Control Register */
+#define CLIPCTRL_HSKIP          Fld(11,16)
+#define Clipctrl_Hskip          ((x) << FShft(CLIPCTRL_HSKIP))
+#define CLIPCTRL_VSKIP          Fld(11,0)
+#define Clipctrl_Vskip          ((x) << FShft(CLIPCTRL_VSKIP))
+
 /* SPOCTRL - Scale Pitch/Order Control Register */
 #define SPOCTRL_H_SC_BP         (1 << 31)
 #define SPOCTRL_V_SC_BP         (1 << 30)
 #define SPOCTRL_HV_SC_OR        (1 << 29)
 #define SPOCTRL_VS_UR_C         (1 << 27)
-#define SPOCTRL_VORDER  Fld(2,16)
+#define SPOCTRL_VORDER          Fld(2,16)
 #define SPOCTRL_VORDER_1TAP     ((0x0) << FShft(SPOCTRL_VORDER))
 #define SPOCTRL_VORDER_2TAP     ((0x1) << FShft(SPOCTRL_VORDER))
 #define SPOCTRL_VORDER_4TAP     ((0x3) << FShft(SPOCTRL_VORDER))
-#define SPOCTRL_VPITCH  Fld(16,0)
+#define SPOCTRL_VPITCH          Fld(16,0)
 #define Spoctrl_Vpitch(x)       ((x) << FShft(SPOCTRL_VPITCH))
 
+/* SVCTRL - Scale Vertical Control Register */
+#define SVCTRL_INITIAL1         Fld(16,16)
+#define Svctrl_Initial1(x)      ((x) << FShft(SVCTRL_INITIAL1))
+#define SVCTRL_INITIAL2         Fld(16,0)
+#define Svctrl_Initial2(x)      ((x) << FShft(SVCTRL_INITIAL2))
+
+/* SHCTRL - Scale Horizontal Control Register */
+#define SHCTRL_HINITIAL         Fld(16,16)
+#define Shctrl_Hinitial(x)      ((x) << FShft(SHCTRL_HINITIAL))
+#define SHCTRL_HDECIM           (1 << 15)
+#define SHCTRL_HPITCH           Fld(15,0)
+#define Shctrl_Hpitch(x)        ((x) << FShft(SHCTRL_HPITCH))
+
+/* SSSIZE - Scale Surface Size Register */
+#define SSSIZE_SC_WIDTH         Fld(11,16)
+#define Sssize_Sc_Width(x)      ((x) << FShft(SSSIZE_SC_WIDTH))
+#define SSSIZE_SC_HEIGHT        Fld(11,0)
+#define Sssize_Sc_Height(x)     ((x) << FShft(SSSIZE_SC_HEIGHT))
+
 #endif /* __REG_BITS_2700G_ */
diff --git a/drivers/video/mbx/regs.h b/drivers/video/mbx/regs.h
index ad20be07666b..a7c63d865aad 100644
--- a/drivers/video/mbx/regs.h
+++ b/drivers/video/mbx/regs.h
@@ -127,7 +127,7 @@
 #define HSCOEFF0        __REG_2700G(0x000021b4)
 #define HSCOEFF1        __REG_2700G(0x000021b8)
 #define HSCOEFF2        __REG_2700G(0x000021bc)
-#define HSCOEFF3        __REG_2700G(0x000021b0)
+#define HSCOEFF3        __REG_2700G(0x000021c0)
 #define HSCOEFF4        __REG_2700G(0x000021c4)
 #define HSCOEFF5        __REG_2700G(0x000021c8)
 #define HSCOEFF6        __REG_2700G(0x000021cc)
diff --git a/drivers/video/modedb.c b/drivers/video/modedb.c
index d1267904c280..5df41f6f2b86 100644
--- a/drivers/video/modedb.c
+++ b/drivers/video/modedb.c
@@ -34,8 +34,6 @@ const char *global_mode_option;
      *  Standard video mode definitions (taken from XFree86)
      */
 
-#define DEFAULT_MODEDB_INDEX    0
-
 static const struct fb_videomode modedb[] = {
     {
         /* 640x400 @ 70 Hz, 31.5 kHz hsync */
@@ -505,8 +503,10 @@ int fb_find_mode(struct fb_var_screeninfo *var,
         db = modedb;
         dbsize = ARRAY_SIZE(modedb);
     }
+
     if (!default_mode)
-        default_mode = &modedb[DEFAULT_MODEDB_INDEX];
+        default_mode = &db[0];
+
     if (!default_bpp)
         default_bpp = 8;
 
diff --git a/drivers/video/neofb.c b/drivers/video/neofb.c
index 59a6f5fa5ae6..deaf820cb38f 100644
--- a/drivers/video/neofb.c
+++ b/drivers/video/neofb.c
@@ -1932,7 +1932,7 @@ static int __devinit neo_init_hw(struct fb_info *info)
         printk(KERN_DEBUG "--- Neo extended register dump ---\n");
         for (int w = 0; w < 0x85; w++)
                 printk(KERN_DEBUG "CR %p: %p\n", (void *) w,
-                       (void *) vga_rcrt(NULL, w);
+                       (void *) vga_rcrt(NULL, w));
         for (int w = 0; w < 0xC7; w++)
                 printk(KERN_DEBUG "GR %p: %p\n", (void *) w,
                        (void *) vga_rgfx(NULL, w));
diff --git a/drivers/video/nvidia/nv_accel.c b/drivers/video/nvidia/nv_accel.c
index 4aefb8f41637..9efb8a3854e2 100644
--- a/drivers/video/nvidia/nv_accel.c
+++ b/drivers/video/nvidia/nv_accel.c
@@ -261,41 +261,6 @@ void NVResetGraphics(struct fb_info *info)
         NVDmaKickoff(par);
 }
 
-u8 byte_rev[256] = {
-        0x00, 0x80, 0x40, 0xc0, 0x20, 0xa0, 0x60, 0xe0,
-        0x10, 0x90, 0x50, 0xd0, 0x30, 0xb0, 0x70, 0xf0,
-        0x08, 0x88, 0x48, 0xc8, 0x28, 0xa8, 0x68, 0xe8,
-        0x18, 0x98, 0x58, 0xd8, 0x38, 0xb8, 0x78, 0xf8,
-        0x04, 0x84, 0x44, 0xc4, 0x24, 0xa4, 0x64, 0xe4,
-        0x14, 0x94, 0x54, 0xd4, 0x34, 0xb4, 0x74, 0xf4,
-        0x0c, 0x8c, 0x4c, 0xcc, 0x2c, 0xac, 0x6c, 0xec,
-        0x1c, 0x9c, 0x5c, 0xdc, 0x3c, 0xbc, 0x7c, 0xfc,
-        0x02, 0x82, 0x42, 0xc2, 0x22, 0xa2, 0x62, 0xe2,
-        0x12, 0x92, 0x52, 0xd2, 0x32, 0xb2, 0x72, 0xf2,
-        0x0a, 0x8a, 0x4a, 0xca, 0x2a, 0xaa, 0x6a, 0xea,
-        0x1a, 0x9a, 0x5a, 0xda, 0x3a, 0xba, 0x7a, 0xfa,
-        0x06, 0x86, 0x46, 0xc6, 0x26, 0xa6, 0x66, 0xe6,
-        0x16, 0x96, 0x56, 0xd6, 0x36, 0xb6, 0x76, 0xf6,
-        0x0e, 0x8e, 0x4e, 0xce, 0x2e, 0xae, 0x6e, 0xee,
-        0x1e, 0x9e, 0x5e, 0xde, 0x3e, 0xbe, 0x7e, 0xfe,
-        0x01, 0x81, 0x41, 0xc1, 0x21, 0xa1, 0x61, 0xe1,
-        0x11, 0x91, 0x51, 0xd1, 0x31, 0xb1, 0x71, 0xf1,
-        0x09, 0x89, 0x49, 0xc9, 0x29, 0xa9, 0x69, 0xe9,
-        0x19, 0x99, 0x59, 0xd9, 0x39, 0xb9, 0x79, 0xf9,
-        0x05, 0x85, 0x45, 0xc5, 0x25, 0xa5, 0x65, 0xe5,
-        0x15, 0x95, 0x55, 0xd5, 0x35, 0xb5, 0x75, 0xf5,
-        0x0d, 0x8d, 0x4d, 0xcd, 0x2d, 0xad, 0x6d, 0xed,
-        0x1d, 0x9d, 0x5d, 0xdd, 0x3d, 0xbd, 0x7d, 0xfd,
-        0x03, 0x83, 0x43, 0xc3, 0x23, 0xa3, 0x63, 0xe3,
-        0x13, 0x93, 0x53, 0xd3, 0x33, 0xb3, 0x73, 0xf3,
-        0x0b, 0x8b, 0x4b, 0xcb, 0x2b, 0xab, 0x6b, 0xeb,
-        0x1b, 0x9b, 0x5b, 0xdb, 0x3b, 0xbb, 0x7b, 0xfb,
-        0x07, 0x87, 0x47, 0xc7, 0x27, 0xa7, 0x67, 0xe7,
-        0x17, 0x97, 0x57, 0xd7, 0x37, 0xb7, 0x77, 0xf7,
-        0x0f, 0x8f, 0x4f, 0xcf, 0x2f, 0xaf, 0x6f, 0xef,
-        0x1f, 0x9f, 0x5f, 0xdf, 0x3f, 0xbf, 0x7f, 0xff,
-};
-
 int nvidiafb_sync(struct fb_info *info)
 {
         struct nvidia_par *par = info->par;
diff --git a/drivers/video/nvidia/nv_hw.c b/drivers/video/nvidia/nv_hw.c
index 9ed640d35728..ea426115c6f9 100644
--- a/drivers/video/nvidia/nv_hw.c
+++ b/drivers/video/nvidia/nv_hw.c
@@ -145,12 +145,18 @@ static void nvGetClocks(struct nvidia_par *par, unsigned int *MClk,
 
         if (par->Architecture >= NV_ARCH_40) {
                 pll = NV_RD32(par->PMC, 0x4020);
-                P = (pll >> 16) & 0x03;
+                P = (pll >> 16) & 0x07;
                 pll = NV_RD32(par->PMC, 0x4024);
                 M = pll & 0xFF;
                 N = (pll >> 8) & 0xFF;
-                MB = (pll >> 16) & 0xFF;
-                NB = (pll >> 24) & 0xFF;
+                if (((par->Chipset & 0xfff0) == 0x0290) ||
+                                ((par->Chipset & 0xfff0) == 0x0390)) {
+                        MB = 1;
+                        NB = 1;
+                } else {
+                        MB = (pll >> 16) & 0xFF;
+                        NB = (pll >> 24) & 0xFF;
+                }
                 *MClk = ((N * NB * par->CrystalFreqKHz) / (M * MB)) >> P;
 
                 pll = NV_RD32(par->PMC, 0x4000);
diff --git a/drivers/video/nvidia/nv_i2c.c b/drivers/video/nvidia/nv_i2c.c
index 19eef3a09023..8454adf2d178 100644
--- a/drivers/video/nvidia/nv_i2c.c
+++ b/drivers/video/nvidia/nv_i2c.c
@@ -147,15 +147,15 @@ void nvidia_create_i2c_busses(struct nvidia_par *par)
 void nvidia_delete_i2c_busses(struct nvidia_par *par)
 {
         if (par->chan[0].par)
-                i2c_bit_del_bus(&par->chan[0].adapter);
+                i2c_del_adapter(&par->chan[0].adapter);
         par->chan[0].par = NULL;
 
         if (par->chan[1].par)
-                i2c_bit_del_bus(&par->chan[1].adapter);
+                i2c_del_adapter(&par->chan[1].adapter);
         par->chan[1].par = NULL;
 
         if (par->chan[2].par)
-                i2c_bit_del_bus(&par->chan[2].adapter);
+                i2c_del_adapter(&par->chan[2].adapter);
         par->chan[2].par = NULL;
 
 }
@@ -210,11 +210,8 @@ int nvidia_probe_i2c_connector(struct fb_info *info, int conn, u8 **out_edid)
                 /* try to get from firmware */
                 const u8 *e = fb_firmware_edid(info->device);
 
-                if (e != NULL) {
-                        edid = kmalloc(EDID_LENGTH, GFP_KERNEL);
-                        if (edid)
-                                memcpy(edid, e, EDID_LENGTH);
-                }
+                if (e != NULL)
+                        edid = kmemdup(e, EDID_LENGTH, GFP_KERNEL);
         }
 
         *out_edid = edid;
diff --git a/drivers/video/nvidia/nv_local.h b/drivers/video/nvidia/nv_local.h
index 4243d7fae972..e009d242ea10 100644
--- a/drivers/video/nvidia/nv_local.h
+++ b/drivers/video/nvidia/nv_local.h
@@ -96,13 +96,16 @@
 #define READ_GET(par) (NV_RD32(&(par)->FIFO[0x0011], 0) >> 2)
 
 #ifdef __LITTLE_ENDIAN
+
+#include <linux/bitrev.h>
+
 #define reverse_order(l)        \
 do {                            \
         u8 *a = (u8 *)(l);      \
-        *a = byte_rev[*a], a++; \
-        *a = byte_rev[*a], a++; \
-        *a = byte_rev[*a], a++; \
-        *a = byte_rev[*a];      \
+        a[0] = bitrev8(a[0]);   \
+        a[1] = bitrev8(a[1]);   \
+        a[2] = bitrev8(a[2]);   \
+        a[3] = bitrev8(a[3]);   \
 } while(0)
 #else
 #define reverse_order(l) do { } while(0)
diff --git a/drivers/video/nvidia/nv_of.c b/drivers/video/nvidia/nv_of.c
index d9af88c2b580..181875fe35c6 100644
--- a/drivers/video/nvidia/nv_of.c
+++ b/drivers/video/nvidia/nv_of.c
@@ -72,10 +72,9 @@ int nvidia_probe_of_connector(struct fb_info *info, int conn, u8 **out_edid)
                 }
         }
         if (pedid) {
-                *out_edid = kmalloc(EDID_LENGTH, GFP_KERNEL);
+                *out_edid = kmemdup(pedid, EDID_LENGTH, GFP_KERNEL);
                 if (*out_edid == NULL)
                         return -1;
-                memcpy(*out_edid, pedid, EDID_LENGTH);
                 printk(KERN_DEBUG "nvidiafb: Found OF EDID for head %d\n", conn);
                 return 0;
         }
diff --git a/drivers/video/nvidia/nv_proto.h b/drivers/video/nvidia/nv_proto.h
index 861271017655..43058d0cf5b7 100644
--- a/drivers/video/nvidia/nv_proto.h
+++ b/drivers/video/nvidia/nv_proto.h
@@ -62,7 +62,6 @@ extern void nvidiafb_fillrect(struct fb_info *info,
 extern void nvidiafb_imageblit(struct fb_info *info,
                                const struct fb_image *image);
 extern int nvidiafb_sync(struct fb_info *info);
-extern u8 byte_rev[256];
 
 /* in nv_backlight.h */
 #ifdef CONFIG_FB_NVIDIA_BACKLIGHT
diff --git a/drivers/video/nvidia/nv_setup.c b/drivers/video/nvidia/nv_setup.c
index a18a9aebf05f..eab3e282a4de 100644
--- a/drivers/video/nvidia/nv_setup.c
+++ b/drivers/video/nvidia/nv_setup.c
@@ -262,7 +262,7 @@ static void nv10GetConfig(struct nvidia_par *par)
 #endif
 
         dev = pci_find_slot(0, 1);
-        if ((par->Chipset && 0xffff) == 0x01a0) {
+        if ((par->Chipset & 0xffff) == 0x01a0) {
                 int amt = 0;
 
                 pci_read_config_dword(dev, 0x7c, &amt);
@@ -359,6 +359,7 @@ int NVCommonSetup(struct fb_info *info)
         case 0x0186:
         case 0x0187:
         case 0x018D:
+        case 0x0228:
         case 0x0286:
         case 0x028C:
         case 0x0316:
@@ -382,6 +383,10 @@ int NVCommonSetup(struct fb_info *info)
         case 0x034C:
         case 0x0160:
         case 0x0166:
+        case 0x0169:
+        case 0x016B:
+        case 0x016C:
+        case 0x016D:
         case 0x00C8:
         case 0x00CC:
         case 0x0144:
@@ -639,12 +644,23 @@ int NVCommonSetup(struct fb_info *info)
                 par->fpHeight = NV_RD32(par->PRAMDAC, 0x0800) + 1;
                 par->fpSyncs = NV_RD32(par->PRAMDAC, 0x0848) & 0x30000033;
 
-                printk("Panel size is %i x %i\n", par->fpWidth, par->fpHeight);
+                printk("nvidiafb: Panel size is %i x %i\n", par->fpWidth, par->fpHeight);
         }
 
         if (monA)
                 info->monspecs = *monA;
 
+        if (!par->FlatPanel || !par->twoHeads)
+                par->FPDither = 0;
+
+        par->LVDS = 0;
+        if (par->FlatPanel && par->twoHeads) {
+                NV_WR32(par->PRAMDAC0, 0x08B0, 0x00010004);
+                if (par->PRAMDAC0[0x08b4] & 1)
+                        par->LVDS = 1;
+                printk("nvidiafb: Panel is %s\n", par->LVDS ? "LVDS" : "TMDS");
+        }
+
         kfree(edidA);
         kfree(edidB);
 done:
diff --git a/drivers/video/nvidia/nv_type.h b/drivers/video/nvidia/nv_type.h
index acdc26693402..86e65dea60d3 100644
--- a/drivers/video/nvidia/nv_type.h
+++ b/drivers/video/nvidia/nv_type.h
@@ -129,6 +129,7 @@ struct nvidia_par {
         int fpHeight;
         int PanelTweak;
         int paneltweak;
+        int LVDS;
         int pm_state;
         u32 crtcSync_read;
         u32 fpSyncs;
diff --git a/drivers/video/nvidia/nvidia.c b/drivers/video/nvidia/nvidia.c
index eb24107bcc81..538e947610e1 100644
--- a/drivers/video/nvidia/nvidia.c
+++ b/drivers/video/nvidia/nvidia.c
@@ -1160,20 +1160,20 @@ static u32 __devinit nvidia_get_arch(struct fb_info *info)
         case 0x0340:            /* GeForceFX 5700 */
                 arch = NV_ARCH_30;
                 break;
-        case 0x0040:
-        case 0x00C0:
-        case 0x0120:
+        case 0x0040:            /* GeForce 6800 */
+        case 0x00C0:            /* GeForce 6800 */
+        case 0x0120:            /* GeForce 6800 */
         case 0x0130:
-        case 0x0140:
-        case 0x0160:
-        case 0x01D0:
-        case 0x0090:
-        case 0x0210:
-        case 0x0220:
+        case 0x0140:            /* GeForce 6600 */
+        case 0x0160:            /* GeForce 6200 */
+        case 0x01D0:            /* GeForce 7200, 7300, 7400 */
+        case 0x0090:            /* GeForce 7800 */
+        case 0x0210:            /* GeForce 6800 */
+        case 0x0220:            /* GeForce 6200 */
         case 0x0230:
-        case 0x0240:
-        case 0x0290:
-        case 0x0390:
+        case 0x0240:            /* GeForce 6100 */
+        case 0x0290:            /* GeForce 7900 */
+        case 0x0390:            /* GeForce 7600 */
                 arch = NV_ARCH_40;
                 break;
         case 0x0020:            /* TNT, TNT2 */
diff --git a/drivers/video/offb.c b/drivers/video/offb.c
index bad0e98fb3b6..9576a55eaf16 100644
--- a/drivers/video/offb.c
+++ b/drivers/video/offb.c
@@ -157,7 +157,7 @@ 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;
         }
@@ -213,7 +213,7 @@ 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;
                         }
@@ -226,13 +226,23 @@ static int offb_blank(int blank, struct fb_info *info)
 static void __iomem *offb_map_reg(struct device_node *np, int index,
                                   unsigned long offset, unsigned long size)
 {
-        struct resource r;
-
-        if (of_address_to_resource(np, index, &r))
-                return 0;
-        if ((r.start + offset + size) > r.end)
-                return 0;
-        return ioremap(r.start + offset, 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);
 }
 
 static void __init offb_init_fb(const char *name, const char *full_name,
@@ -289,7 +299,6 @@ static void __init offb_init_fb(const char *name, const char *full_name,
 
         par->cmap_type = cmap_unknown;
         if (depth == 8) {
-                /* Palette hacks disabled for now */
                 if (dp && !strncmp(name, "ATY,Rage128", 11)) {
                         par->cmap_adr = offb_map_reg(dp, 2, 0, 0x1fff);
                         if (par->cmap_adr)
@@ -313,7 +322,8 @@ static void __init offb_init_fb(const char *name, const char *full_name,
                             ioremap(base + 0x7ff000, 0x1000) + 0xcc0;
                         par->cmap_data = par->cmap_adr + 1;
                         par->cmap_type = cmap_m64;
-                } else if (dp && device_is_compatible(dp, "pci1014,b7")) {
+                } else if (dp && (device_is_compatible(dp, "pci1014,b7") ||
+                                  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;
@@ -392,6 +402,9 @@ static void __init offb_init_fb(const char *name, const char *full_name,
         fb_alloc_cmap(&info->cmap, 256, 0);
 
         if (register_framebuffer(info) < 0) {
+                iounmap(par->cmap_adr);
+                par->cmap_adr = NULL;
+                iounmap(info->screen_base);
                 kfree(info);
                 release_mem_region(res_start, res_size);
                 return;
@@ -433,7 +446,7 @@ static void __init offb_init_nodriver(struct device_node *dp, int no_real_node)
         pp = get_property(dp, "linux,bootx-linebytes", &len);
         if (pp == NULL)
                 pp = get_property(dp, "linebytes", &len);
-        if (pp && len == sizeof(u32))
+        if (pp && len == sizeof(u32) && (*pp != 0xffffffffu))
                 pitch = *pp;
         else
                 pitch = width * ((depth + 7) / 8);
@@ -496,7 +509,7 @@ static void __init offb_init_nodriver(struct device_node *dp, int no_real_node)
                 offb_init_fb(no_real_node ? "bootx" : dp->name,
                              no_real_node ? "display" : dp->full_name,
                              width, height, depth, pitch, address,
-                             no_real_node ? dp : NULL);
+                             no_real_node ? NULL : dp);
         }
 }
 
diff --git a/drivers/video/platinumfb.c b/drivers/video/platinumfb.c
index fdb33cd21a27..233871655824 100644
--- a/drivers/video/platinumfb.c
+++ b/drivers/video/platinumfb.c
@@ -34,6 +34,7 @@
 #include <asm/prom.h>
 #include <asm/pgtable.h>
 #include <asm/of_device.h>
+#include <asm/of_platform.h>
 
 #include "macmodes.h"
 #include "platinumfb.h"
@@ -626,6 +627,9 @@ static int __devinit platinumfb_probe(struct of_device* odev,
         
         rc = platinum_init_fb(info);
         if (rc != 0) {
+                iounmap(pinfo->frame_buffer);
+                iounmap(pinfo->platinum_regs);
+                iounmap(pinfo->cmap_regs);
                 dev_set_drvdata(&odev->dev, NULL);
                 framebuffer_release(info);
         }
@@ -682,14 +686,14 @@ static int __init platinumfb_init(void)
                 return -ENODEV;
         platinumfb_setup(option);
 #endif
-        of_register_driver(&platinum_driver);
+        of_register_platform_driver(&platinum_driver);
 
         return 0;
 }
 
 static void __exit platinumfb_exit(void)
 {
-        of_unregister_driver(&platinum_driver); 
+        of_unregister_platform_driver(&platinum_driver);
 }
 
 MODULE_LICENSE("GPL");
diff --git a/drivers/video/pmagb-b-fb.c b/drivers/video/pmagb-b-fb.c
index 73e2d7d16608..a06a064ad757 100644
--- a/drivers/video/pmagb-b-fb.c
+++ b/drivers/video/pmagb-b-fb.c
@@ -186,7 +186,7 @@ static void __init pmagbbfb_screen_setup(struct fb_info *info)
 static void __init pmagbbfb_osc_setup(struct fb_info *info)
 {
         static unsigned int pmagbbfb_freqs[] __initdata = {
-                130808, 119843, 104000, 92980, 74367, 72800,
+                130808, 119843, 104000, 92980, 74370, 72800,
                 69197, 66000, 65000, 50350, 36000, 32000, 25175
         };
         struct pmagbbfb_par *par = info->par;
diff --git a/drivers/video/pnx4008/pnxrgbfb.c b/drivers/video/pnx4008/pnxrgbfb.c
index 7d9453c91a42..f29e66e2d774 100644
--- a/drivers/video/pnx4008/pnxrgbfb.c
+++ b/drivers/video/pnx4008/pnxrgbfb.c
@@ -154,7 +154,8 @@ static int __devinit rgbfb_probe(struct platform_device *pdev)
                         goto err1;
         }
 
-        if (!fb_get_options("pnxrgbfb", &option) && !strcmp(option, "nocursor"))
+        if (!fb_get_options("pnxrgbfb", &option) && option &&
+                        !strcmp(option, "nocursor"))
                 rgbfb_ops.fb_cursor = no_cursor;
 
         info->node = -1;
@@ -191,7 +192,7 @@ err:
 
 static struct platform_driver rgbfb_driver = {
         .driver = {
-                .name = "rgbfb",
+                .name = "pnx4008-rgbfb",
         },
         .probe = rgbfb_probe,
         .remove = rgbfb_remove,
diff --git a/drivers/video/pnx4008/sdum.c b/drivers/video/pnx4008/sdum.c
index 51f0ecc2a511..d23bf0d659b6 100644
--- a/drivers/video/pnx4008/sdum.c
+++ b/drivers/video/pnx4008/sdum.c
@@ -848,7 +848,7 @@ static int sdum_remove(struct platform_device *pdev)
 
 static struct platform_driver sdum_driver = {
         .driver = {
-                .name = "sdum",
+                .name = "pnx4008-sdum",
         },
         .probe = sdum_probe,
         .remove = sdum_remove,
diff --git a/drivers/video/pvr2fb.c b/drivers/video/pvr2fb.c
index c7bc80921f16..a93618bc9d27 100644
--- a/drivers/video/pvr2fb.c
+++ b/drivers/video/pvr2fb.c
@@ -905,6 +905,15 @@ static int __init pvr2fb_dc_init(void)
 
 static void pvr2fb_dc_exit(void)
 {
+        if (fb_info->screen_base) {
+                iounmap(fb_info->screen_base);
+                fb_info->screen_base = NULL;
+        }
+        if (currentpar->mmio_base) {
+                iounmap((void *)currentpar->mmio_base);
+                currentpar->mmio_base = 0;
+        }
+
         free_irq(HW_EVENT_VSYNC, 0);
 #ifdef CONFIG_SH_DMA
         free_dma(pvr2dma);
@@ -946,6 +955,15 @@ static int __devinit pvr2fb_pci_probe(struct pci_dev *pdev,
 
 static void __devexit pvr2fb_pci_remove(struct pci_dev *pdev)
 {
+        if (fb_info->screen_base) {
+                iounmap(fb_info->screen_base);
+                fb_info->screen_base = NULL;
+        }
+        if (currentpar->mmio_base) {
+                iounmap((void *)currentpar->mmio_base);
+                currentpar->mmio_base = 0;
+        }
+
         pci_release_regions(pdev);
 }
 
diff --git a/drivers/video/pxafb.c b/drivers/video/pxafb.c
index 8a8ae55a7403..38eb0b69c2d7 100644
--- a/drivers/video/pxafb.c
+++ b/drivers/video/pxafb.c
@@ -964,9 +964,10 @@ static void set_ctrlr_state(struct pxafb_info *fbi, u_int state)
  * Our LCD controller task (which is called when we blank or unblank)
  * via keventd.
  */
-static void pxafb_task(void *dummy)
+static void pxafb_task(struct work_struct *work)
 {
-        struct pxafb_info *fbi = dummy;
+        struct pxafb_info *fbi =
+                container_of(work, struct pxafb_info, task);
         u_int state = xchg(&fbi->task_state, -1);
 
         set_ctrlr_state(fbi, state);
@@ -1159,7 +1160,7 @@ static struct pxafb_info * __init pxafb_init_fbinfo(struct device *dev)
         }
 
         init_waitqueue_head(&fbi->ctrlr_wait);
-        INIT_WORK(&fbi->task, pxafb_task, fbi);
+        INIT_WORK(&fbi->task, pxafb_task);
         init_MUTEX(&fbi->ctrlr_sem);
 
         return fbi;
diff --git a/drivers/video/retz3fb.c b/drivers/video/retz3fb.c
index cf41ff177644..bc7ffc84e185 100644
--- a/drivers/video/retz3fb.c
+++ b/drivers/video/retz3fb.c
@@ -1423,8 +1423,10 @@ int __init retz3fb_init(void)
 
                 do_install_cmap(0, fb_info);
 
-                if (register_framebuffer(fb_info) < 0)
+                if (register_framebuffer(fb_info) < 0) {
+                        iounmap(zinfo->base);
                         return -EINVAL;
+                }
 
                 printk(KERN_INFO "fb%d: %s frame buffer device, using %ldK of "
                        "video memory\n", fb_info->node,
diff --git a/drivers/video/riva/fbdev.c b/drivers/video/riva/fbdev.c
index a160c4de2ca2..1a13966b7d5b 100644
--- a/drivers/video/riva/fbdev.c
+++ b/drivers/video/riva/fbdev.c
@@ -40,6 +40,7 @@
 #include <linux/init.h>
 #include <linux/pci.h>
 #include <linux/backlight.h>
+#include <linux/bitrev.h>
 #ifdef CONFIG_MTRR
 #include <asm/mtrr.h>
 #endif
@@ -521,48 +522,13 @@ static inline unsigned char MISCin(struct riva_par *par)
         return (VGA_RD08(par->riva.PVIO, 0x3cc));
 }
 
-static u8 byte_rev[256] = {
-        0x00, 0x80, 0x40, 0xc0, 0x20, 0xa0, 0x60, 0xe0,
-        0x10, 0x90, 0x50, 0xd0, 0x30, 0xb0, 0x70, 0xf0,
-        0x08, 0x88, 0x48, 0xc8, 0x28, 0xa8, 0x68, 0xe8,
-        0x18, 0x98, 0x58, 0xd8, 0x38, 0xb8, 0x78, 0xf8,
-        0x04, 0x84, 0x44, 0xc4, 0x24, 0xa4, 0x64, 0xe4,
-        0x14, 0x94, 0x54, 0xd4, 0x34, 0xb4, 0x74, 0xf4,
-        0x0c, 0x8c, 0x4c, 0xcc, 0x2c, 0xac, 0x6c, 0xec,
-        0x1c, 0x9c, 0x5c, 0xdc, 0x3c, 0xbc, 0x7c, 0xfc,
-        0x02, 0x82, 0x42, 0xc2, 0x22, 0xa2, 0x62, 0xe2,
-        0x12, 0x92, 0x52, 0xd2, 0x32, 0xb2, 0x72, 0xf2,
-        0x0a, 0x8a, 0x4a, 0xca, 0x2a, 0xaa, 0x6a, 0xea,
-        0x1a, 0x9a, 0x5a, 0xda, 0x3a, 0xba, 0x7a, 0xfa,
-        0x06, 0x86, 0x46, 0xc6, 0x26, 0xa6, 0x66, 0xe6,
-        0x16, 0x96, 0x56, 0xd6, 0x36, 0xb6, 0x76, 0xf6,
-        0x0e, 0x8e, 0x4e, 0xce, 0x2e, 0xae, 0x6e, 0xee,
-        0x1e, 0x9e, 0x5e, 0xde, 0x3e, 0xbe, 0x7e, 0xfe,
-        0x01, 0x81, 0x41, 0xc1, 0x21, 0xa1, 0x61, 0xe1,
-        0x11, 0x91, 0x51, 0xd1, 0x31, 0xb1, 0x71, 0xf1,
-        0x09, 0x89, 0x49, 0xc9, 0x29, 0xa9, 0x69, 0xe9,
-        0x19, 0x99, 0x59, 0xd9, 0x39, 0xb9, 0x79, 0xf9,
-        0x05, 0x85, 0x45, 0xc5, 0x25, 0xa5, 0x65, 0xe5,
-        0x15, 0x95, 0x55, 0xd5, 0x35, 0xb5, 0x75, 0xf5,
-        0x0d, 0x8d, 0x4d, 0xcd, 0x2d, 0xad, 0x6d, 0xed,
-        0x1d, 0x9d, 0x5d, 0xdd, 0x3d, 0xbd, 0x7d, 0xfd,
-        0x03, 0x83, 0x43, 0xc3, 0x23, 0xa3, 0x63, 0xe3,
-        0x13, 0x93, 0x53, 0xd3, 0x33, 0xb3, 0x73, 0xf3,
-        0x0b, 0x8b, 0x4b, 0xcb, 0x2b, 0xab, 0x6b, 0xeb,
-        0x1b, 0x9b, 0x5b, 0xdb, 0x3b, 0xbb, 0x7b, 0xfb,
-        0x07, 0x87, 0x47, 0xc7, 0x27, 0xa7, 0x67, 0xe7,
-        0x17, 0x97, 0x57, 0xd7, 0x37, 0xb7, 0x77, 0xf7,
-        0x0f, 0x8f, 0x4f, 0xcf, 0x2f, 0xaf, 0x6f, 0xef,
-        0x1f, 0x9f, 0x5f, 0xdf, 0x3f, 0xbf, 0x7f, 0xff,
-};
-
 static inline void reverse_order(u32 *l)
 {
         u8 *a = (u8 *)l;
-        *a = byte_rev[*a], a++;
-        *a = byte_rev[*a], a++;
-        *a = byte_rev[*a], a++;
-        *a = byte_rev[*a];
+        a[0] = bitrev8(a[0]);
+        a[1] = bitrev8(a[1]);
+        a[2] = bitrev8(a[2]);
+        a[3] = bitrev8(a[3]);
 }
 
 /* ------------------------------------------------------------------------- *
@@ -774,11 +740,12 @@ static void riva_load_state(struct riva_par *par, struct riva_regs *regs)
  * CALLED FROM:
  * rivafb_set_par()
  */
-static void riva_load_video_mode(struct fb_info *info)
+static int riva_load_video_mode(struct fb_info *info)
 {
         int bpp, width, hDisplaySize, hDisplay, hStart,
             hEnd, hTotal, height, vDisplay, vStart, vEnd, vTotal, dotClock;
         int hBlankStart, hBlankEnd, vBlankStart, vBlankEnd;
+        int rc;
         struct riva_par *par = info->par;
         struct riva_regs newmode;
         
@@ -884,8 +851,10 @@ static void riva_load_video_mode(struct fb_info *info)
         else
                 newmode.misc_output |= 0x80;    
 
-        par->riva.CalcStateExt(&par->riva, &newmode.ext, bpp, width,
-                                  hDisplaySize, height, dotClock);
+        rc = CalcStateExt(&par->riva, &newmode.ext, bpp, width,
+                          hDisplaySize, height, dotClock);
+        if (rc)
+                goto out;
 
         newmode.ext.scale = NV_RD32(par->riva.PRAMDAC, 0x00000848) &
                 0xfff000ff;
@@ -917,8 +886,12 @@ static void riva_load_video_mode(struct fb_info *info)
         par->current_state = newmode;
         riva_load_state(par, &par->current_state);
         par->riva.LockUnlock(&par->riva, 0); /* important for HW cursor */
+
+out:
         rivafb_blank(FB_BLANK_UNBLANK, info);
         NVTRACE_LEAVE();
+
+        return rc;
 }
 
 static void riva_update_var(struct fb_var_screeninfo *var, struct fb_videomode *modedb)
@@ -1286,12 +1259,15 @@ static int rivafb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)
 static int rivafb_set_par(struct fb_info *info)
 {
         struct riva_par *par = info->par;
+        int rc = 0;
 
         NVTRACE_ENTER();
         /* vgaHWunlock() + riva unlock (0x7F) */
         CRTCout(par, 0x11, 0xFF);
         par->riva.LockUnlock(&par->riva, 0);
-        riva_load_video_mode(info);
+        rc = riva_load_video_mode(info);
+        if (rc)
+                goto out;
         if(!(info->flags & FBINFO_HWACCEL_DISABLED))
                 riva_setup_accel(info);
         
@@ -1304,8 +1280,10 @@ static int rivafb_set_par(struct fb_info *info)
                 info->pixmap.scan_align = 1;
         else
                 info->pixmap.scan_align = 4;
+
+out:
         NVTRACE_LEAVE();
-        return 0;
+        return rc;
 }
 
 /**
diff --git a/drivers/video/riva/riva_hw.c b/drivers/video/riva/riva_hw.c
index b6f8690b96c9..e0b8c521cc9c 100644
--- a/drivers/video/riva/riva_hw.c
+++ b/drivers/video/riva/riva_hw.c
@@ -1227,7 +1227,7 @@ static int CalcVClock
  * Calculate extended mode parameters (SVGA) and save in a 
  * mode state structure.
  */
-static void CalcStateExt
+int CalcStateExt
 (
     RIVA_HW_INST  *chip,
     RIVA_HW_STATE *state,
@@ -1249,7 +1249,8 @@ static void CalcStateExt
      * Extended RIVA registers.
      */
     pixelDepth = (bpp + 1)/8;
-    CalcVClock(dotClock, &VClk, &m, &n, &p, chip);
+    if (!CalcVClock(dotClock, &VClk, &m, &n, &p, chip))
+        return -EINVAL;
 
     switch (chip->Architecture)
     {
@@ -1327,6 +1328,8 @@ static void CalcStateExt
     state->pitch1   =
     state->pitch2   =
     state->pitch3   = pixelDepth * width;
+
+    return 0;
 }
 /*
  * Load fixed function state and pre-calculated/stored state.
@@ -2026,7 +2029,6 @@ static void nv3GetConfig
      */
     chip->Busy            = nv3Busy;
     chip->ShowHideCursor  = ShowHideCursor;
-    chip->CalcStateExt    = CalcStateExt;
     chip->LoadStateExt    = LoadStateExt;
     chip->UnloadStateExt  = UnloadStateExt;
     chip->SetStartAddress = SetStartAddress3;
@@ -2084,7 +2086,6 @@ static void nv4GetConfig
      */
     chip->Busy            = nv4Busy;
     chip->ShowHideCursor  = ShowHideCursor;
-    chip->CalcStateExt    = CalcStateExt;
     chip->LoadStateExt    = LoadStateExt;
     chip->UnloadStateExt  = UnloadStateExt;
     chip->SetStartAddress = SetStartAddress;
@@ -2186,7 +2187,6 @@ static void nv10GetConfig
      */
     chip->Busy            = nv10Busy;
     chip->ShowHideCursor  = ShowHideCursor;
-    chip->CalcStateExt    = CalcStateExt;
     chip->LoadStateExt    = LoadStateExt;
     chip->UnloadStateExt  = UnloadStateExt;
     chip->SetStartAddress = SetStartAddress;
diff --git a/drivers/video/riva/riva_hw.h b/drivers/video/riva/riva_hw.h
index a1e71a626df2..c2769f73e0b2 100644
--- a/drivers/video/riva/riva_hw.h
+++ b/drivers/video/riva/riva_hw.h
@@ -463,7 +463,6 @@ typedef struct _riva_hw_inst
      * Common chip functions.
      */
     int  (*Busy)(struct _riva_hw_inst *);
-    void (*CalcStateExt)(struct _riva_hw_inst *,struct _riva_hw_state *,int,int,int,int,int);
     void (*LoadStateExt)(struct _riva_hw_inst *,struct _riva_hw_state *);
     void (*UnloadStateExt)(struct _riva_hw_inst *,struct _riva_hw_state *);
     void (*SetStartAddress)(struct _riva_hw_inst *,U032);
@@ -528,6 +527,22 @@ typedef struct _riva_hw_state
     U032 pitch2;
     U032 pitch3;
 } RIVA_HW_STATE;
+
+/*
+ * function prototypes
+ */
+
+extern int CalcStateExt
+(
+    RIVA_HW_INST  *chip,
+    RIVA_HW_STATE *state,
+    int            bpp,
+    int            width,
+    int            hDisplaySize,
+    int            height,
+    int            dotClock
+);
+
 /*
  * External routines.
  */
diff --git a/drivers/video/riva/rivafb-i2c.c b/drivers/video/riva/rivafb-i2c.c
index c15b259af644..01b85e3b0ae1 100644
--- a/drivers/video/riva/rivafb-i2c.c
+++ b/drivers/video/riva/rivafb-i2c.c
@@ -144,15 +144,15 @@ void riva_create_i2c_busses(struct riva_par *par)
 void riva_delete_i2c_busses(struct riva_par *par)
 {
         if (par->chan[0].par)
-                i2c_bit_del_bus(&par->chan[0].adapter);
+                i2c_del_adapter(&par->chan[0].adapter);
         par->chan[0].par = NULL;
 
         if (par->chan[1].par)
-                i2c_bit_del_bus(&par->chan[1].adapter);
+                i2c_del_adapter(&par->chan[1].adapter);
         par->chan[1].par = NULL;
 
         if (par->chan[2].par)
-                i2c_bit_del_bus(&par->chan[2].adapter);
+                i2c_del_adapter(&par->chan[2].adapter);
         par->chan[2].par = NULL;
 }
 
diff --git a/drivers/video/s3c2410fb.c b/drivers/video/s3c2410fb.c
index 59407343cc73..ccef56d0c157 100644
--- a/drivers/video/s3c2410fb.c
+++ b/drivers/video/s3c2410fb.c
@@ -131,7 +131,7 @@ static void s3c2410fb_set_lcdaddr(struct s3c2410fb_info *fbi)
         saddr2 += (var->xres * var->yres * var->bits_per_pixel)/8;
         saddr2>>= 1;
 
-        saddr3 =  S3C2410_OFFSIZE(0) | S3C2410_PAGEWIDTH(var->xres);
+        saddr3 =  S3C2410_OFFSIZE(0) | S3C2410_PAGEWIDTH((var->xres * var->bits_per_pixel / 16) & 0x3ff);
 
         dprintk("LCDSADDR1 = 0x%08lx\n", saddr1);
         dprintk("LCDSADDR2 = 0x%08lx\n", saddr2);
@@ -199,28 +199,86 @@ static int s3c2410fb_check_var(struct fb_var_screeninfo *var,
                 var->bits_per_pixel = fbi->mach_info->bpp.min;
 
         /* set r/g/b positions */
+        switch (var->bits_per_pixel) {
+                case 1:
+                case 2:
+                case 4:
+                        var->red.offset         = 0;
+                        var->red.length         = var->bits_per_pixel;
+                        var->green              = var->red;
+                        var->blue               = var->red;
+                        var->transp.offset      = 0;
+                        var->transp.length      = 0;
+                        break;
+                case 8:
+                        if ( fbi->mach_info->type != S3C2410_LCDCON1_TFT ) {
+                                /* 8 bpp 332 */
+                                var->red.length         = 3;
+                                var->red.offset         = 5;
+                                var->green.length       = 3;
+                                var->green.offset       = 2;
+                                var->blue.length        = 2;
+                                var->blue.offset        = 0;
+                                var->transp.length      = 0;
+                        } else {
+                                var->red.offset         = 0;
+                                var->red.length         = var->bits_per_pixel;
+                                var->green              = var->red;
+                                var->blue               = var->red;
+                                var->transp.offset      = 0;
+                                var->transp.length      = 0;
+                        }
+                        break;
+                case 12:
+                        /* 12 bpp 444 */
+                        var->red.length         = 4;
+                        var->red.offset         = 8;
+                        var->green.length       = 4;
+                        var->green.offset       = 4;
+                        var->blue.length        = 4;
+                        var->blue.offset        = 0;
+                        var->transp.length      = 0;
+                        break;
+
+                default:
+                case 16:
+                        if (fbi->regs.lcdcon5 & S3C2410_LCDCON5_FRM565 ) {
+                                /* 16 bpp, 565 format */
+                                var->red.offset         = 11;
+                                var->green.offset       = 5;
+                                var->blue.offset        = 0;
+                                var->red.length         = 5;
+                                var->green.length       = 6;
+                                var->blue.length        = 5;
+                                var->transp.length      = 0;
+                        } else {
+                                /* 16 bpp, 5551 format */
+                                var->red.offset         = 11;
+                                var->green.offset       = 6;
+                                var->blue.offset        = 1;
+                                var->red.length         = 5;
+                                var->green.length       = 5;
+                                var->blue.length        = 5;
+                                var->transp.length      = 0;
+                        }
+                        break;
+                case 24:
+                        /* 24 bpp 888 */
+                        var->red.length         = 8;
+                        var->red.offset         = 16;
+                        var->green.length       = 8;
+                        var->green.offset       = 8;
+                        var->blue.length        = 8;
+                        var->blue.offset        = 0;
+                        var->transp.length      = 0;
+                        break;
 
-        if (var->bits_per_pixel == 16) {
-                var->red.offset         = 11;
-                var->green.offset       = 5;
-                var->blue.offset        = 0;
-                var->red.length         = 5;
-                var->green.length       = 6;
-                var->blue.length        = 5;
-                var->transp.length      = 0;
-        } else {
-                var->red.length         = var->bits_per_pixel;
-                var->red.offset         = 0;
-                var->green.length       = var->bits_per_pixel;
-                var->green.offset       = 0;
-                var->blue.length        = var->bits_per_pixel;
-                var->blue.offset        = 0;
-                var->transp.length      = 0;
-        }
 
+        }
         return 0;
 }
 
+
 /* s3c2410fb_activate_var
  *
  * activate (set) the controller from the given framebuffer
@@ -230,29 +288,61 @@ static int s3c2410fb_check_var(struct fb_var_screeninfo *var,
 static void s3c2410fb_activate_var(struct s3c2410fb_info *fbi,
                                    struct fb_var_screeninfo *var)
 {
+        int hs;
+
         fbi->regs.lcdcon1 &= ~S3C2410_LCDCON1_MODEMASK;
+        fbi->regs.lcdcon1 &= ~S3C2410_LCDCON1_TFT;
 
         dprintk("%s: var->xres  = %d\n", __FUNCTION__, var->xres);
         dprintk("%s: var->yres  = %d\n", __FUNCTION__, var->yres);
         dprintk("%s: var->bpp   = %d\n", __FUNCTION__, var->bits_per_pixel);
 
-        switch (var->bits_per_pixel) {
-        case 1:
-                fbi->regs.lcdcon1 |= S3C2410_LCDCON1_TFT1BPP;
-                break;
-        case 2:
-                fbi->regs.lcdcon1 |= S3C2410_LCDCON1_TFT2BPP;
-                break;
-        case 4:
-                fbi->regs.lcdcon1 |= S3C2410_LCDCON1_TFT4BPP;
-                break;
-        case 8:
-                fbi->regs.lcdcon1 |= S3C2410_LCDCON1_TFT8BPP;
-                break;
-        case 16:
-                fbi->regs.lcdcon1 |= S3C2410_LCDCON1_TFT16BPP;
-                break;
-        }
+        fbi->regs.lcdcon1 |= fbi->mach_info->type;
+
+        if (fbi->mach_info->type == S3C2410_LCDCON1_TFT)
+                switch (var->bits_per_pixel) {
+                case 1:
+                        fbi->regs.lcdcon1 |= S3C2410_LCDCON1_TFT1BPP;
+                        break;
+                case 2:
+                        fbi->regs.lcdcon1 |= S3C2410_LCDCON1_TFT2BPP;
+                        break;
+                case 4:
+                        fbi->regs.lcdcon1 |= S3C2410_LCDCON1_TFT4BPP;
+                        break;
+                case 8:
+                        fbi->regs.lcdcon1 |= S3C2410_LCDCON1_TFT8BPP;
+                        break;
+                case 16:
+                        fbi->regs.lcdcon1 |= S3C2410_LCDCON1_TFT16BPP;
+                        break;
+
+                default:
+                        /* invalid pixel depth */
+                        dev_err(fbi->dev, "invalid bpp %d\n", var->bits_per_pixel);
+                }
+        else
+                switch (var->bits_per_pixel) {
+                case 1:
+                        fbi->regs.lcdcon1 |= S3C2410_LCDCON1_STN1BPP;
+                        break;
+                case 2:
+                        fbi->regs.lcdcon1 |= S3C2410_LCDCON1_STN2GREY;
+                        break;
+                case 4:
+                        fbi->regs.lcdcon1 |= S3C2410_LCDCON1_STN4GREY;
+                        break;
+                case 8:
+                        fbi->regs.lcdcon1 |= S3C2410_LCDCON1_STN8BPP;
+                        break;
+                case 12:
+                        fbi->regs.lcdcon1 |= S3C2410_LCDCON1_STN12BPP;
+                        break;
+
+                default:
+                        /* invalid pixel depth */
+                        dev_err(fbi->dev, "invalid bpp %d\n", var->bits_per_pixel);
+                }
 
         /* check to see if we need to update sync/borders */
 
@@ -283,15 +373,44 @@ static void s3c2410fb_activate_var(struct s3c2410fb_info *fbi,
         fbi->regs.lcdcon2 &= ~S3C2410_LCDCON2_LINEVAL(0x3ff);
         fbi->regs.lcdcon2 |=  S3C2410_LCDCON2_LINEVAL(var->yres - 1);
 
+        switch(fbi->mach_info->type) {
+                case S3C2410_LCDCON1_DSCAN4:
+                case S3C2410_LCDCON1_STN8:
+                        hs = var->xres / 8;
+                        break;
+                case S3C2410_LCDCON1_STN4:
+                        hs = var->xres / 4;
+                        break;
+                default:
+                case S3C2410_LCDCON1_TFT:
+                        hs = var->xres;
+                        break;
+
+        }
+
+        /* Special cases : STN color displays */
+        if ( ((fbi->regs.lcdcon1 & S3C2410_LCDCON1_MODEMASK) == S3C2410_LCDCON1_STN8BPP) \
+          || ((fbi->regs.lcdcon1 & S3C2410_LCDCON1_MODEMASK) == S3C2410_LCDCON1_STN12BPP) ) {
+                hs = hs * 3;
+        }
+
+
         fbi->regs.lcdcon3 &= ~S3C2410_LCDCON3_HOZVAL(0x7ff);
-        fbi->regs.lcdcon3 |=  S3C2410_LCDCON3_HOZVAL(var->xres - 1);
+        fbi->regs.lcdcon3 |=  S3C2410_LCDCON3_HOZVAL(hs - 1);
 
         if (var->pixclock > 0) {
                 int clkdiv = s3c2410fb_calc_pixclk(fbi, var->pixclock);
 
-                clkdiv = (clkdiv / 2) -1;
-                if (clkdiv < 0)
-                        clkdiv = 0;
+                if (fbi->mach_info->type == S3C2410_LCDCON1_TFT) {
+                        clkdiv = (clkdiv / 2) -1;
+                        if (clkdiv < 0)
+                                clkdiv = 0;
+                }
+                else {
+                        clkdiv = (clkdiv / 2);
+                        if (clkdiv < 2)
+                                clkdiv = 2;
+                }
 
                 fbi->regs.lcdcon1 &= ~S3C2410_LCDCON1_CLKVAL(0x3ff);
                 fbi->regs.lcdcon1 |=  S3C2410_LCDCON1_CLKVAL(clkdiv);
@@ -329,10 +448,18 @@ static int s3c2410fb_set_par(struct fb_info *info)
         struct s3c2410fb_info *fbi = info->par;
         struct fb_var_screeninfo *var = &info->var;
 
-        if (var->bits_per_pixel == 16)
-                fbi->fb->fix.visual = FB_VISUAL_TRUECOLOR;
-        else
-                fbi->fb->fix.visual = FB_VISUAL_PSEUDOCOLOR;
+        switch (var->bits_per_pixel)
+        {
+                case 16:
+                        fbi->fb->fix.visual = FB_VISUAL_TRUECOLOR;
+                        break;
+                case 1:
+                         fbi->fb->fix.visual = FB_VISUAL_MONO01;
+                         break;
+                default:
+                         fbi->fb->fix.visual = FB_VISUAL_PSEUDOCOLOR;
+                         break;
+        }
 
         fbi->fb->fix.line_length     = (var->width*var->bits_per_pixel)/8;
 
diff --git a/drivers/video/savage/savagefb-i2c.c b/drivers/video/savage/savagefb-i2c.c
index 3f94223b7f0c..1411f3b6a009 100644
--- a/drivers/video/savage/savagefb-i2c.c
+++ b/drivers/video/savage/savagefb-i2c.c
@@ -208,7 +208,7 @@ void savagefb_delete_i2c_busses(struct fb_info *info)
         struct savagefb_par *par = info->par;
 
         if (par->chan.par)
-                i2c_bit_del_bus(&par->chan.adapter);
+                i2c_del_adapter(&par->chan.adapter);
 
         par->chan.par = NULL;
 }
@@ -227,11 +227,8 @@ int savagefb_probe_i2c_connector(struct fb_info *info, u8 **out_edid)
                 /* try to get from firmware */
                 const u8 *e = fb_firmware_edid(info->device);
 
-                if (e) {
-                        edid = kmalloc(EDID_LENGTH, GFP_KERNEL);
-                        if (edid)
-                                memcpy(edid, e, EDID_LENGTH);
-                }
+                if (e)
+                        edid = kmemdup(e, EDID_LENGTH, GFP_KERNEL);
         }
 
         *out_edid = edid;
diff --git a/drivers/video/sis/init301.c b/drivers/video/sis/init301.c
index f13faddc6181..47e1896cffeb 100644
--- a/drivers/video/sis/init301.c
+++ b/drivers/video/sis/init301.c
@@ -445,11 +445,8 @@ SiS_CR36BIOSWord23d(struct SiS_Private *SiS_Pr)
 void
 SiS_DDC2Delay(struct SiS_Private *SiS_Pr, unsigned int delaytime)
 {
-   unsigned int i, j;
-
-   for(i = 0; i < delaytime; i++) {
-      j += SiS_GetReg(SiS_Pr->SiS_P3c4,0x05);
-   }
+   while (delaytime-- > 0)
+      SiS_GetReg(SiS_Pr->SiS_P3c4, 0x05);
 }
 
 #if defined(SIS300) || defined(SIS315H)
diff --git a/drivers/video/sstfb.c b/drivers/video/sstfb.c
index 711cb11d6eb3..59cd1e750f30 100644
--- a/drivers/video/sstfb.c
+++ b/drivers/video/sstfb.c
@@ -21,6 +21,11 @@
  *      Remove never finished and bogus 24/32bit support
  *      Clean up macro abuse
  *      Minor tidying for format.
+ * 12/2006 Helge Deller    <deller@gmx.de>
+ *      add /sys/class/graphics/fbX/vgapass sysfs-interface
+ *      add module option "mode_option" to set initial screen mode
+ *      use fbdev default videomode database
+ *      remove debug functions from ioctl
  */
 
 /*
@@ -65,19 +70,10 @@
  *
  * sstfb specific ioctls:
  *              toggle vga (0x46db) : toggle vga_pass_through
- *              fill fb    (0x46dc) : fills fb
- *              test disp  (0x46de) : draws a test image
  */
 
 #undef SST_DEBUG
 
-/*
-  Default video mode .
-  0 800x600@60  took from glide
-  1 640x480@75  took from glide
-  2 1024x768@76 std fb.mode
-  3 640x480@60  glide default */
-#define DEFAULT_MODE 3 
 
 /*
  * Includes
@@ -92,20 +88,24 @@
 #include <linux/init.h>
 #include <linux/slab.h>
 #include <asm/io.h>
-#include <asm/ioctl.h>
 #include <asm/uaccess.h>
 #include <video/sstfb.h>
 
 
 /* initialized by setup */
 
-static int vgapass;             /* enable Vga passthrough cable */
+static int vgapass;             /* enable VGA passthrough cable */
 static int mem;                 /* mem size in MB, 0 = autodetect */
 static int clipping = 1;        /* use clipping (slower, safer) */
 static int gfxclk;              /* force FBI freq in Mhz . Dangerous */
 static int slowpci;             /* slow PCI settings */
 
-static char *mode_option __devinitdata;
+/*
+  Possible default video modes: 800x600@60, 640x480@75, 1024x768@76, 640x480@60
+*/
+#define DEFAULT_VIDEO_MODE "640x480@60"
+
+static char *mode_option __devinitdata = DEFAULT_VIDEO_MODE;
 
 enum {
         ID_VOODOO1 = 0,
@@ -119,48 +119,11 @@ static struct sst_spec voodoo_spec[] __devinitdata = {
  { .name = "Voodoo2",         .default_gfx_clock = 75000, .max_gfxclk = 85 },
 };
 
-static struct fb_var_screeninfo sstfb_default =
-#if ( DEFAULT_MODE == 0 )
-    { /* 800x600@60, 16 bpp .borowed from glide/sst1/include/sst1init.h */
-    800, 600, 800, 600, 0, 0, 16, 0,
-    {11, 5, 0}, {5, 6, 0}, {0, 5, 0}, {0, 0, 0},
-    0, 0, -1, -1, 0,
-    25000, 86, 41, 23, 1, 127, 4,
-    0, FB_VMODE_NONINTERLACED };
-#elif ( DEFAULT_MODE == 1 )
-    {/* 640x480@75, 16 bpp .borowed from glide/sst1/include/sst1init.h */
-    640, 480, 640, 480, 0, 0, 16, 0,
-    {11, 5, 0}, {5, 6, 0}, {0, 5, 0}, {0, 0, 0},
-    0, 0, -1, -1, 0,
-    31746, 118, 17, 16, 1, 63, 3,
-    0, FB_VMODE_NONINTERLACED };
-#elif ( DEFAULT_MODE == 2 )
-    { /* 1024x768@76 took from my /etc/fb.modes */
-    1024, 768, 1024, 768,0, 0, 16,0,
-    {11, 5, 0}, {5, 6, 0}, {0, 5, 0}, {0, 0, 0},
-    0, 0, -1, -1, 0,
-    11764, 208, 8, 36, 16, 120, 3 ,
-    0, FB_VMODE_NONINTERLACED };
-#elif ( DEFAULT_MODE == 3 )
-    { /* 640x480@60 , 16bpp glide default ?*/
-    640, 480, 640, 480, 0, 0, 16, 0,
-    {11, 5, 0}, {5, 6, 0}, {0, 5, 0}, {0, 0, 0},
-    0, 0, -1, -1, 0,
-    39721 ,  38, 26 ,  25 ,18  , 96 ,2,
-    0, FB_VMODE_NONINTERLACED };
-#elif
-    #error "Invalid DEFAULT_MODE value !"
-#endif
-
 
 /*
  * debug functions
  */
 
-static void sstfb_drawdebugimage(struct fb_info *info);
-static int sstfb_dump_regs(struct fb_info *info);
-
-
 #if (SST_DEBUG_REG > 0)
 static void sst_dbg_print_read_reg(u32 reg, u32 val) {
         const char *regname;
@@ -726,51 +689,77 @@ static int sstfb_setcolreg(u_int regno, u_int red, u_int green, u_int blue,
         return 0;
 }
 
-static int sstfb_ioctl(struct fb_info *info, u_int cmd, u_long arg)
+static void sstfb_setvgapass( struct fb_info *info, int enable )
 {
         struct sstfb_par *par = info->par;
         struct pci_dev *sst_dev = par->dev;
-        u32 fbiinit0, tmp, val;
-        u_long p;
+        u32 fbiinit0, tmp;
+
+        enable = enable ? 1:0;
+        if (par->vgapass == enable)
+                return;
+        par->vgapass = enable;
+
+        pci_read_config_dword(sst_dev, PCI_INIT_ENABLE, &tmp);
+        pci_write_config_dword(sst_dev, PCI_INIT_ENABLE,
+                               tmp | PCI_EN_INIT_WR );
+        fbiinit0 = sst_read (FBIINIT0);
+        if (par->vgapass) {
+                sst_write(FBIINIT0, fbiinit0 & ~DIS_VGA_PASSTHROUGH);
+                printk(KERN_INFO "fb%d: Enabling VGA pass-through\n", info->node );
+        } else {
+                sst_write(FBIINIT0, fbiinit0 | DIS_VGA_PASSTHROUGH);
+                printk(KERN_INFO "fb%d: Disabling VGA pass-through\n", info->node );
+        }
+        pci_write_config_dword(sst_dev, PCI_INIT_ENABLE, tmp);
+}
+
+static ssize_t store_vgapass(struct device *device, struct device_attribute *attr,
+                        const char *buf, size_t count)
+{
+        struct fb_info *info = dev_get_drvdata(device);
+        char ** last = NULL;
+        int val;
+
+        val = simple_strtoul(buf, last, 0);
+        sstfb_setvgapass(info, val);
+
+        return count;
+}
+
+static ssize_t show_vgapass(struct device *device, struct device_attribute *attr,
+                        char *buf)
+{
+        struct fb_info *info = dev_get_drvdata(device);
+        struct sstfb_par *par = info->par;
+        return snprintf(buf, PAGE_SIZE, "%d\n", par->vgapass);
+}
+
+static struct device_attribute device_attrs[] = {
+        __ATTR(vgapass, S_IRUGO|S_IWUSR, show_vgapass, store_vgapass)
+        };
+
+static int sstfb_ioctl(struct fb_info *info, unsigned int cmd,
+                        unsigned long arg)
+{
+        struct sstfb_par *par;
+        u32 val;
 
         switch (cmd) {
-                
-        /* dump current FBIINIT values to system log */
-        case _IO('F', 0xdb):            /* 0x46db */
-                return sstfb_dump_regs(info);
-                
-        /* fills lfb with #arg pixels */
-        case _IOW('F', 0xdc, u32):      /* 0x46dc */
+        /* set/get VGA pass_through mode */
+        case SSTFB_SET_VGAPASS:
                 if (copy_from_user(&val, (void __user *)arg, sizeof(val)))
                         return -EFAULT;
-                if (val > info->fix.smem_len)
-                        val = info->fix.smem_len;
-                for (p = 0 ; p < val; p += 2)
-                        writew(p >> 6, info->screen_base + p);
+                sstfb_setvgapass(info, val);
                 return 0;
-                
-        /* change VGA pass_through mode */
-        case _IOW('F', 0xdd, u32):      /* 0x46dd */
-                if (copy_from_user(&val, (void __user *)arg, sizeof(val)))
+        case SSTFB_GET_VGAPASS:
+                par = info->par;
+                val = par->vgapass;
+                if (copy_to_user((void __user *)arg, &val, sizeof(val)))
                         return -EFAULT;
-                pci_read_config_dword(sst_dev, PCI_INIT_ENABLE, &tmp);
-                pci_write_config_dword(sst_dev, PCI_INIT_ENABLE,
-                                       tmp | PCI_EN_INIT_WR );
-                fbiinit0 = sst_read (FBIINIT0);
-                if (val)
-                        sst_write(FBIINIT0, fbiinit0 & ~EN_VGA_PASSTHROUGH);
-                else
-                        sst_write(FBIINIT0, fbiinit0 | EN_VGA_PASSTHROUGH);
-                pci_write_config_dword(sst_dev, PCI_INIT_ENABLE, tmp);
-                return 0;
-                
-        /* draw test image  */
-        case _IO('F', 0xde):            /* 0x46de */
-                f_dprintk("test color display at %d bpp\n",
-                                        info->var.bits_per_pixel);
-                sstfb_drawdebugimage(info);
                 return 0;
         }
+
         return -EINVAL;
 }
 
@@ -804,6 +793,7 @@ static void sstfb_copyarea(struct fb_info *info, const struct fb_copyarea *area)
 /*
  * FillRect 2D command (solidfill or invert (via ROP_XOR)) - Voodoo2 only
  */
+#if 0
 static void sstfb_fillrect(struct fb_info *info, const struct fb_fillrect *rect) 
 {
         struct sstfb_par *par = info->par;
@@ -825,6 +815,7 @@ static void sstfb_fillrect(struct fb_info *info, const struct fb_fillrect *rect)
                  | (BLT_16BPP_FMT << 3) /* | BIT(14) */ | BIT(15) | BIT(16) );
         sst_wait_idle();
 }
+#endif
 
 
 
@@ -1156,6 +1147,7 @@ static int __devinit sst_init(struct fb_info *info, struct sstfb_par *par)
         struct pll_timing gfx_timings;
         struct sst_spec *spec;
         int Fout;
+        int gfx_clock;
 
         spec = &voodoo_spec[par->type];
         f_ddprintk(" fbiinit0   fbiinit1   fbiinit2   fbiinit3   fbiinit4  "
@@ -1196,15 +1188,15 @@ static int __devinit sst_init(struct fb_info *info, struct sstfb_par *par)
         }
 
         /* set graphic clock */
-        par->gfx_clock = spec->default_gfx_clock;
+        gfx_clock = spec->default_gfx_clock;
         if ((gfxclk >10 ) && (gfxclk < spec->max_gfxclk)) {
                 printk(KERN_INFO "sstfb: Using supplied graphic freq : %dMHz\n", gfxclk);
-                 par->gfx_clock = gfxclk *1000;
+                 gfx_clock = gfxclk *1000;
         } else if (gfxclk) {
                 printk(KERN_WARNING "sstfb: %dMhz is way out of spec! Using default\n", gfxclk);
         }
 
-        sst_calc_pll(par->gfx_clock, &Fout, &gfx_timings);
+        sst_calc_pll(gfx_clock, &Fout, &gfx_timings);
         par->dac_sw.set_pll(info, &gfx_timings, GFX_CLOCK);
 
         /* disable fbiinit remap */
@@ -1215,10 +1207,11 @@ static int __devinit sst_init(struct fb_info *info, struct sstfb_par *par)
         fbiinit0 = FBIINIT0_DEFAULT;
         fbiinit1 = FBIINIT1_DEFAULT;
         fbiinit4 = FBIINIT4_DEFAULT;
-        if (vgapass)
-                fbiinit0 &= ~EN_VGA_PASSTHROUGH;
+        par->vgapass = vgapass;
+        if (par->vgapass)
+                fbiinit0 &= ~DIS_VGA_PASSTHROUGH;
         else
-                fbiinit0 |= EN_VGA_PASSTHROUGH;
+                fbiinit0 |= DIS_VGA_PASSTHROUGH;
         if (slowpci) {
                 fbiinit1 |= SLOW_PCI_WRITES;
                 fbiinit4 |= SLOW_PCI_READS;
@@ -1267,7 +1260,7 @@ static void  __devexit sst_shutdown(struct fb_info *info)
         /* TODO maybe shutdown the dac, vrefresh and so on... */
         pci_write_config_dword(dev, PCI_INIT_ENABLE,
                                PCI_EN_INIT_WR);
-        sst_unset_bits(FBIINIT0, FBI_RESET | FIFO_RESET | EN_VGA_PASSTHROUGH);
+        sst_unset_bits(FBIINIT0, FBI_RESET | FIFO_RESET | DIS_VGA_PASSTHROUGH);
         pci_write_config_dword(dev, PCI_VCLK_DISABLE,0);
         /* maybe keep fbiinit* and PCI_INIT_enable in the fb_info struct
          * from start ? */
@@ -1278,8 +1271,7 @@ static void  __devexit sst_shutdown(struct fb_info *info)
 /*
  * Interface to the world
  */
-#ifndef MODULE
-static int  __init sstfb_setup(char *options)
+static int  __devinit sstfb_setup(char *options)
 {
         char *this_opt;
 
@@ -1312,7 +1304,7 @@ static int  __init sstfb_setup(char *options)
         }
         return 0;
 }
-#endif
+
 
 static struct fb_ops sstfb_ops = {
         .owner          = THIS_MODULE,
@@ -1416,15 +1408,10 @@ static int __devinit sstfb_probe(struct pci_dev *pdev,
          */
         fix->line_length = 2048; /* default value, for 24 or 32bit: 4096 */
         
-        if ( mode_option &&
-             fb_find_mode(&info->var, info, mode_option, NULL, 0, NULL, 16)) {
-                printk(KERN_ERR "sstfb: can't set supplied video mode. Using default\n");
-                info->var = sstfb_default;
-        } else
-                info->var = sstfb_default;
+        fb_find_mode(&info->var, info, mode_option, NULL, 0, NULL, 16);
 
         if (sstfb_check_var(&info->var, info)) {
-                printk(KERN_ERR "sstfb: invalid default video mode.\n");
+                printk(KERN_ERR "sstfb: invalid video mode.\n");
                 goto fail;
         }
 
@@ -1442,10 +1429,11 @@ static int __devinit sstfb_probe(struct pci_dev *pdev,
                 goto fail;
         }
 
-        if (1) /* set to 0 to see an initial bitmap instead */
-                sstfb_clear_screen(info);
-        else
-                sstfb_drawdebugimage(info);
+        sstfb_clear_screen(info);
+
+        if (device_create_file(info->dev, &device_attrs[0]))
+                printk(KERN_WARNING "sstfb: can't create sysfs entry.\n");
+
 
         printk(KERN_INFO "fb%d: %s frame buffer device at 0x%p\n",
                info->node, fix->id, info->screen_base);
@@ -1453,6 +1441,7 @@ static int __devinit sstfb_probe(struct pci_dev *pdev,
         return 0;
 
 fail:
+        fb_dealloc_cmap(&info->cmap);
         iounmap(info->screen_base);
 fail_fb_remap:
         iounmap(par->mmio_vbase);
@@ -1473,21 +1462,23 @@ static void __devexit sstfb_remove(struct pci_dev *pdev)
         info = pci_get_drvdata(pdev);
         par = info->par;
         
+        device_remove_file(info->dev, &device_attrs[0]);
         sst_shutdown(info);
-        unregister_framebuffer(info);
         iounmap(info->screen_base);
         iounmap(par->mmio_vbase);
         release_mem_region(info->fix.smem_start, 0x400000);
         release_mem_region(info->fix.mmio_start, info->fix.mmio_len);
+        fb_dealloc_cmap(&info->cmap);
+        unregister_framebuffer(info);
         framebuffer_release(info);
 }
 
 
-static struct pci_device_id sstfb_id_tbl[] = {
-        { PCI_VENDOR_ID_3DFX, PCI_DEVICE_ID_3DFX_VOODOO,
-          PCI_ANY_ID, PCI_ANY_ID, 0, 0, ID_VOODOO1 },
-        { PCI_VENDOR_ID_3DFX, PCI_DEVICE_ID_3DFX_VOODOO2,
-          PCI_ANY_ID, PCI_ANY_ID, 0, 0, ID_VOODOO2 },
+static const struct pci_device_id sstfb_id_tbl[] = {
+        { PCI_DEVICE(PCI_VENDOR_ID_3DFX, PCI_DEVICE_ID_3DFX_VOODOO ),
+                .driver_data = ID_VOODOO1, },
+        { PCI_DEVICE(PCI_VENDOR_ID_3DFX, PCI_DEVICE_ID_3DFX_VOODOO2),
+                .driver_data = ID_VOODOO2, },
         { 0 },
 };
 
@@ -1501,142 +1492,23 @@ static struct pci_driver sstfb_driver = {
 
 static int __devinit sstfb_init(void)
 {
-#ifndef MODULE
         char *option = NULL;
 
         if (fb_get_options("sstfb", &option))
                 return -ENODEV;
         sstfb_setup(option);
-#endif
+
         return pci_register_driver(&sstfb_driver);
 }
 
-#ifdef MODULE
 static void __devexit sstfb_exit(void)
 {
         pci_unregister_driver(&sstfb_driver);
 }
-#endif
 
 
-/*
- * testing and debugging functions
- */
-
-static int sstfb_dump_regs(struct fb_info *info)
-{
-#ifdef SST_DEBUG
-        static struct { u32 reg ; const char *reg_name;}  pci_regs[] = {
-                { PCI_INIT_ENABLE, "initenable"},
-                { PCI_VCLK_ENABLE, "enable vclk"},
-                { PCI_VCLK_DISABLE, "disable vclk"},
-        };
-
-        static struct { u32 reg ; const char *reg_name;}  sst_regs[] = {
-                {FBIINIT0,"fbiinit0"},
-                {FBIINIT1,"fbiinit1"},
-                {FBIINIT2,"fbiinit2"},
-                {FBIINIT3,"fbiinit3"},
-                {FBIINIT4,"fbiinit4"},
-                {FBIINIT5,"fbiinit5"},
-                {FBIINIT6,"fbiinit6"},
-                {FBIINIT7,"fbiinit7"},
-                {LFBMODE,"lfbmode"},
-                {FBZMODE,"fbzmode"},
-        };
-
-        const int pci_s = ARRAY_SIZE(pci_regs);
-        const int sst_s = ARRAY_SIZE(sst_regs);
-        struct sstfb_par *par = info->par;
-        struct pci_dev *dev = par->dev;
-        u32 pci_res[pci_s];
-        u32 sst_res[sst_s];
-        int i;
-
-        for (i=0; i<pci_s; i++) {
-                pci_read_config_dword(dev, pci_regs[i].reg, &pci_res[i]);
-        }
-        for (i=0; i<sst_s; i++) {
-                sst_res[i] = sst_read(sst_regs[i].reg);
-        }
-
-        dprintk("hardware register dump:\n");
-        for (i=0; i<pci_s; i++) {
-                dprintk("%s %0#10x\n", pci_regs[i].reg_name, pci_res[i]);
-        }
-        for (i=0; i<sst_s; i++) {
-                dprintk("%s %0#10x\n", sst_regs[i].reg_name, sst_res[i]);
-        }
-        return 0;
-#else
-        return -EINVAL;
-#endif
-}
-
-static void sstfb_fillrect_softw( struct fb_info *info, const struct fb_fillrect *rect)
-{
-        u8 __iomem *fbbase_virt = info->screen_base;
-        int x, y, w = info->var.bits_per_pixel == 16 ? 2 : 4;
-        u32 color = rect->color, height = rect->height;
-        u8 __iomem *p;
-        
-        if (w==2) color |= color<<16;
-        for (y=rect->dy; height; y++, height--) {
-                p = fbbase_virt + y*info->fix.line_length + rect->dx*w;
-                x = rect->width;
-                if (w==2) x>>=1;
-                while (x) {
-                        writel(color, p);
-                        p += 4;
-                        x--;
-                }
-        }
-}
-
-static void sstfb_drawrect_XY( struct fb_info *info, int x, int y,
-                int w, int h, int color, int hwfunc)
-{
-        struct fb_fillrect rect;
-        rect.dx = x;
-        rect.dy = y;
-        rect.height = h;
-        rect.width = w;
-        rect.color = color;
-        rect.rop = ROP_COPY;
-        if (hwfunc)
-                sstfb_fillrect(info, &rect);
-        else
-                sstfb_fillrect_softw(info, &rect);
-}
-
-/* print some squares on the fb */
-static void sstfb_drawdebugimage(struct fb_info *info)
-{
-        static int idx;
-
-        /* clear screen */
-        sstfb_clear_screen(info);
-        
-        idx = (idx+1) & 1;
-
-        /* white rect */
-        sstfb_drawrect_XY(info, 0, 0, 50, 50, 0xffff, idx);
-        
-        /* blue rect */
-        sstfb_drawrect_XY(info, 50, 50, 50, 50, 0x001f, idx);
-
-        /* green rect */
-        sstfb_drawrect_XY(info, 100, 100, 80, 80, 0x07e0, idx);
-        
-        /* red rect */
-        sstfb_drawrect_XY(info, 250, 250, 120, 100, 0xf800, idx);
-}
-
 module_init(sstfb_init);
-
-#ifdef MODULE
 module_exit(sstfb_exit);
-#endif
 
 MODULE_AUTHOR("(c) 2000,2002 Ghozlane Toumi <gtoumi@laposte.net>");
 MODULE_DESCRIPTION("FBDev driver for 3dfx Voodoo Graphics and Voodoo2 based video boards");
@@ -1652,3 +1524,6 @@ module_param(gfxclk, int, 0);
 MODULE_PARM_DESC(gfxclk, "Force graphic chip frequency in MHz. DANGEROUS. (default=auto)");
 module_param(slowpci, bool, 0);
 MODULE_PARM_DESC(slowpci, "Uses slow PCI settings (0 or 1) (default=0)");
+module_param(mode_option, charp, 0);
+MODULE_PARM_DESC(mode_option, "Initial video mode (default=" DEFAULT_VIDEO_MODE ")");
+
diff --git a/drivers/video/stifb.c b/drivers/video/stifb.c
index 3e16e2d9d55d..69f3b264a22e 100644
--- a/drivers/video/stifb.c
+++ b/drivers/video/stifb.c
@@ -1291,6 +1291,7 @@ out_err3:
 out_err2:
         release_mem_region(fix->smem_start, fix->smem_len);
 out_err1:
+        iounmap(info->screen_base);
         fb_dealloc_cmap(&info->cmap);
 out_err0:
         kfree(fb);
@@ -1364,6 +1365,8 @@ stifb_cleanup(void)
                         unregister_framebuffer(sti->info);
                         release_mem_region(info->fix.mmio_start, info->fix.mmio_len);
                         release_mem_region(info->fix.smem_start, info->fix.smem_len);
+                                if (info->screen_base)
+                                        iounmap(info->screen_base);
                         fb_dealloc_cmap(&info->cmap);
                         kfree(info); 
                 }
diff --git a/drivers/video/tgafb.c b/drivers/video/tgafb.c
index 94fde625a6c0..4b88fab83b74 100644
--- a/drivers/video/tgafb.c
+++ b/drivers/video/tgafb.c
@@ -23,6 +23,7 @@
 #include <linux/fb.h>
 #include <linux/pci.h>
 #include <linux/selection.h>
+#include <linux/bitrev.h>
 #include <asm/io.h>
 #include <video/tgafb.h>
 
@@ -517,41 +518,6 @@ tgafb_blank(int blank, struct fb_info *info)
 static void
 tgafb_imageblit(struct fb_info *info, const struct fb_image *image)
 {
-        static unsigned char const bitrev[256] = {
-                0x00, 0x80, 0x40, 0xc0, 0x20, 0xa0, 0x60, 0xe0,
-                0x10, 0x90, 0x50, 0xd0, 0x30, 0xb0, 0x70, 0xf0,
-                0x08, 0x88, 0x48, 0xc8, 0x28, 0xa8, 0x68, 0xe8,
-                0x18, 0x98, 0x58, 0xd8, 0x38, 0xb8, 0x78, 0xf8,
-                0x04, 0x84, 0x44, 0xc4, 0x24, 0xa4, 0x64, 0xe4,
-                0x14, 0x94, 0x54, 0xd4, 0x34, 0xb4, 0x74, 0xf4,
-                0x0c, 0x8c, 0x4c, 0xcc, 0x2c, 0xac, 0x6c, 0xec,
-                0x1c, 0x9c, 0x5c, 0xdc, 0x3c, 0xbc, 0x7c, 0xfc,
-                0x02, 0x82, 0x42, 0xc2, 0x22, 0xa2, 0x62, 0xe2,
-                0x12, 0x92, 0x52, 0xd2, 0x32, 0xb2, 0x72, 0xf2,
-                0x0a, 0x8a, 0x4a, 0xca, 0x2a, 0xaa, 0x6a, 0xea,
-                0x1a, 0x9a, 0x5a, 0xda, 0x3a, 0xba, 0x7a, 0xfa,
-                0x06, 0x86, 0x46, 0xc6, 0x26, 0xa6, 0x66, 0xe6,
-                0x16, 0x96, 0x56, 0xd6, 0x36, 0xb6, 0x76, 0xf6,
-                0x0e, 0x8e, 0x4e, 0xce, 0x2e, 0xae, 0x6e, 0xee,
-                0x1e, 0x9e, 0x5e, 0xde, 0x3e, 0xbe, 0x7e, 0xfe,
-                0x01, 0x81, 0x41, 0xc1, 0x21, 0xa1, 0x61, 0xe1,
-                0x11, 0x91, 0x51, 0xd1, 0x31, 0xb1, 0x71, 0xf1,
-                0x09, 0x89, 0x49, 0xc9, 0x29, 0xa9, 0x69, 0xe9,
-                0x19, 0x99, 0x59, 0xd9, 0x39, 0xb9, 0x79, 0xf9,
-                0x05, 0x85, 0x45, 0xc5, 0x25, 0xa5, 0x65, 0xe5,
-                0x15, 0x95, 0x55, 0xd5, 0x35, 0xb5, 0x75, 0xf5,
-                0x0d, 0x8d, 0x4d, 0xcd, 0x2d, 0xad, 0x6d, 0xed,
-                0x1d, 0x9d, 0x5d, 0xdd, 0x3d, 0xbd, 0x7d, 0xfd,
-                0x03, 0x83, 0x43, 0xc3, 0x23, 0xa3, 0x63, 0xe3,
-                0x13, 0x93, 0x53, 0xd3, 0x33, 0xb3, 0x73, 0xf3,
-                0x0b, 0x8b, 0x4b, 0xcb, 0x2b, 0xab, 0x6b, 0xeb,
-                0x1b, 0x9b, 0x5b, 0xdb, 0x3b, 0xbb, 0x7b, 0xfb,
-                0x07, 0x87, 0x47, 0xc7, 0x27, 0xa7, 0x67, 0xe7,
-                0x17, 0x97, 0x57, 0xd7, 0x37, 0xb7, 0x77, 0xf7,
-                0x0f, 0x8f, 0x4f, 0xcf, 0x2f, 0xaf, 0x6f, 0xef,
-                0x1f, 0x9f, 0x5f, 0xdf, 0x3f, 0xbf, 0x7f, 0xff
-        };
-
         struct tga_par *par = (struct tga_par *) info->par;
         u32 fgcolor, bgcolor, dx, dy, width, height, vxres, vyres, pixelmask;
         unsigned long rincr, line_length, shift, pos, is8bpp;
@@ -649,7 +615,7 @@ tgafb_imageblit(struct fb_info *info, const struct fb_image *image)
                         /* The image data is bit big endian; we need
                            little endian.  */
                         for (j = 0; j < bwidth; ++j)
-                                mask |= bitrev[data[j]] << (j * 8);
+                                mask |= bitrev8(data[j]) << (j * 8);
 
                         __raw_writel(mask << shift, fb_base + pos);
 
@@ -676,10 +642,10 @@ tgafb_imageblit(struct fb_info *info, const struct fb_image *image)
                 for (i = 0; i < height; ++i) {
                         for (j = 0; j < bwidth; j += 4) {
                                 u32 mask = 0;
-                                mask |= bitrev[data[j+0]] << (0 * 8);
-                                mask |= bitrev[data[j+1]] << (1 * 8);
-                                mask |= bitrev[data[j+2]] << (2 * 8);
-                                mask |= bitrev[data[j+3]] << (3 * 8);
+                                mask |= bitrev8(data[j+0]) << (0 * 8);
+                                mask |= bitrev8(data[j+1]) << (1 * 8);
+                                mask |= bitrev8(data[j+2]) << (2 * 8);
+                                mask |= bitrev8(data[j+3]) << (3 * 8);
                                 __raw_writel(mask, fb_base + pos + j*bincr);
                         }
                         pos += line_length;
@@ -699,7 +665,7 @@ tgafb_imageblit(struct fb_info *info, const struct fb_image *image)
                         for (i = 0; i < height; ++i) {
                                 u32 mask = 0;
                                 for (j = 0; j < bwidth; ++j)
-                                        mask |= bitrev[data[j]] << (j * 8);
+                                        mask |= bitrev8(data[j]) << (j * 8);
                                 __raw_writel(mask, fb_base + pos);
                                 pos += line_length;
                                 data += rincr;
@@ -726,8 +692,8 @@ tgafb_imageblit(struct fb_info *info, const struct fb_image *image)
                 for (i = 0; i < height; ++i) {
                         for (j = 0; j < bwidth; j += 2) {
                                 u32 mask = 0;
-                                mask |= bitrev[data[j+0]] << (0 * 8);
-                                mask |= bitrev[data[j+1]] << (1 * 8);
+                                mask |= bitrev8(data[j+0]) << (0 * 8);
+                                mask |= bitrev8(data[j+1]) << (1 * 8);
                                 mask <<= shift;
                                 __raw_writel(mask, fb_base + pos + j*bincr);
                         }
@@ -746,9 +712,9 @@ tgafb_imageblit(struct fb_info *info, const struct fb_image *image)
                         bwidth = (width & 15) > 8;
 
                         for (i = 0; i < height; ++i) {
-                                u32 mask = bitrev[data[0]];
+                                u32 mask = bitrev8(data[0]);
                                 if (bwidth)
-                                        mask |= bitrev[data[1]] << 8;
+                                        mask |= bitrev8(data[1]) << 8;
                                 mask <<= shift;
                                 __raw_writel(mask, fb_base + pos);
                                 pos += line_length;
@@ -1473,6 +1439,8 @@ tgafb_pci_register(struct pci_dev *pdev, const struct pci_device_id *ent)
         return 0;
 
  err1:
+        if (mem_base)
+                iounmap(mem_base);
         release_mem_region(bar0_start, bar0_len);
  err0:
         kfree(all);
diff --git a/drivers/video/tridentfb.c b/drivers/video/tridentfb.c
index 14175cdb9c9c..55e8aa450bfa 100644
--- a/drivers/video/tridentfb.c
+++ b/drivers/video/tridentfb.c
@@ -1130,7 +1130,8 @@ static int __devinit trident_pci_probe(struct pci_dev * dev, const struct pci_de
         
         if (!request_mem_region(tridentfb_fix.smem_start, tridentfb_fix.smem_len, "tridentfb")) {
                 debug("request_mem_region failed!\n");
-                return -1;
+                err = -1;
+                goto out_unmap;
         }
 
         fb_info.screen_base = ioremap_nocache(tridentfb_fix.smem_start,
@@ -1139,7 +1140,8 @@ static int __devinit trident_pci_probe(struct pci_dev * dev, const struct pci_de
         if (!fb_info.screen_base) {
                 release_mem_region(tridentfb_fix.smem_start, tridentfb_fix.smem_len);
                 debug("ioremap failed\n");
-                return -1;
+                err = -1;
+                goto out_unmap;
         }
 
         output("%s board found\n", pci_name(dev));
@@ -1162,8 +1164,10 @@ static int __devinit trident_pci_probe(struct pci_dev * dev, const struct pci_de
 #endif
         fb_info.pseudo_palette = pseudo_pal;
 
-        if (!fb_find_mode(&default_var,&fb_info,mode,NULL,0,NULL,bpp))
-                return -EINVAL;
+        if (!fb_find_mode(&default_var,&fb_info,mode,NULL,0,NULL,bpp)) {
+                err = -EINVAL;
+                goto out_unmap;
+        }
         fb_alloc_cmap(&fb_info.cmap,256,0);
         if (defaultaccel && acc)
                 default_var.accel_flags |= FB_ACCELF_TEXT;
@@ -1174,12 +1178,20 @@ static int __devinit trident_pci_probe(struct pci_dev * dev, const struct pci_de
         fb_info.device = &dev->dev;
         if (register_framebuffer(&fb_info) < 0) {
                 printk(KERN_ERR "tridentfb: could not register Trident framebuffer\n");
-                return -EINVAL;
+                err = -EINVAL;
+                goto out_unmap;
         }
         output("fb%d: %s frame buffer device %dx%d-%dbpp\n",
            fb_info.node, fb_info.fix.id,default_var.xres,
            default_var.yres,default_var.bits_per_pixel);
         return 0;
+
+out_unmap:
+        if (default_par.io_virt)
+                iounmap(default_par.io_virt);
+        if (fb_info.screen_base)
+                iounmap(fb_info.screen_base);
+        return err;
 }
 
 static void __devexit trident_pci_remove(struct pci_dev * dev)
diff --git a/drivers/video/vesafb.c b/drivers/video/vesafb.c
index 2196448396ec..e16322d157d0 100644
--- a/drivers/video/vesafb.c
+++ b/drivers/video/vesafb.c
@@ -47,17 +47,16 @@ static struct fb_fix_screeninfo vesafb_fix __initdata = {
         .accel  = FB_ACCEL_NONE,
 };
 
-static int             inverse   = 0;
-static int             mtrr      = 0; /* disable mtrr */
-static int             vram_remap __initdata = 0; /* Set amount of memory to be used */
-static int             vram_total __initdata = 0; /* Set total amount of memory */
-static int             pmi_setpal = 1;  /* pmi for palette changes ??? */
-static int             ypan       = 0;  /* 0..nothing, 1..ypan, 2..ywrap */
-static unsigned short  *pmi_base  = NULL;
-static void            (*pmi_start)(void);
-static void            (*pmi_pal)(void);
-static int             depth;
-static int             vga_compat;
+static int   inverse    __read_mostly;
+static int   mtrr       __read_mostly;          /* disable mtrr */
+static int   vram_remap __initdata;             /* Set amount of memory to be used */
+static int   vram_total __initdata;             /* Set total amount of memory */
+static int   pmi_setpal __read_mostly = 1;      /* pmi for palette changes ??? */
+static int   ypan       __read_mostly;          /* 0..nothing, 1..ypan, 2..ywrap */
+static void  (*pmi_start)(void) __read_mostly;
+static void  (*pmi_pal)  (void) __read_mostly;
+static int   depth      __read_mostly;
+static int   vga_compat __read_mostly;
 /* --------------------------------------------------------------------- */
 
 static int vesafb_pan_display(struct fb_var_screeninfo *var,
@@ -312,6 +311,7 @@ static int __init vesafb_probe(struct platform_device *dev)
                 ypan = pmi_setpal = 0; /* not available or some DOS TSR ... */
 
         if (ypan || pmi_setpal) {
+                unsigned short *pmi_base;
                 pmi_base  = (unsigned short*)phys_to_virt(((unsigned long)screen_info.vesapm_seg << 4) + screen_info.vesapm_off);
                 pmi_start = (void*)((char*)pmi_base + pmi_base[1]);
                 pmi_pal   = (void*)((char*)pmi_base + pmi_base[2]);
@@ -456,6 +456,8 @@ static int __init vesafb_probe(struct platform_device *dev)
                info->node, info->fix.id);
         return 0;
 err:
+        if (info->screen_base)
+                iounmap(info->screen_base);
         framebuffer_release(info);
         release_mem_region(vesafb_fix.smem_start, size_total);
         return err;
diff --git a/drivers/video/vga16fb.c b/drivers/video/vga16fb.c
index 43d5a6d9c4a6..6aff63d5b295 100644
--- a/drivers/video/vga16fb.c
+++ b/drivers/video/vga16fb.c
@@ -264,7 +264,7 @@ static void vga16fb_clock_chip(struct vga16fb_par *par,
                                const struct fb_info *info,
                                int mul, int div)
 {
-        static struct {
+        static const struct {
                 u32 pixclock;
                 u8  misc;
                 u8  seq_clock_mode;
@@ -652,7 +652,7 @@ static int vga16fb_set_par(struct fb_info *info)
 
 static void ega16_setpalette(int regno, unsigned red, unsigned green, unsigned blue)
 {
-        static unsigned char map[] = { 000, 001, 010, 011 };
+        static const unsigned char map[] = { 000, 001, 010, 011 };
         int val;
         
         if (regno >= 16)
@@ -1139,23 +1139,19 @@ static void vga16fb_copyarea(struct fb_info *info, const struct fb_copyarea *are
         }
 }
 
-#ifdef __LITTLE_ENDIAN
-static unsigned int transl_l[] =
-{0x0,0x8,0x4,0xC,0x2,0xA,0x6,0xE,0x1,0x9,0x5,0xD,0x3,0xB,0x7,0xF};
-static unsigned int transl_h[] =
-{0x000, 0x800, 0x400, 0xC00, 0x200, 0xA00, 0x600, 0xE00,
- 0x100, 0x900, 0x500, 0xD00, 0x300, 0xB00, 0x700, 0xF00};
-#else
-#ifdef __BIG_ENDIAN
-static unsigned int transl_h[] =
-{0x0,0x8,0x4,0xC,0x2,0xA,0x6,0xE,0x1,0x9,0x5,0xD,0x3,0xB,0x7,0xF};
-static unsigned int transl_l[] =
-{0x000, 0x800, 0x400, 0xC00, 0x200, 0xA00, 0x600, 0xE00,
- 0x100, 0x900, 0x500, 0xD00, 0x300, 0xB00, 0x700, 0xF00};
+#define TRANS_MASK_LOW  {0x0,0x8,0x4,0xC,0x2,0xA,0x6,0xE,0x1,0x9,0x5,0xD,0x3,0xB,0x7,0xF}
+#define TRANS_MASK_HIGH {0x000, 0x800, 0x400, 0xC00, 0x200, 0xA00, 0x600, 0xE00, \
+                         0x100, 0x900, 0x500, 0xD00, 0x300, 0xB00, 0x700, 0xF00}
+
+#if defined(__LITTLE_ENDIAN)
+static const u16 transl_l[] = TRANS_MASK_LOW;
+static const u16 transl_h[] = TRANS_MASK_HIGH;
+#elif defined(__BIG_ENDIAN)
+static const u16 transl_l[] = TRANS_MASK_HIGH;
+static const u16 transl_h[] = TRANS_MASK_LOW;
 #else
 #error "Only __BIG_ENDIAN and __LITTLE_ENDIAN are supported in vga-planes"
 #endif
-#endif
 
 static void vga_8planes_imageblit(struct fb_info *info, const struct fb_image *image)
 {
diff --git a/drivers/video/virgefb.c b/drivers/video/virgefb.c
index 64378959dd7b..b9fb6fb3600d 100644
--- a/drivers/video/virgefb.c
+++ b/drivers/video/virgefb.c
@@ -1799,7 +1799,7 @@ int __init virgefb_init(void)
                 #warning release resources
                 printk(KERN_ERR "virgefb.c: register_framebuffer failed\n");
                 DPRINTK("EXIT\n");
-                return -EINVAL;
+                goto out_unmap;
         }
 
         printk(KERN_INFO "fb%d: %s frame buffer device, using %ldK of video memory\n",
@@ -1809,6 +1809,21 @@ int __init virgefb_init(void)
 
         DPRINTK("EXIT\n");
         return 0;
+
+out_unmap:
+        if (board_addr >= 0x01000000) {
+                if (v_ram)
+                        iounmap((void*)v_ram);
+                if (vgaio_regs)
+                        iounmap(vgaio_regs);
+                if (mmio_regs)
+                        iounmap(mmio_regs);
+                if (vcode_switch_base)
+                        iounmap((void*)vcode_switch_base);
+                v_ram = vcode_switch_base = 0;
+                vgaio_regs = mmio_regs = NULL;
+        }
+        return -EINVAL;
 }