aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/i915_drv.h
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2013-10-09 03:18:51 -0400
committerDaniel Vetter <daniel.vetter@ffwll.ch>2013-10-11 17:37:23 -0400
commit4520f53a159fb81b8c27afe52428a0959aff259c (patch)
tree7c0a64208cdd71c39cfad8f7f17a3a1fe20433b3 /drivers/gpu/drm/i915/i915_drv.h
parent92b6f89f6b85f433ddac1f4a9eb0962dc96380fe (diff)
drm/i915: Kconfig option to disable the legacy fbdev support
Boots Just Fine (tm)! The only glitch seems to be that at least on Fedora the boot splash gets confused and doesn't display much at all. And since there's no ugly console flickering anymore in between, the flicker while switching between X servers (VT support is still enabled) is even more jarring. Also, I'm unsure whether we don't need to somehow kick out vgacon, now that nothing else gets in the way. But stuff seems to work, so I don't care. Also everything still works as well with VGA_CONSOLE=n Also the #ifdef mess needs a bit of a cleanup, follow-up patches will do just that. To keep the Kconfig tidy, extract all the i915 options into its own file. v2: - Rebase on top of the preliminary hw support option and the intel_drv.h cleanup. - Shut up warnings in i915_debugfs.c v3: Use the right CONFIG variable, spotted by Chon Ming. Cc: Lee, Chon Ming <chon.ming.lee@intel.com> Cc: David Herrmann <dh.herrmann@gmail.com> Reviewed-by: Chon Ming Lee <chon.ming.lee@intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_drv.h')
-rw-r--r--drivers/gpu/drm/i915/i915_drv.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 36b82cc48b4c..2ea66f23c2be 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -1368,8 +1368,10 @@ typedef struct drm_i915_private {
1368 1368
1369 struct drm_i915_gem_object *vlv_pctx; 1369 struct drm_i915_gem_object *vlv_pctx;
1370 1370
1371#ifdef CONFIG_DRM_I915_FBDEV
1371 /* list of fbdev register on this device */ 1372 /* list of fbdev register on this device */
1372 struct intel_fbdev *fbdev; 1373 struct intel_fbdev *fbdev;
1374#endif
1373 1375
1374 /* 1376 /*
1375 * The console may be contended at resume, but we don't 1377 * The console may be contended at resume, but we don't