diff options
| author |   Dave Airlie <airlied@redhat.com> | 2013-10-11 15:11:52 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2013-10-11 15:19:10 +1000 |
| commit | e1264ebe9ff48e1b3e1dd11805eec9f5b143ab7c (patch) | |
| tree | 1bc0ecad91913306a35009434509d749c5d826ff /drivers/gpu/drm/i915/intel_drv.h | |
| parent | Merge branch 'drm-fixes-3.12' of git://people.freedesktop.org/~agd5f/linux into drm-fixes (diff) | |
| download | linux-dev-e1264ebe9ff48e1b3e1dd11805eec9f5b143ab7c.tar.xz linux-dev-e1264ebe9ff48e1b3e1dd11805eec9f5b143ab7c.zip | |
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>
Diffstat (limited to '')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_drv.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h index 28cae80495e2..9b7b68fd5d47 100644 --- a/drivers/gpu/drm/i915/intel_drv.h +++ b/drivers/gpu/drm/i915/intel_drv.h @@ -793,6 +793,5 @@ extern void hsw_pc8_disable_interrupts(struct drm_device *dev); extern void hsw_pc8_restore_interrupts(struct drm_device *dev); extern void intel_aux_display_runtime_get(struct drm_i915_private *dev_priv); extern void intel_aux_display_runtime_put(struct drm_i915_private *dev_priv); -extern void i915_disable_vga_mem(struct drm_device *dev); #endif /* __INTEL_DRV_H__ */ |