Revert "drm/i915: Delay disabling of VGA memory until vgacon->fbcon handoff is done"
authorDave Airlie <airlied@redhat.com>
Fri, 11 Oct 2013 05:11:52 +0000 (15:11 +1000)
committerDave Airlie <airlied@redhat.com>
Fri, 11 Oct 2013 05:19:10 +0000 (15:19 +1000)
commite1264ebe9ff48e1b3e1dd11805eec9f5b143ab7c
tree1bc0ecad91913306a35009434509d749c5d826ff
parent2302628550ad97ce3281124343816b141da22887
Revert "drm/i915: Delay disabling of VGA memory until vgacon->fbcon handoff is done"

This reverts commit 6e1b4fdad5157bb9e88777d525704aba24389bee.

This is part of a revert due to a userspace breakage, better explained in the revert of 1a1a4cbf4906a13c0c377f708df5d94168e7b582.

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Dave Airlie <airlied@redhat.com>
drivers/gpu/drm/i915/i915_dma.c
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/i915/intel_drv.h