diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2010-04-14 00:29:53 +0200 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2010-04-18 17:36:11 -0700 |
| commit | e5a04d52e6fe7f3be0dad19e1180ec1e862f3a06 (patch) | |
| tree | 41a08ce3086d8961f8e7f34cdcd773d93bb0d362 /drivers/char | |
| parent | f51b76621137c18501f6d21a995d36a8bcb49999 (diff) | |
| download | linux-e5a04d52e6fe7f3be0dad19e1180ec1e862f3a06.tar.bz2 | |
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.c | 17 |
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) struct agp_bridge_data *bridge = pci_get_drvdata(pdev); int ret_val; - if (bridge->driver == &intel_generic_driver) - intel_configure(); - else if (bridge->driver == &intel_850_driver) - intel_850_configure(); - else if (bridge->driver == &intel_845_driver) - intel_845_configure(); - else if (bridge->driver == &intel_830mp_driver) - intel_830mp_configure(); - else if (bridge->driver == &intel_915_driver) - intel_i915_configure(); - else if (bridge->driver == &intel_830_driver) - intel_i830_configure(); - else if (bridge->driver == &intel_810_driver) - intel_i810_configure(); - else if (bridge->driver == &intel_i965_driver) - intel_i915_configure(); + bridge->driver->configure(); ret_val = agp_rebind_memory(); if (ret_val != 0) |