Merge remote-tracking branch 'drm-intel/topic/kicking-dogs-and-vgacon' into drm-intel-fixes

Browse source

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>

...

This commit is contained in:

Jani Nikula 2014-06-11 11:14:08 +03:00

parent 329ff963fd a4de05268e

commit ce9557b9fe

5 changed files with 66 additions and 16 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

47

drivers/gpu/drm/i915/i915_dma.c

View file

9

drivers/gpu/drm/i915/i915_gem_gtt.c

View file

24

drivers/tty/vt/vt.c

View file

1

drivers/video/console/dummycon.c

View file

1

drivers/video/console/vgacon.c

View file