aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char/agp
diff options
context:
space:
mode:
authorStuart Bennett <sb476@cam.ac.uk>2008-01-08 13:14:07 +0000
committerDave Airlie <airlied@linux.ie>2008-02-19 14:44:40 +1000
commit16469a0ea0f6b7562eac98ebb8a7c41ce902d0b1 (patch)
tree7164bb8c984b99d3edea1411d24d472d8c61bb39 /drivers/char/agp
parentagp/sis: Clear bit 2 from aperture size byte as well (diff)
downloadlinux-dev-16469a0ea0f6b7562eac98ebb8a7c41ce902d0b1.tar.xz
linux-dev-16469a0ea0f6b7562eac98ebb8a7c41ce902d0b1.zip
agp/sis: Suspend support for SiS AGP
Tested on M650 chipset Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/char/agp')
-rw-r--r--drivers/char/agp/sis-agp.c24
1 files changed, 24 insertions, 0 deletions
diff --git a/drivers/char/agp/sis-agp.c b/drivers/char/agp/sis-agp.c
index aaa1883f076c..6cf54fe60207 100644
--- a/drivers/char/agp/sis-agp.c
+++ b/drivers/char/agp/sis-agp.c
@@ -214,6 +214,26 @@ static void __devexit agp_sis_remove(struct pci_dev *pdev)
agp_put_bridge(bridge);
}
+#ifdef CONFIG_PM
+
+static int agp_sis_suspend(struct pci_dev *pdev, pm_message_t state)
+{
+ pci_save_state(pdev);
+ pci_set_power_state(pdev, pci_choose_state(pdev, state));
+
+ return 0;
+}
+
+static int agp_sis_resume(struct pci_dev *pdev)
+{
+ pci_set_power_state(pdev, PCI_D0);
+ pci_restore_state(pdev);
+
+ return sis_driver.configure();
+}
+
+#endif /* CONFIG_PM */
+
static struct pci_device_id agp_sis_pci_table[] = {
{
.class = (PCI_CLASS_BRIDGE_HOST << 8),
@@ -393,6 +413,10 @@ static struct pci_driver agp_sis_pci_driver = {
.id_table = agp_sis_pci_table,
.probe = agp_sis_probe,
.remove = agp_sis_remove,
+#ifdef CONFIG_PM
+ .suspend = agp_sis_suspend,
+ .resume = agp_sis_resume,
+#endif
};
static int __init agp_sis_init(void)