vserver 1.9.3

[linux-2.6.git] / drivers / char / agp / via-agp.c

diff --git a/drivers/char/agp/via-agp.c b/drivers/char/agp/via-agp.c
index 2f5c50c..bcaea8e 100644 (file)
--- a/drivers/char/agp/via-agp.c
+++ b/drivers/char/agp/via-agp.c
@@ -348,6 +348,21 @@ static struct agp_device_ids via_agp_device_ids[] __devinitdata =
                .device_id      = PCI_DEVICE_ID_VIA_PX8X0_0,
                .chipset_name   = "PM800/PN800/PM880/PN880",
        },
+       /* KT880 */
+       {
+               .device_id      = PCI_DEVICE_ID_VIA_3269_0,
+               .chipset_name   = "KT880",
+       },
+       /* KTxxx/Px8xx */
+       {
+               .device_id      = PCI_DEVICE_ID_VIA_83_87XX_1,
+               .chipset_name   = "VT83xx/VT87xx/KTxxx/Px8xx",
+       },
+       /* P4M800 */
+       {
+               .device_id      = PCI_DEVICE_ID_VIA_3296_0,
+               .chipset_name   = "P4M800",
+       },
 
        { }, /* dummy final entry, always present */
 };
@@ -423,6 +438,33 @@ static void __devexit agp_via_remove(struct pci_dev *pdev)
        agp_put_bridge(bridge);
 }
 
+#ifdef CONFIG_PM
+
+static int agp_via_suspend(struct pci_dev *pdev, u32 state)
+{
+       pci_save_state (pdev, pdev->saved_config_space);
+       pci_set_power_state (pdev, 3);
+
+       return 0;
+}
+
+static int agp_via_resume(struct pci_dev *pdev)
+{
+       struct agp_bridge_data *bridge = pci_get_drvdata(pdev);
+
+       pci_set_power_state (pdev, 0);
+       pci_restore_state(pdev, pdev->saved_config_space);
+
+       if (bridge->driver == &via_agp3_driver)
+               return via_configure_agp3();
+       else if (bridge->driver == &via_driver)
+               return via_configure();
+
+       return 0;
+}
+
+#endif /* CONFIG_PM */
+
 /* must be the same order as name table above */
 static struct pci_device_id agp_via_pci_table[] = {
 #define ID(x) \
@@ -434,6 +476,7 @@ static struct pci_device_id agp_via_pci_table[] = {
        .subvendor      = PCI_ANY_ID,                   \
        .subdevice      = PCI_ANY_ID,                   \
        }
+       ID(PCI_DEVICE_ID_VIA_82C597_0),
        ID(PCI_DEVICE_ID_VIA_82C598_0),
        ID(PCI_DEVICE_ID_VIA_8501_0),
        ID(PCI_DEVICE_ID_VIA_8601_0),
@@ -456,7 +499,10 @@ static struct pci_device_id agp_via_pci_table[] = {
        ID(PCI_DEVICE_ID_VIA_8378_0),
        ID(PCI_DEVICE_ID_VIA_PT880),
        ID(PCI_DEVICE_ID_VIA_8783_0),
-       ID(PCI_DEVICE_ID_VIA_PX8X0_0),  
+       ID(PCI_DEVICE_ID_VIA_PX8X0_0),
+       ID(PCI_DEVICE_ID_VIA_3269_0),
+       ID(PCI_DEVICE_ID_VIA_83_87XX_1),
+       ID(PCI_DEVICE_ID_VIA_3296_0),
        { }
 };
 
@@ -468,6 +514,10 @@ static struct pci_driver agp_via_pci_driver = {
        .id_table       = agp_via_pci_table,
        .probe          = agp_via_probe,
        .remove         = agp_via_remove,
+#ifdef CONFIG_PM
+       .suspend        = agp_via_suspend,
+       .resume         = agp_via_resume,
+#endif
 };
 
 
@@ -484,5 +534,5 @@ static void __exit agp_via_cleanup(void)
 module_init(agp_via_init);
 module_exit(agp_via_cleanup);
 
-MODULE_LICENSE("GPL and additional rights");
+MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Dave Jones <davej@codemonkey.org.uk>");