[PATCH 1/2] drm/vmwgfx: allow a kconfig option to choose if fbcon is enabled
Dave Airlie
airlied at gmail.com
Mon Aug 27 20:42:43 PDT 2012
From: Dave Airlie <airlied at redhat.com>
This makes things easier for distros where we'd like to have fbcon
enabled all the time.
Signed-off-by: Dave Airlie <airlied at redhat.com>
---
drivers/gpu/drm/vmwgfx/Kconfig | 8 ++++++++
drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 2 +-
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/vmwgfx/Kconfig b/drivers/gpu/drm/vmwgfx/Kconfig
index 794ff67..b71bcd0 100644
--- a/drivers/gpu/drm/vmwgfx/Kconfig
+++ b/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.
+
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
index 4d13bf7..8b44236 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
+++ b/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 *);
--
1.7.11.4
More information about the dri-devel
mailing list