Commit 96c5d076 authored by Rob Clark's avatar Rob Clark Committed by Dave Airlie

drm/vmwgfx: respect 'nomodeset'

Signed-off-by: default avatarRob Clark <robdclark@gmail.com>
Reviewed-by: Thomas Hellstrom <thellstrom@vmware.com>.
Cc: stable@vger.kernel.org
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 2ad14a6c
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
* *
**************************************************************************/ **************************************************************************/
#include <linux/module.h> #include <linux/module.h>
#include <linux/console.h>
#include <drm/drmP.h> #include <drm/drmP.h>
#include "vmwgfx_drv.h" #include "vmwgfx_drv.h"
...@@ -1538,6 +1539,12 @@ static int vmw_probe(struct pci_dev *pdev, const struct pci_device_id *ent) ...@@ -1538,6 +1539,12 @@ static int vmw_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
static int __init vmwgfx_init(void) static int __init vmwgfx_init(void)
{ {
int ret; int ret;
#ifdef CONFIG_VGA_CONSOLE
if (vgacon_text_force())
return -EINVAL;
#endif
ret = drm_pci_init(&driver, &vmw_pci_driver); ret = drm_pci_init(&driver, &vmw_pci_driver);
if (ret) if (ret)
DRM_ERROR("Failed initializing DRM.\n"); DRM_ERROR("Failed initializing DRM.\n");
......
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