Merge remote-tracking branch 'drm-intel/topic/kicking-dogs-and-vgacon' into drm-intel...
authorJani Nikula <jani.nikula@intel.com>
Wed, 11 Jun 2014 08:14:08 +0000 (11:14 +0300)
committerJani Nikula <jani.nikula@intel.com>
Wed, 11 Jun 2014 08:38:41 +0000 (11:38 +0300)
commitce9557b9fe17012dea2447e643a1047c27a00838
treeb0ba245c242cd07406ee729f14c0f02691a5599b
parent329ff963fd4c1356af66b878b11460388cb5f5dd
parenta4de05268e674e8ed31df6348269e22d6c6a1803
Merge remote-tracking branch 'drm-intel/topic/kicking-dogs-and-vgacon' into drm-intel-fixes

vt/vgacon fixes to avoid hangs, unclaimed register errors on module
load, reload:

vt: Fix replacement console check when unbinding
vt: Fix up unregistration of vt drivers
vt: Don't ignore unbind errors in vt_unbind
drm/i915: Fixup global gtt cleanup
drm/i915: Kick out vga console

Link: http://lkml.kernel.org/r/1401980308-5116-1-git-send-email-daniel.vetter@ffwll.ch
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
drivers/gpu/drm/i915/i915_dma.c
drivers/gpu/drm/i915/i915_gem_gtt.c