diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2010-11-05 17:23:30 -0400 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2010-11-23 15:14:46 -0500 |
| commit | 76aaf22016caa7764f40e792aaca7b4918312b22 (patch) | |
| tree | 88ba0e64ed5c970969df5d70f2ae01fe641d6722 /drivers/gpu/drm/i915/Makefile | |
| parent | 93a37f20eabeea4039130527b07453038c07f471 (diff) | |
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/gpu/drm/i915/Makefile')
| -rw-r--r-- | drivers/gpu/drm/i915/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile index fdc833d5cc7b..b3cdb4fe46e0 100644 --- a/drivers/gpu/drm/i915/Makefile +++ b/drivers/gpu/drm/i915/Makefile | |||
| @@ -8,6 +8,7 @@ i915-y := i915_drv.o i915_dma.o i915_irq.o i915_mem.o \ | |||
| 8 | i915_suspend.o \ | 8 | i915_suspend.o \ |
| 9 | i915_gem.o \ | 9 | i915_gem.o \ |
| 10 | i915_gem_debug.o \ | 10 | i915_gem_debug.o \ |
| 11 | i915_gem_gtt.o \ | ||
| 11 | i915_gem_evict.o \ | 12 | i915_gem_evict.o \ |
| 12 | i915_gem_tiling.o \ | 13 | i915_gem_tiling.o \ |
| 13 | i915_trace_points.o \ | 14 | i915_trace_points.o \ |