Browse Source

drm/vmwgfx: allow a kconfig option to choose if fbcon is enabled

This makes things easier for distros where we'd like to have fbcon
enabled all the time.

Signed-off-by: Dave Airlie <airlied@redhat.com>
Dave Airlie 13 years ago
parent
commit
5d2afab958
2 changed files with 9 additions and 1 deletions
  1. 8 0
      drivers/gpu/drm/vmwgfx/Kconfig
  2. 1 1
      drivers/gpu/drm/vmwgfx/vmwgfx_drv.c

+ 8 - 0
drivers/gpu/drm/vmwgfx/Kconfig

@@ -12,3 +12,11 @@ config DRM_VMWGFX
 	  This is a KMS enabled DRM driver for the VMware SVGA2
 	  virtual hardware.
 	  The compiled module will be called "vmwgfx.ko".
+
+config DRM_VMWGFX_FBCON
+	depends on DRM_VMWGFX
+	bool "Enable framebuffer console under vmwgfx by default"
+	help
+	   Choose this option if you are shipping a new vmwgfx
+	   userspace driver that supports using the kernel driver.
+

+ 1 - 1
drivers/gpu/drm/vmwgfx/vmwgfx_drv.c

@@ -183,7 +183,7 @@ static struct pci_device_id vmw_pci_id_list[] = {
 	{0, 0, 0}
 };
 
-static int enable_fbdev;
+static int enable_fbdev = IS_ENABLED(CONFIG_DRM_VMWGFX_FBCON);
 
 static int vmw_probe(struct pci_dev *, const struct pci_device_id *);
 static void vmw_master_init(struct vmw_master *);