[PATCH] ppc32: Remove CONFIG_PMAC_PBOOK

This patch removes CONFIG_PMAC_PBOOK (PowerBook support).  This is now
split into CONFIG_PMAC_MEDIABAY for the actual hotswap bay that some
powerbooks have, CONFIG_PM for power management related code, and just left
out of any CONFIG_* option for some generally useful stuff that can be used
on non-laptops as well.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

2 files changed, 92 insertions, 98 deletions

diff --git a/drivers/video/aty/aty128fb.c b/drivers/video/aty/aty128fb.c
index 9789115980a5..7bc1d44d8814 100644
--- a/drivers/video/aty/aty128fb.c
+++ b/drivers/video/aty/aty128fb.c
@@ -350,10 +350,8 @@ static int default_vmode __initdata = VMODE_1024_768_60;
 static int default_cmode __initdata = CMODE_8;
 #endif
 
-#ifdef CONFIG_PMAC_PBOOK
 static int default_crt_on __initdata = 0;
 static int default_lcd_on __initdata = 1;
-#endif
 
 #ifdef CONFIG_MTRR
 static int mtrr = 1;
@@ -1249,7 +1247,6 @@ static int aty128_crtc_to_var(const struct aty128_crtc *crtc,
         return 0;
 }
 
-#ifdef CONFIG_PMAC_PBOOK
 static void aty128_set_crt_enable(struct aty128fb_par *par, int on)
 {
         if (on) {
@@ -1284,7 +1281,6 @@ static void aty128_set_lcd_enable(struct aty128fb_par *par, int on)
                 aty_st_le32(LVDS_GEN_CNTL, reg);
         }
 }
-#endif /* CONFIG_PMAC_PBOOK */
 
 static void aty128_set_pll(struct aty128_pll *pll, const struct aty128fb_par *par)
 {
@@ -1491,12 +1487,10 @@ static int aty128fb_set_par(struct fb_info *info)
         info->fix.visual = par->crtc.bpp == 8 ? FB_VISUAL_PSEUDOCOLOR
                 : FB_VISUAL_DIRECTCOLOR;
 
-#ifdef CONFIG_PMAC_PBOOK
         if (par->chip_gen == rage_M3) {
                 aty128_set_crt_enable(par, par->crt_on);
                 aty128_set_lcd_enable(par, par->lcd_on);
         }
-#endif
         if (par->accel_flags & FB_ACCELF_TEXT)
                 aty128_init_engine(par);
 
@@ -1652,7 +1646,6 @@ static int __init aty128fb_setup(char *options)
                 return 0;
 
         while ((this_opt = strsep(&options, ",")) != NULL) {
-#ifdef CONFIG_PMAC_PBOOK
                 if (!strncmp(this_opt, "lcd:", 4)) {
                         default_lcd_on = simple_strtoul(this_opt+4, NULL, 0);
                         continue;
@@ -1660,7 +1653,6 @@ static int __init aty128fb_setup(char *options)
                         default_crt_on = simple_strtoul(this_opt+4, NULL, 0);
                         continue;
                 }
-#endif
 #ifdef CONFIG_MTRR
                 if(!strncmp(this_opt, "nomtrr", 6)) {
                         mtrr = 0;
@@ -1752,10 +1744,8 @@ static int __init aty128_init(struct pci_dev *pdev, const struct pci_device_id *
         info->fbops = &aty128fb_ops;
         info->flags = FBINFO_FLAG_DEFAULT;
 
-#ifdef CONFIG_PMAC_PBOOK
         par->lcd_on = default_lcd_on;
         par->crt_on = default_crt_on;
-#endif
 
         var = default_var;
 #ifdef CONFIG_PPC_PMAC
@@ -2035,12 +2025,10 @@ static int aty128fb_blank(int blank, struct fb_info *fb)
 
         aty_st_8(CRTC_EXT_CNTL+1, state);
 
-#ifdef CONFIG_PMAC_PBOOK
         if (par->chip_gen == rage_M3) {
                 aty128_set_crt_enable(par, par->crt_on && !blank);
                 aty128_set_lcd_enable(par, par->lcd_on && !blank);
         }
-#endif  
 #ifdef CONFIG_PMAC_BACKLIGHT
         if ((_machine == _MACH_Pmac) && !blank)
                 set_backlight_enable(1);
@@ -2124,7 +2112,6 @@ static int aty128fb_setcolreg(u_int regno, u_int red, u_int green, u_int blue,
 static int aty128fb_ioctl(struct inode *inode, struct file *file, u_int cmd,
                           u_long arg, struct fb_info *info)
 {
-#ifdef CONFIG_PMAC_PBOOK
         struct aty128fb_par *par = info->par;
         u32 value;
         int rc;
@@ -2149,7 +2136,6 @@ static int aty128fb_ioctl(struct inode *inode, struct file *file, u_int cmd,
                 value = (par->crt_on << 1) | par->lcd_on;
                 return put_user(value, (__u32 __user *)arg);
         }
-#endif
         return -EINVAL;
 }
 
diff --git a/drivers/video/chipsfb.c b/drivers/video/chipsfb.c
index 95e72550d43f..e75a965ec760 100644
--- a/drivers/video/chipsfb.c
+++ b/drivers/video/chipsfb.c
@@ -28,22 +28,17 @@
 #include <linux/fb.h>
 #include <linux/init.h>
 #include <linux/pci.h>
+#include <linux/console.h>
 #include <asm/io.h>
 
 #ifdef CONFIG_PMAC_BACKLIGHT
 #include <asm/backlight.h>
 #endif
-#ifdef CONFIG_PMAC_PBOOK
-#include <linux/adb.h>
-#include <linux/pmu.h>
-#endif
 
 /*
  * Since we access the display with inb/outb to fixed port numbers,
  * we can only handle one 6555x chip.  -- paulus
  */
-static struct fb_info chipsfb_info;
-
 #define write_ind(num, val, ap, dp)     do { \
         outb((num), (ap)); outb((val), (dp)); \
 } while (0)
@@ -74,14 +69,6 @@ static struct fb_info chipsfb_info;
         inb(0x3da); read_ind(num, var, 0x3c0, 0x3c1); \
 } while (0)
 
-#ifdef CONFIG_PMAC_PBOOK
-static unsigned char *save_framebuffer;
-int chips_sleep_notify(struct pmu_sleep_notifier *self, int when);
-static struct pmu_sleep_notifier chips_sleep_notifier = {
-        chips_sleep_notify, SLEEP_LEVEL_VIDEO,
-};
-#endif
-
 /*
  * Exported functions
  */
@@ -356,6 +343,8 @@ static struct fb_var_screeninfo chipsfb_var __initdata = {
 
 static void __init init_chips(struct fb_info *p, unsigned long addr)
 {
+        memset(p->screen_base, 0, 0x100000);
+
         p->fix = chipsfb_fix;
         p->fix.smem_start = addr;
 
@@ -366,34 +355,41 @@ static void __init init_chips(struct fb_info *p, unsigned long addr)
 
         fb_alloc_cmap(&p->cmap, 256, 0);
 
-        if (register_framebuffer(p) < 0) {
-                printk(KERN_ERR "C&T 65550 framebuffer failed to register\n");
-                return;
-        }
-
-        printk(KERN_INFO "fb%d: Chips 65550 frame buffer (%dK RAM detected)\n",
-                p->node, p->fix.smem_len / 1024);
-
         chips_hw_init();
 }
 
 static int __devinit
 chipsfb_pci_init(struct pci_dev *dp, const struct pci_device_id *ent)
 {
-        struct fb_info *p = &chipsfb_info;
+        struct fb_info *p;
         unsigned long addr, size;
         unsigned short cmd;
+        int rc = -ENODEV;
+
+        if (pci_enable_device(dp) < 0) {
+                dev_err(&dp->dev, "Cannot enable PCI device\n");
+                goto err_out;
+        }
 
         if ((dp->resource[0].flags & IORESOURCE_MEM) == 0)
-                return -ENODEV;
+                goto err_disable;
         addr = pci_resource_start(dp, 0);
         size = pci_resource_len(dp, 0);
         if (addr == 0)
-                return -ENODEV;
-        if (p->screen_base != 0)
-                return -EBUSY;
-        if (!request_mem_region(addr, size, "chipsfb"))
-                return -EBUSY;
+                goto err_disable;
+
+        p = framebuffer_alloc(0, &dp->dev);
+        if (p == NULL) {
+                dev_err(&dp->dev, "Cannot allocate framebuffer structure\n");
+                rc = -ENOMEM;
+                goto err_disable;
+        }
+
+        if (pci_request_region(dp, 0, "chipsfb") != 0) {
+                dev_err(&dp->dev, "Cannot request framebuffer\n");
+                rc = -EBUSY;
+                goto err_release_fb;
+        }
 
 #ifdef __BIG_ENDIAN
         addr += 0x800000;       // Use big-endian aperture
@@ -411,37 +407,89 @@ chipsfb_pci_init(struct pci_dev *dp, const struct pci_device_id *ent)
         set_backlight_enable(1);
 #endif /* CONFIG_PMAC_BACKLIGHT */
 
+#ifdef CONFIG_PPC
         p->screen_base = __ioremap(addr, 0x200000, _PAGE_NO_CACHE);
+#else
+        p->screen_base = ioremap(addr, 0x200000);
+#endif
         if (p->screen_base == NULL) {
-                release_mem_region(addr, size);
-                return -ENOMEM;
+                dev_err(&dp->dev, "Cannot map framebuffer\n");
+                rc = -ENOMEM;
+                goto err_release_pci;
         }
+
+        pci_set_drvdata(dp, p);
         p->device = &dp->dev;
+
         init_chips(p, addr);
 
-#ifdef CONFIG_PMAC_PBOOK
-        pmu_register_sleep_notifier(&chips_sleep_notifier);
-#endif /* CONFIG_PMAC_PBOOK */
+        if (register_framebuffer(p) < 0) {
+                dev_err(&dp->dev,"C&T 65550 framebuffer failed to register\n");
+                goto err_unmap;
+        }
+
+        dev_info(&dp->dev,"fb%d: Chips 65550 frame buffer"
+                 " (%dK RAM detected)\n",
+                 p->node, p->fix.smem_len / 1024);
 
-        pci_set_drvdata(dp, p);
         return 0;
+
+ err_unmap:
+        iounmap(p->screen_base);
+ err_release_pci:
+        pci_release_region(dp, 0);
+ err_release_fb:
+        framebuffer_release(p);
+ err_disable:
+ err_out:
+        return rc;
 }
 
 static void __devexit chipsfb_remove(struct pci_dev *dp)
 {
         struct fb_info *p = pci_get_drvdata(dp);
 
-        if (p != &chipsfb_info || p->screen_base == NULL)
+        if (p->screen_base == NULL)
                 return;
         unregister_framebuffer(p);
         iounmap(p->screen_base);
         p->screen_base = NULL;
-        release_mem_region(pci_resource_start(dp, 0), pci_resource_len(dp, 0));
+        pci_release_region(dp, 0);
+}
+
+#ifdef CONFIG_PM
+static int chipsfb_pci_suspend(struct pci_dev *pdev, pm_message_t state)
+{
+        struct fb_info *p = pci_get_drvdata(pdev);
+
+        if (state == pdev->dev.power.power_state)
+                return 0;
+        if (state != PM_SUSPEND_MEM)
+                goto done;
+
+        acquire_console_sem();
+        chipsfb_blank(1, p);
+        fb_set_suspend(p, 1);
+        release_console_sem();
+ done:
+        pdev->dev.power.power_state = state;
+        return 0;
+}
+
+static int chipsfb_pci_resume(struct pci_dev *pdev)
+{
+        struct fb_info *p = pci_get_drvdata(pdev);
 
-#ifdef CONFIG_PMAC_PBOOK
-        pmu_unregister_sleep_notifier(&chips_sleep_notifier);
-#endif /* CONFIG_PMAC_PBOOK */
+        acquire_console_sem();
+        fb_set_suspend(p, 0);
+        chipsfb_blank(0, p);
+        release_console_sem();
+
+        pdev->dev.power.power_state = PMSG_ON;
+        return 0;
 }
+#endif /* CONFIG_PM */
+
 
 static struct pci_device_id chipsfb_pci_tbl[] = {
         { PCI_VENDOR_ID_CT, PCI_DEVICE_ID_CT_65550, PCI_ANY_ID, PCI_ANY_ID },
@@ -455,6 +503,10 @@ static struct pci_driver chipsfb_driver = {
         .id_table =     chipsfb_pci_tbl,
         .probe =        chipsfb_pci_init,
         .remove =       __devexit_p(chipsfb_remove),
+#ifdef CONFIG_PM
+        .suspend =      chipsfb_pci_suspend,
+        .resume =       chipsfb_pci_resume,
+#endif
 };
 
 int __init chips_init(void)
@@ -472,48 +524,4 @@ static void __exit chipsfb_exit(void)
         pci_unregister_driver(&chipsfb_driver);
 }
 
-#ifdef CONFIG_PMAC_PBOOK
-/*
- * Save the contents of the frame buffer when we go to sleep,
- * and restore it when we wake up again.
- */
-int
-chips_sleep_notify(struct pmu_sleep_notifier *self, int when)
-{
-        struct fb_info *p = &chipsfb_info;
-        int nb = p->var.yres * p->fix.line_length;
-
-        if (p->screen_base == NULL)
-                return PBOOK_SLEEP_OK;
-
-        switch (when) {
-        case PBOOK_SLEEP_REQUEST:
-                save_framebuffer = vmalloc(nb);
-                if (save_framebuffer == NULL)
-                        return PBOOK_SLEEP_REFUSE;
-                break;
-        case PBOOK_SLEEP_REJECT:
-                if (save_framebuffer) {
-                        vfree(save_framebuffer);
-                        save_framebuffer = NULL;
-                }
-                break;
-        case PBOOK_SLEEP_NOW:
-                chipsfb_blank(1, p);
-                if (save_framebuffer)
-                        memcpy(save_framebuffer, p->screen_base, nb);
-                break;
-        case PBOOK_WAKE:
-                if (save_framebuffer) {
-                        memcpy(p->screen_base, save_framebuffer, nb);
-                        vfree(save_framebuffer);
-                        save_framebuffer = NULL;
-                }
-                chipsfb_blank(0, p);
-                break;
-        }
-        return PBOOK_SLEEP_OK;
-}
-#endif /* CONFIG_PMAC_PBOOK */
-
 MODULE_LICENSE("GPL");