Merge branch 'release' of git://lm-sensors.org/kernel/mhoffman/hwmon-2.6

[linux-2.6-omap-h63xx.git] / drivers / video / tridentfb.c

diff --git a/drivers/video/tridentfb.c b/drivers/video/tridentfb.c
index 70fb4ee2b4215d978208f5edf7693991e4ebdd5c..bd54cd0de39af13fc4170665878ed63ac1af4acb 100644 (file)
--- a/drivers/video/tridentfb.c
+++ b/drivers/video/tridentfb.c
@@ -58,7 +58,7 @@ static int displaytype;
 /* defaults which are normally overriden by user values */
 
 /* video mode */
-static char *mode = "640x480";
+static char *mode_option __devinitdata = "640x480";
 static int bpp = 8;
 
 static int noaccel;
@@ -73,7 +73,10 @@ static int memsize;
 static int memdiff;
 static int nativex;
 
-module_param(mode, charp, 0);
+module_param(mode_option, charp, 0);
+MODULE_PARM_DESC(mode_option, "Initial video mode e.g. '648x480-8@60'");
+module_param_named(mode, mode_option, charp, 0);
+MODULE_PARM_DESC(mode, "Initial video mode e.g. '648x480-8@60' (deprecated)");
 module_param(bpp, int, 0);
 module_param(center, int, 0);
 module_param(stretch, int, 0);
@@ -564,7 +567,7 @@ static inline void write3CE(int reg, unsigned char val)
        t_outb(val, 0x3CF);
 }
 
-static inline void enable_mmio(void)
+static void enable_mmio(void)
 {
        /* Goto New Mode */
        outb(0x0B, 0x3C4);
@@ -579,6 +582,21 @@ static inline void enable_mmio(void)
        outb(inb(0x3D5) | 0x01, 0x3D5);
 }
 
+static void disable_mmio(void)
+{
+       /* Goto New Mode */
+       t_outb(0x0B, 0x3C4);
+       t_inb(0x3C5);
+
+       /* Unprotect registers */
+       t_outb(NewMode1, 0x3C4);
+       t_outb(0x80, 0x3C5);
+
+       /* Disable MMIO */
+       t_outb(PCIReg, 0x3D4);
+       t_outb(t_inb(0x3D5) & ~0x01, 0x3D5);
+}
+
 #define crtc_unlock()  write3X4(CRTVSyncEnd, read3X4(CRTVSyncEnd) & 0x7F)
 
 /*  Return flat panel's maximum x resolution */
@@ -730,7 +748,7 @@ static unsigned int __devinit get_memsize(void)
                        switch (tmp) {
 
                        case 0x01:
-                               k = 512;
+                               k = 512 * Kb;
                                break;
                        case 0x02:
                                k = 6 * Mb;     /* XP */
@@ -1239,9 +1257,9 @@ static int __devinit trident_pci_probe(struct pci_dev * dev,
        default_par.io_virt = ioremap_nocache(tridentfb_fix.mmio_start, tridentfb_fix.mmio_len);
 
        if (!default_par.io_virt) {
-               release_region(tridentfb_fix.mmio_start, tridentfb_fix.mmio_len);
                debug("ioremap failed\n");
-               return -1;
+               err = -1;
+               goto out_unmap1;
        }
 
        enable_mmio();
@@ -1252,25 +1270,21 @@ static int __devinit trident_pci_probe(struct pci_dev * dev,
 
        if (!request_mem_region(tridentfb_fix.smem_start, tridentfb_fix.smem_len, "tridentfb")) {
                debug("request_mem_region failed!\n");
+               disable_mmio();
                err = -1;
-               goto out_unmap;
+               goto out_unmap1;
        }
 
        fb_info.screen_base = ioremap_nocache(tridentfb_fix.smem_start,
                                              tridentfb_fix.smem_len);
 
        if (!fb_info.screen_base) {
-               release_mem_region(tridentfb_fix.smem_start, tridentfb_fix.smem_len);
                debug("ioremap failed\n");
                err = -1;
-               goto out_unmap;
+               goto out_unmap2;
        }
 
        output("%s board found\n", pci_name(dev));
-#if 0
-       output("Trident board found : mem = %X, io = %X, mem_v = %X, io_v = %X\n",
-               tridentfb_fix.smem_start, tridentfb_fix.mmio_start, fb_info.screen_base, default_par.io_virt);
-#endif
        displaytype = get_displaytype();
 
        if (flatpanel)
@@ -1286,11 +1300,15 @@ static int __devinit trident_pci_probe(struct pci_dev * dev,
 #endif
        fb_info.pseudo_palette = pseudo_pal;
 
-       if (!fb_find_mode(&default_var, &fb_info, mode, NULL, 0, NULL, bpp)) {
+       if (!fb_find_mode(&default_var, &fb_info,
+                         mode_option, NULL, 0, NULL, bpp)) {
                err = -EINVAL;
-               goto out_unmap;
+               goto out_unmap2;
        }
-       fb_alloc_cmap(&fb_info.cmap, 256, 0);
+       err = fb_alloc_cmap(&fb_info.cmap, 256, 0);
+       if (err < 0)
+               goto out_unmap2;
+
        if (defaultaccel && acc)
                default_var.accel_flags |= FB_ACCELF_TEXT;
        else
@@ -1300,19 +1318,24 @@ static int __devinit trident_pci_probe(struct pci_dev * dev,
        fb_info.device = &dev->dev;
        if (register_framebuffer(&fb_info) < 0) {
                printk(KERN_ERR "tridentfb: could not register Trident framebuffer\n");
+               fb_dealloc_cmap(&fb_info.cmap);
                err = -EINVAL;
-               goto out_unmap;
+               goto out_unmap2;
        }
        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);
+out_unmap2:
        if (fb_info.screen_base)
                iounmap(fb_info.screen_base);
+       release_mem_region(tridentfb_fix.smem_start, tridentfb_fix.smem_len);
+       disable_mmio();
+out_unmap1:
+       if (default_par.io_virt)
+               iounmap(default_par.io_virt);
+       release_mem_region(tridentfb_fix.mmio_start, tridentfb_fix.mmio_len);
        return err;
 }
 
@@ -1323,7 +1346,7 @@ static void __devexit trident_pci_remove(struct pci_dev *dev)
        iounmap(par->io_virt);
        iounmap(fb_info.screen_base);
        release_mem_region(tridentfb_fix.smem_start, tridentfb_fix.smem_len);
-       release_region(tridentfb_fix.mmio_start, tridentfb_fix.mmio_len);
+       release_mem_region(tridentfb_fix.mmio_start, tridentfb_fix.mmio_len);
 }
 
 /* List of boards that we are trying to support */
@@ -1366,7 +1389,7 @@ static struct pci_driver tridentfb_pci_driver = {
  *     video=trident:800x600,bpp=16,noaccel
  */
 #ifndef MODULE
-static int tridentfb_setup(char *options)
+static int __init tridentfb_setup(char *options)
 {
        char *opt;
        if (!options || !*options)
@@ -1393,7 +1416,7 @@ static int tridentfb_setup(char *options)
                else if (!strncmp(opt, "nativex=", 8))
                        nativex = simple_strtoul(opt + 8, NULL, 0);
                else
-                       mode = opt;
+                       mode_option = opt;
        }
        return 0;
 }