Commit eb89c6d4 authored by Dave Jones's avatar Dave Jones Committed by Dave Jones

[AGPGART] Improve the resume functions for Intel AGP bridges by restoring config space

(the bios might not have done that).

From: Arjan van de Ven
parent 595558b0
...@@ -1445,15 +1445,12 @@ static void __devexit agp_intel_remove(struct pci_dev *pdev) ...@@ -1445,15 +1445,12 @@ static void __devexit agp_intel_remove(struct pci_dev *pdev)
agp_put_bridge(bridge); agp_put_bridge(bridge);
} }
static int agp_intel_suspend(struct pci_dev *dev, u32 state)
{
return 0;
}
static int agp_intel_resume(struct pci_dev *pdev) static int agp_intel_resume(struct pci_dev *pdev)
{ {
struct agp_bridge_data *bridge = pci_get_drvdata(pdev); struct agp_bridge_data *bridge = pci_get_drvdata(pdev);
pci_restore_state(pdev, pdev->saved_config_space);
if (bridge->driver == &intel_generic_driver) if (bridge->driver == &intel_generic_driver)
intel_configure(); intel_configure();
else if (bridge->driver == &intel_845_driver) else if (bridge->driver == &intel_845_driver)
...@@ -1506,7 +1503,6 @@ static struct pci_driver agp_intel_pci_driver = { ...@@ -1506,7 +1503,6 @@ static struct pci_driver agp_intel_pci_driver = {
.id_table = agp_intel_pci_table, .id_table = agp_intel_pci_table,
.probe = agp_intel_probe, .probe = agp_intel_probe,
.remove = agp_intel_remove, .remove = agp_intel_remove,
.suspend = agp_intel_suspend,
.resume = agp_intel_resume, .resume = agp_intel_resume,
}; };
......
...@@ -569,15 +569,12 @@ static void __devexit agp_intelmch_remove(struct pci_dev *pdev) ...@@ -569,15 +569,12 @@ static void __devexit agp_intelmch_remove(struct pci_dev *pdev)
agp_put_bridge(bridge); agp_put_bridge(bridge);
} }
static int agp_intelmch_suspend(struct pci_dev *dev, u32 state)
{
return 0;
}
static int agp_intelmch_resume(struct pci_dev *pdev) static int agp_intelmch_resume(struct pci_dev *pdev)
{ {
struct agp_bridge_data *bridge = pci_get_drvdata(pdev); struct agp_bridge_data *bridge = pci_get_drvdata(pdev);
pci_restore_state(pdev, pdev->saved_config_space);
if (bridge->driver == &intel_845_driver) if (bridge->driver == &intel_845_driver)
intel_845_configure(); intel_845_configure();
...@@ -611,7 +608,6 @@ static struct pci_driver agp_intelmch_pci_driver = { ...@@ -611,7 +608,6 @@ static struct pci_driver agp_intelmch_pci_driver = {
.id_table = agp_intelmch_pci_table, .id_table = agp_intelmch_pci_table,
.probe = agp_intelmch_probe, .probe = agp_intelmch_probe,
.remove = agp_intelmch_remove, .remove = agp_intelmch_remove,
.suspend = agp_intelmch_suspend,
.resume = agp_intelmch_resume, .resume = agp_intelmch_resume,
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment