agp/intel: uncoditionally reconfigure driver on resume
authorDaniel Vetter <daniel.vetter@ffwll.ch>
Tue, 13 Apr 2010 22:29:53 +0000 (00:29 +0200)
committerEric Anholt <eric@anholt.net>
Mon, 19 Apr 2010 00:36:11 +0000 (17:36 -0700)
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>
drivers/char/agp/intel-agp.c

index 6a22aa9..10f72db 100644 (file)
@@ -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)