Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e5a04d52 authored by Daniel Vetter's avatar Daniel Vetter Committed by Eric Anholt
Browse files

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: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: default avatarEric Anholt <eric@anholt.net>
parent f51b7662

drivers/char/agp/intel-agp.c

+1 −16
Original line number Diff line number Diff line
@@ -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)