drm/i915: Fixup global gtt cleanup
authorDaniel Vetter <daniel.vetter@ffwll.ch>
Thu, 5 Jun 2014 14:22:16 +0000 (16:22 +0200)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Fri, 6 Jun 2014 20:19:54 +0000 (22:19 +0200)
The global gtt is setup up in 2 parts, so we need to be careful
with the cleanup. For consistency shovel it all into the ->cleanup
callback, like with ppgtt.

Noticed because it blew up in the out_gtt: cleanup code while
fiddling with the vgacon code.

Reviewed-by: Imre Deak <imre.deak@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
drivers/gpu/drm/i915/i915_dma.c
drivers/gpu/drm/i915/i915_gem_gtt.c

Simple merge
Simple merge