From c14496e65d52390f31a10ebd39dba715177fd4af Mon Sep 17 00:00:00 2001
From: Stuart Bennett <sb476@cam.ac.uk>
Date: Tue, 8 Jan 2008 13:14:07 +0000
Subject: [PATCH] --- yaml --- r: 86012 b: refs/heads/master c:
 16469a0ea0f6b7562eac98ebb8a7c41ce902d0b1 h: refs/heads/master v: v3

---
 [refs]                           |  2 +-
 trunk/drivers/char/agp/sis-agp.c | 24 ++++++++++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 6247e3174662..aaf968e9ec80 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b7d0640f9229a9426ba9223796329c4f0cc4acb9
+refs/heads/master: 16469a0ea0f6b7562eac98ebb8a7c41ce902d0b1
diff --git a/trunk/drivers/char/agp/sis-agp.c b/trunk/drivers/char/agp/sis-agp.c
index aaa1883f076c..6cf54fe60207 100644
--- a/trunk/drivers/char/agp/sis-agp.c
+++ b/trunk/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)