Commit 1acf5661 authored by Max Staudt's avatar Max Staudt Committed by Gerd Hoffmann

drm/bochs: Implement nomodeset

Up until now, the bochsdrm driver didn't handle the nomodeset option
at boot, and didn't provide a "modeset" module option either.

This patch implements both.

The new parameter can be used by specifying bochs-drm.modeset=0
at boot time.
Signed-off-by: default avatarMax Staudt <mstaudt@suse.de>
Link: http://patchwork.freedesktop.org/patch/msgid/1484763012-17783-1-git-send-email-mstaudt@suse.de
Cc: Gerd Hoffmann <kraxel@redhat.com>
Cc: David Airlie <airlied@gmail.com>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: dri-devel@lists.freedesktop.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
parent 4078f575
...@@ -12,6 +12,10 @@ ...@@ -12,6 +12,10 @@
#include "bochs.h" #include "bochs.h"
static int bochs_modeset = -1;
module_param_named(modeset, bochs_modeset, int, 0444);
MODULE_PARM_DESC(modeset, "enable/disable kernel modesetting");
static bool enable_fbdev = true; static bool enable_fbdev = true;
module_param_named(fbdev, enable_fbdev, bool, 0444); module_param_named(fbdev, enable_fbdev, bool, 0444);
MODULE_PARM_DESC(fbdev, "register fbdev device"); MODULE_PARM_DESC(fbdev, "register fbdev device");
...@@ -214,6 +218,12 @@ static struct pci_driver bochs_pci_driver = { ...@@ -214,6 +218,12 @@ static struct pci_driver bochs_pci_driver = {
static int __init bochs_init(void) static int __init bochs_init(void)
{ {
if (vgacon_text_force() && bochs_modeset == -1)
return -EINVAL;
if (bochs_modeset == 0)
return -EINVAL;
return drm_pci_init(&bochs_driver, &bochs_pci_driver); return drm_pci_init(&bochs_driver, &bochs_pci_driver);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment