diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2010-11-05 22:23:30 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2010-11-23 20:14:46 +0000 |
| commit | 76aaf22016caa7764f40e792aaca7b4918312b22 (patch) | |
| tree | 88ba0e64ed5c970969df5d70f2ae01fe641d6722 /drivers/char | |
| parent | 93a37f20eabeea4039130527b07453038c07f471 (diff) | |
| download | kernel_samsung_aries-76aaf22016caa7764f40e792aaca7b4918312b22.zip kernel_samsung_aries-76aaf22016caa7764f40e792aaca7b4918312b22.tar.gz kernel_samsung_aries-76aaf22016caa7764f40e792aaca7b4918312b22.tar.bz2 | |
drm/i915: restore gtt on resume in the drm instead of in intel-gtt.ko
This still uses the agp functions to actually reinstate the mappings
(with a gross hack to make agp cooperate), but it wires everything
up correctly for the switchover.
The call to agp_rebind_memory can be dropped because all non-kms drivers
do all their rebinding on EnterVT.
v2: Be more paranoid and flush the chipset cache after restoring gtt
mappings.
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'drivers/char')
| -rw-r--r-- | drivers/char/agp/intel-agp.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/char/agp/intel-agp.c b/drivers/char/agp/intel-agp.c index e72f49d..07e9796 100644 --- a/drivers/char/agp/intel-agp.c +++ b/drivers/char/agp/intel-agp.c @@ -828,14 +828,9 @@ static void __devexit agp_intel_remove(struct pci_dev *pdev) static int agp_intel_resume(struct pci_dev *pdev) { struct agp_bridge_data *bridge = pci_get_drvdata(pdev); - int ret_val; bridge->driver->configure(); - ret_val = agp_rebind_memory(); - if (ret_val != 0) - return ret_val; - return 0; } #endif |