11 files changed, 67 insertions, 66 deletions

diff --git a/drivers/video/bf54x-lq043fb.c b/drivers/video/bf54x-lq043fb.c
index 6d5aa806777e..7644ed249564 100644
--- a/drivers/video/bf54x-lq043fb.c
+++ b/drivers/video/bf54x-lq043fb.c
@@ -58,7 +58,7 @@
 #include <asm/gpio.h>
 #include <asm/portmux.h>
 
-#include <asm/mach/bf54x-lq043.h>
+#include <mach/bf54x-lq043.h>
 
 #define NO_BL_SUPPORT
 
diff --git a/drivers/video/cirrusfb.c b/drivers/video/cirrusfb.c
index c14b2435d23e..e729fb279645 100644
--- a/drivers/video/cirrusfb.c
+++ b/drivers/video/cirrusfb.c
@@ -628,27 +628,18 @@ static long cirrusfb_get_mclk(long freq, int bpp, long *div)
 static int cirrusfb_check_var(struct fb_var_screeninfo *var,
                               struct fb_info *info)
 {
-        int nom, den;           /* translyting from pixels->bytes */
-        int yres, i;
-        static struct { int xres, yres; } modes[] =
-        { { 1600, 1280 },
-          { 1280, 1024 },
-          { 1024, 768 },
-          { 800, 600 },
-          { 640, 480 },
-          { -1, -1 } };
+        int yres;
+        /* memory size in pixels */
+        unsigned pixels = info->screen_size * 8 / var->bits_per_pixel;
 
         switch (var->bits_per_pixel) {
         case 1:
-                nom = 4;
-                den = 8;
+                pixels /= 4;
                 break;          /* 8 pixel per byte, only 1/4th of mem usable */
         case 8:
         case 16:
         case 24:
         case 32:
-                nom = var->bits_per_pixel / 8;
-                den = 1;
                 break;          /* 1 pixel == 1 byte */
         default:
                 printk(KERN_ERR "cirrusfb: mode %dx%dx%d rejected..."
@@ -658,43 +649,29 @@ static int cirrusfb_check_var(struct fb_var_screeninfo *var,
                 return -EINVAL;
         }
 
-        if (var->xres * nom / den * var->yres > info->screen_size) {
-                printk(KERN_ERR "cirrusfb: mode %dx%dx%d rejected..."
-                        "resolution too high to fit into video memory!\n",
-                        var->xres, var->yres, var->bits_per_pixel);
-                DPRINTK("EXIT - EINVAL error\n");
-                return -EINVAL;
-        }
-
+        if (var->xres_virtual < var->xres)
+                var->xres_virtual = var->xres;
         /* use highest possible virtual resolution */
-        if (var->xres_virtual == -1 &&
-            var->yres_virtual == -1) {
-                printk(KERN_INFO
-                     "cirrusfb: using maximum available virtual resolution\n");
-                for (i = 0; modes[i].xres != -1; i++) {
-                        int size = modes[i].xres * nom / den * modes[i].yres;
-                        if (size < info->screen_size / 2)
-                                break;
-                }
-                if (modes[i].xres == -1) {
-                        printk(KERN_ERR "cirrusfb: could not find a virtual "
-                                "resolution that fits into video memory!!\n");
-                        DPRINTK("EXIT - EINVAL error\n");
-                        return -EINVAL;
-                }
-                var->xres_virtual = modes[i].xres;
-                var->yres_virtual = modes[i].yres;
+        if (var->yres_virtual == -1) {
+                var->yres_virtual = pixels / var->xres_virtual;
 
                 printk(KERN_INFO "cirrusfb: virtual resolution set to "
                         "maximum of %dx%d\n", var->xres_virtual,
                         var->yres_virtual);
         }
-
-        if (var->xres_virtual < var->xres)
-                var->xres_virtual = var->xres;
         if (var->yres_virtual < var->yres)
                 var->yres_virtual = var->yres;
 
+        if (var->xres_virtual * var->yres_virtual > pixels) {
+                printk(KERN_ERR "cirrusfb: mode %dx%dx%d rejected... "
+                      "virtual resolution too high to fit into video memory!\n",
+                        var->xres_virtual, var->yres_virtual,
+                        var->bits_per_pixel);
+                DPRINTK("EXIT - EINVAL error\n");
+                return -EINVAL;
+        }
+
+
         if (var->xoffset < 0)
                 var->xoffset = 0;
         if (var->yoffset < 0)
diff --git a/drivers/video/omap/dispc.c b/drivers/video/omap/dispc.c
index 6efcf89e7fbe..dfb72f5e4c96 100644
--- a/drivers/video/omap/dispc.c
+++ b/drivers/video/omap/dispc.c
@@ -156,7 +156,7 @@ struct resmap {
 };
 
 static struct {
-        u32             base;
+        void __iomem    *base;
 
         struct omapfb_mem_desc  mem_desc;
         struct resmap           *res_map[DISPC_MEMTYPE_NUM];
@@ -212,9 +212,9 @@ static void enable_rfbi_mode(int enable)
         dispc_write_reg(DISPC_CONTROL, l);
 
         /* Set bypass mode in RFBI module */
-        l = __raw_readl(io_p2v(RFBI_CONTROL));
+        l = __raw_readl(IO_ADDRESS(RFBI_CONTROL));
         l |= enable ? 0 : (1 << 1);
-        __raw_writel(l, io_p2v(RFBI_CONTROL));
+        __raw_writel(l, IO_ADDRESS(RFBI_CONTROL));
 }
 
 static void set_lcd_data_lines(int data_lines)
@@ -1349,14 +1349,19 @@ static int omap_dispc_init(struct omapfb_device *fbdev, int ext_mode,
 
         memset(&dispc, 0, sizeof(dispc));
 
-        dispc.base = io_p2v(DISPC_BASE);
+        dispc.base = ioremap(DISPC_BASE, SZ_1K);
+        if (!dispc.base) {
+                dev_err(fbdev->dev, "can't ioremap DISPC\n");
+                return -ENOMEM;
+        }
+
         dispc.fbdev = fbdev;
         dispc.ext_mode = ext_mode;
 
         init_completion(&dispc.frame_done);
 
         if ((r = get_dss_clocks()) < 0)
-                return r;
+                goto fail0;
 
         enable_interface_clocks(1);
         enable_lcd_clocks(1);
@@ -1414,7 +1419,7 @@ static int omap_dispc_init(struct omapfb_device *fbdev, int ext_mode,
         }
 
         /* L3 firewall setting: enable access to OCM RAM */
-        __raw_writel(0x402000b0, io_p2v(0x680050a0));
+        __raw_writel(0x402000b0, IO_ADDRESS(0x680050a0));
 
         if ((r = alloc_palette_ram()) < 0)
                 goto fail2;
@@ -1464,7 +1469,8 @@ fail1:
         enable_lcd_clocks(0);
         enable_interface_clocks(0);
         put_dss_clocks();
-
+fail0:
+        iounmap(dispc.base);
         return r;
 }
 
@@ -1481,6 +1487,7 @@ static void omap_dispc_cleanup(void)
         free_irq(INT_24XX_DSS_IRQ, dispc.fbdev);
         enable_interface_clocks(0);
         put_dss_clocks();
+        iounmap(dispc.base);
 }
 
 const struct lcd_ctrl omap2_int_ctrl = {
diff --git a/drivers/video/omap/dispc.h b/drivers/video/omap/dispc.h
index eb1512b56ce8..ef720a78f6d5 100644
--- a/drivers/video/omap/dispc.h
+++ b/drivers/video/omap/dispc.h
@@ -40,4 +40,6 @@ extern void omap_dispc_enable_digit_out(int enable);
 extern int  omap_dispc_request_irq(void (*callback)(void *data), void *data);
 extern void omap_dispc_free_irq(void);
 
+extern const struct lcd_ctrl omap2_int_ctrl;
+
 #endif
diff --git a/drivers/video/omap/lcd_h4.c b/drivers/video/omap/lcd_h4.c
index 88c19d424ef7..6ff56430341b 100644
--- a/drivers/video/omap/lcd_h4.c
+++ b/drivers/video/omap/lcd_h4.c
@@ -47,7 +47,7 @@ static unsigned long h4_panel_get_caps(struct lcd_panel *panel)
         return 0;
 }
 
-struct lcd_panel h4_panel = {
+static struct lcd_panel h4_panel = {
         .name           = "h4",
         .config         = OMAP_LCDC_PANEL_TFT,
 
@@ -91,7 +91,7 @@ static int h4_panel_resume(struct platform_device *pdev)
         return 0;
 }
 
-struct platform_driver h4_panel_driver = {
+static struct platform_driver h4_panel_driver = {
         .probe          = h4_panel_probe,
         .remove         = h4_panel_remove,
         .suspend        = h4_panel_suspend,
diff --git a/drivers/video/omap/lcdc.c b/drivers/video/omap/lcdc.c
index 83514f066712..6e2ea7518761 100644
--- a/drivers/video/omap/lcdc.c
+++ b/drivers/video/omap/lcdc.c
@@ -34,6 +34,8 @@
 
 #include <asm/mach-types.h>
 
+#include "lcdc.h"
+
 #define MODULE_NAME                     "lcdc"
 
 #define OMAP_LCDC_BASE                  0xfffec000
diff --git a/drivers/video/omap/lcdc.h b/drivers/video/omap/lcdc.h
index adb731e5314a..845222270db3 100644
--- a/drivers/video/omap/lcdc.h
+++ b/drivers/video/omap/lcdc.h
@@ -4,4 +4,6 @@
 int omap_lcdc_set_dma_callback(void (*callback)(void *data), void *data);
 void omap_lcdc_free_dma_callback(void);
 
+extern const struct lcd_ctrl omap1_int_ctrl;
+
 #endif
diff --git a/drivers/video/omap/omapfb_main.c b/drivers/video/omap/omapfb_main.c
index 51a138bd113c..5a5e407dc45f 100644
--- a/drivers/video/omap/omapfb_main.c
+++ b/drivers/video/omap/omapfb_main.c
@@ -31,11 +31,14 @@
 #include <mach/dma.h>
 #include <mach/omapfb.h>
 
+#include "lcdc.h"
+#include "dispc.h"
+
 #define MODULE_NAME     "omapfb"
 
 static unsigned int     def_accel;
 static unsigned long    def_vram[OMAPFB_PLANE_NUM];
-static int              def_vram_cnt;
+static unsigned int     def_vram_cnt;
 static unsigned long    def_vxres;
 static unsigned long    def_vyres;
 static unsigned int     def_rotate;
@@ -84,12 +87,10 @@ static struct caps_table_struct color_caps[] = {
  * LCD panel
  * ---------------------------------------------------------------------------
  */
-extern struct lcd_ctrl omap1_int_ctrl;
-extern struct lcd_ctrl omap2_int_ctrl;
 extern struct lcd_ctrl hwa742_ctrl;
 extern struct lcd_ctrl blizzard_ctrl;
 
-static struct lcd_ctrl *ctrls[] = {
+static const struct lcd_ctrl *ctrls[] = {
 #ifdef CONFIG_ARCH_OMAP1
         &omap1_int_ctrl,
 #else
@@ -740,7 +741,7 @@ static int omapfb_update_win(struct fb_info *fbi,
         int ret;
 
         omapfb_rqueue_lock(plane->fbdev);
-        ret = omapfb_update_window_async(fbi, win, NULL, 0);
+        ret = omapfb_update_window_async(fbi, win, NULL, NULL);
         omapfb_rqueue_unlock(plane->fbdev);
 
         return ret;
@@ -768,7 +769,7 @@ static int omapfb_update_full_screen(struct fb_info *fbi)
         win.format = 0;
 
         omapfb_rqueue_lock(fbdev);
-        r = fbdev->ctrl->update_window(fbi, &win, NULL, 0);
+        r = fbdev->ctrl->update_window(fbi, &win, NULL, NULL);
         omapfb_rqueue_unlock(fbdev);
 
         return r;
@@ -1047,7 +1048,7 @@ void omapfb_write_first_pixel(struct omapfb_device *fbdev, u16 pixval)
                 win.height = 2;
                 win.out_width = 2;
                 win.out_height = 2;
-                fbdev->ctrl->update_window(fbdev->fb_info[0], &win, NULL, 0);
+                fbdev->ctrl->update_window(fbdev->fb_info[0], &win, NULL, NULL);
         }
         omapfb_rqueue_unlock(fbdev);
 }
diff --git a/drivers/video/omap/rfbi.c b/drivers/video/omap/rfbi.c
index 4a6f13d3facf..a13c8dcad2a8 100644
--- a/drivers/video/omap/rfbi.c
+++ b/drivers/video/omap/rfbi.c
@@ -59,7 +59,7 @@
 #define DISPC_CONTROL           0x0040
 
 static struct {
-        u32             base;
+        void __iomem    *base;
         void            (*lcdc_callback)(void *data);
         void            *lcdc_callback_data;
         unsigned long   l4_khz;
@@ -518,7 +518,11 @@ static int rfbi_init(struct omapfb_device *fbdev)
         int r;
 
         rfbi.fbdev = fbdev;
-        rfbi.base = io_p2v(RFBI_BASE);
+        rfbi.base = ioremap(RFBI_BASE, SZ_1K);
+        if (!rfbi.base) {
+                dev_err(fbdev->dev, "can't ioremap RFBI\n");
+                return -ENOMEM;
+        }
 
         if ((r = rfbi_get_clocks()) < 0)
                 return r;
@@ -566,6 +570,7 @@ static void rfbi_cleanup(void)
 {
         omap_dispc_free_irq();
         rfbi_put_clocks();
+        iounmap(rfbi.base);
 }
 
 const struct lcd_ctrl_extif omap2_ext_if = {
diff --git a/drivers/video/omap/sossi.c b/drivers/video/omap/sossi.c
index 6359353c2c67..a76946220249 100644
--- a/drivers/video/omap/sossi.c
+++ b/drivers/video/omap/sossi.c
@@ -574,7 +574,12 @@ static int sossi_init(struct omapfb_device *fbdev)
         struct clk *dpll1out_ck;
         int r;
 
-        sossi.base = (void __iomem *)IO_ADDRESS(OMAP_SOSSI_BASE);
+        sossi.base = ioremap(OMAP_SOSSI_BASE, SZ_1K);
+        if (!sossi.base) {
+                dev_err(fbdev->dev, "can't ioremap SoSSI\n");
+                return -ENOMEM;
+        }
+
         sossi.fbdev = fbdev;
         spin_lock_init(&sossi.lock);
 
@@ -665,6 +670,7 @@ static void sossi_cleanup(void)
 {
         omap_lcdc_free_dma_callback();
         clk_put(sossi.fck);
+        iounmap(sossi.base);
 }
 
 struct lcd_ctrl_extif omap1_ext_if = {
diff --git a/drivers/video/tdfxfb.c b/drivers/video/tdfxfb.c
index 77aafcfae037..4599a4385bc9 100644
--- a/drivers/video/tdfxfb.c
+++ b/drivers/video/tdfxfb.c
@@ -95,7 +95,6 @@ static inline int mtrr_del(int reg, unsigned long base,
 #define VOODOO5_MAX_PIXCLOCK 350000
 
 static struct fb_fix_screeninfo tdfx_fix __devinitdata = {
-        .id =           "3Dfx",
         .type =         FB_TYPE_PACKED_PIXELS,
         .visual =       FB_VISUAL_PSEUDOCOLOR,
         .ypanstep =     1,
@@ -426,7 +425,7 @@ static unsigned long do_lfb_size(struct tdfx_par *par, unsigned short dev_id)
         if (dev_id < PCI_DEVICE_ID_3DFX_VOODOO5) {
                 /* Banshee/Voodoo3 */
                 chip_size = 2;
-                if (has_sgram && (draminit0 & DRAMINIT0_SGRAM_TYPE))
+                if (has_sgram && !(draminit0 & DRAMINIT0_SGRAM_TYPE))
                         chip_size = 1;
         } else {
                 /* Voodoo4/5 */
@@ -1200,15 +1199,15 @@ static int __devinit tdfxfb_probe(struct pci_dev *pdev,
         /* Configure the default fb_fix_screeninfo first */
         switch (pdev->device) {
         case PCI_DEVICE_ID_3DFX_BANSHEE:
-                strcat(tdfx_fix.id, " Banshee");
+                strcpy(tdfx_fix.id, "3Dfx Banshee");
                 default_par->max_pixclock = BANSHEE_MAX_PIXCLOCK;
                 break;
         case PCI_DEVICE_ID_3DFX_VOODOO3:
-                strcat(tdfx_fix.id, " Voodoo3");
+                strcpy(tdfx_fix.id, "3Dfx Voodoo3");
                 default_par->max_pixclock = VOODOO3_MAX_PIXCLOCK;
                 break;
         case PCI_DEVICE_ID_3DFX_VOODOO5:
-                strcat(tdfx_fix.id, " Voodoo5");
+                strcpy(tdfx_fix.id, "3Dfx Voodoo5");
                 default_par->max_pixclock = VOODOO5_MAX_PIXCLOCK;
                 break;
         }