aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2010-04-13 18:29:53 -0400
committerEric Anholt <eric@anholt.net>2010-04-18 20:36:11 -0400
commite5a04d52e6fe7f3be0dad19e1180ec1e862f3a06 (patch)
tree41a08ce3086d8961f8e7f34cdcd773d93bb0d362 /drivers/char
parentf51b76621137c18501f6d21a995d36a8bcb49999 (diff)
agp/intel: uncoditionally reconfigure driver on resume
Only two drivers were not in this table (7505 and g33), both non-mobile chipsets. So they were most likely just missing. This is another step to untangle the gtt from the agp driver. Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> Signed-off-by: Eric Anholt <eric@anholt.net>
Diffstat (limited to 'drivers/char')
-rw-r--r--drivers/char/agp/intel-agp.c17
1 files changed, 1 insertions, 16 deletions
diff --git a/drivers/char/agp/intel-agp.c b/drivers/char/agp/intel-agp.c
index 6a22aa9783b8..10f72db7da02 100644
--- a/drivers/char/agp/intel-agp.c
+++ b/drivers/char/agp/intel-agp.c
@@ -935,22 +935,7 @@ static int agp_intel_resume(struct pci_dev *pdev)
935 struct agp_bridge_data *bridge = pci_get_drvdata(pdev); 935 struct agp_bridge_data *bridge = pci_get_drvdata(pdev);
936 int ret_val; 936 int ret_val;
937 937
938 if (bridge->driver == &intel_generic_driver) 938 bridge->driver->configure();
939 intel_configure();
940 else if (bridge->driver == &intel_850_driver)
941 intel_850_configure();
942 else if (bridge->driver == &intel_845_driver)
943 intel_845_configure();
944 else if (bridge->driver == &intel_830mp_driver)
945 intel_830mp_configure();
946 else if (bridge->driver == &intel_915_driver)
947 intel_i915_configure();
948 else if (bridge->driver == &intel_830_driver)
949 intel_i830_configure();
950 else if (bridge->driver == &intel_810_driver)
951 intel_i810_configure();
952 else if (bridge->driver == &intel_i965_driver)
953 intel_i915_configure();
954 939
955 ret_val = agp_rebind_memory(); 940 ret_val = agp_rebind_memory();
956 if (ret_val != 0) 941 if (ret_val != 0)