[PATCH] ppc32: Fix AGP and sleep again

My previous patch that added sleep support for uninorth-agp and some AGP
"off" stuff in radeonfb and aty128fb is breaking some configs.  More
specifically, it has problems with rage128 setups since the DRI code for
these in X doesn't properly re-enable AGP on wakeup or console switch
(unlike the radeon DRM).

This patch fixes the problem for pmac once for all by using a different
approach.  The AGP driver "registers" special suspend/resume callbacks with
some arch code that the fbdev's can later on call to suspend and resume
AGP, making sure it's resumed back in the same state it was when suspended.
 This is platform specific for now.  It would be too complicated to try to
do a generic implementation of this at this point due to all sort of weird
things going on with AGP on other architectures.  We'll re-work that whole
problem cleanly once we finally merge fbdev's and DRI.

In the meantime, please apply this patch which brings back some r128 based
laptops into working condition as far as system sleep is concerned.

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, 29 insertions, 48 deletions

diff --git a/drivers/video/aty/aty128fb.c b/drivers/video/aty/aty128fb.c
index 8a4ba3bb9872..9789115980a5 100644
--- a/drivers/video/aty/aty128fb.c
+++ b/drivers/video/aty/aty128fb.c
@@ -2331,7 +2331,6 @@ static int aty128_pci_suspend(struct pci_dev *pdev, pm_message_t state)
 {
         struct fb_info *info = pci_get_drvdata(pdev);
         struct aty128fb_par *par = info->par;
-        u8 agp;
 
         /* We don't do anything but D2, for now we return 0, but
          * we may want to change that. How do we know if the BIOS
@@ -2369,26 +2368,13 @@ static int aty128_pci_suspend(struct pci_dev *pdev, pm_message_t state)
         par->asleep = 1;
         par->lock_blank = 1;
 
-        /* Disable AGP. The AGP host should have done it, but since ordering
-         * isn't always properly guaranteed in this specific case, let's make
-         * sure it's disabled on card side now. Ultimately, when merging fbdev
-         * and dri into some common infrastructure, this will be handled
-         * more nicely. The host bridge side will (or will not) be dealt with
-         * by the bridge AGP driver, we don't attempt to touch it here.
+#ifdef CONFIG_PPC_PMAC
+        /* On powermac, we have hooks to properly suspend/resume AGP now,
+         * use them here. We'll ultimately need some generic support here,
+         * but the generic code isn't quite ready for that yet
          */
-        agp = pci_find_capability(pdev, PCI_CAP_ID_AGP);
-        if (agp) {
-                u32 cmd;
-
-                pci_read_config_dword(pdev, agp + PCI_AGP_COMMAND, &cmd);
-                if (cmd & PCI_AGP_COMMAND_AGP) {
-                        printk(KERN_INFO "aty128fb: AGP was enabled, "
-                               "disabling ...\n");
-                        cmd &= ~PCI_AGP_COMMAND_AGP;
-                        pci_write_config_dword(pdev, agp + PCI_AGP_COMMAND,
-                                               cmd);
-                }
-        }
+        pmac_suspend_agp_for_card(pdev);
+#endif /* CONFIG_PPC_PMAC */
 
         /* We need a way to make sure the fbdev layer will _not_ touch the
          * framebuffer before we put the chip to suspend state. On 2.4, I
@@ -2432,6 +2418,14 @@ static int aty128_do_resume(struct pci_dev *pdev)
         par->lock_blank = 0;
         aty128fb_blank(0, info);
 
+#ifdef CONFIG_PPC_PMAC
+        /* On powermac, we have hooks to properly suspend/resume AGP now,
+         * use them here. We'll ultimately need some generic support here,
+         * but the generic code isn't quite ready for that yet
+         */
+        pmac_resume_agp_for_card(pdev);
+#endif /* CONFIG_PPC_PMAC */
+
         pdev->dev.power.power_state = PMSG_ON;
 
         printk(KERN_DEBUG "aty128fb: resumed !\n");
diff --git a/drivers/video/aty/radeon_pm.c b/drivers/video/aty/radeon_pm.c
index 23c677e5093f..98352af39325 100644
--- a/drivers/video/aty/radeon_pm.c
+++ b/drivers/video/aty/radeon_pm.c
@@ -2520,13 +2520,10 @@ static int radeon_restore_pci_cfg(struct radeonfb_info *rinfo)
 }
 
 
-static/*extern*/ int susdisking = 0;
-
 int radeonfb_pci_suspend(struct pci_dev *pdev, pm_message_t state)
 {
         struct fb_info *info = pci_get_drvdata(pdev);
         struct radeonfb_info *rinfo = info->par;
-        u8 agp;
         int i;
 
         if (state == pdev->dev.power.power_state)
@@ -2542,11 +2539,6 @@ int radeonfb_pci_suspend(struct pci_dev *pdev, pm_message_t state)
          */
         if (state != PM_SUSPEND_MEM)
                 goto done;
-        if (susdisking) {
-                printk("radeonfb (%s): suspending to disk but state = %d\n",
-                       pci_name(pdev), state);
-                goto done;
-        }
 
         acquire_console_sem();
 
@@ -2567,27 +2559,13 @@ int radeonfb_pci_suspend(struct pci_dev *pdev, pm_message_t state)
         rinfo->lock_blank = 1;
         del_timer_sync(&rinfo->lvds_timer);
 
-        /* Disable AGP. The AGP host should have done it, but since ordering
-         * isn't always properly guaranteed in this specific case, let's make
-         * sure it's disabled on card side now. Ultimately, when merging fbdev
-         * and dri into some common infrastructure, this will be handled
-         * more nicely. The host bridge side will (or will not) be dealt with
-         * by the bridge AGP driver, we don't attempt to touch it here.
+#ifdef CONFIG_PPC_PMAC
+        /* On powermac, we have hooks to properly suspend/resume AGP now,
+         * use them here. We'll ultimately need some generic support here,
+         * but the generic code isn't quite ready for that yet
          */
-        agp = pci_find_capability(pdev, PCI_CAP_ID_AGP);
-        if (agp) {
-                u32 cmd;
-
-                pci_read_config_dword(pdev, agp + PCI_AGP_COMMAND, &cmd);
-                if (cmd & PCI_AGP_COMMAND_AGP) {
-                        printk(KERN_INFO "radeonfb (%s): AGP was enabled, "
-                               "disabling ...\n",
-                               pci_name(pdev));
-                        cmd &= ~PCI_AGP_COMMAND_AGP;
-                        pci_write_config_dword(pdev, agp + PCI_AGP_COMMAND,
-                                               cmd);
-                }
-        }
+        pmac_suspend_agp_for_card(pdev);
+#endif /* CONFIG_PPC_PMAC */
 
         /* If we support wakeup from poweroff, we save all regs we can including cfg
          * space
@@ -2699,6 +2677,15 @@ int radeonfb_pci_resume(struct pci_dev *pdev)
         rinfo->lock_blank = 0;
         radeon_screen_blank(rinfo, FB_BLANK_UNBLANK, 1);
 
+#ifdef CONFIG_PPC_PMAC
+        /* On powermac, we have hooks to properly suspend/resume AGP now,
+         * use them here. We'll ultimately need some generic support here,
+         * but the generic code isn't quite ready for that yet
+         */
+        pmac_resume_agp_for_card(pdev);
+#endif /* CONFIG_PPC_PMAC */
+
+
         /* Check status of dynclk */
         if (rinfo->dynclk == 1)
                 radeon_pm_enable_dynamic_mode(rinfo);