diff options
Diffstat (limited to 'drivers/gpu/drm/vmwgfx/vmwgfx_drv.c')
-rw-r--r-- | drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c index b68fb182f25..fd33d74c936 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | |||
@@ -25,6 +25,7 @@ | |||
25 | * | 25 | * |
26 | **************************************************************************/ | 26 | **************************************************************************/ |
27 | #include <linux/module.h> | 27 | #include <linux/module.h> |
28 | #include <linux/console.h> | ||
28 | 29 | ||
29 | #include <drm/drmP.h> | 30 | #include <drm/drmP.h> |
30 | #include "vmwgfx_drv.h" | 31 | #include "vmwgfx_drv.h" |
@@ -1383,6 +1384,12 @@ static int vmw_probe(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
1383 | static int __init vmwgfx_init(void) | 1384 | static int __init vmwgfx_init(void) |
1384 | { | 1385 | { |
1385 | int ret; | 1386 | int ret; |
1387 | |||
1388 | #ifdef CONFIG_VGA_CONSOLE | ||
1389 | if (vgacon_text_force()) | ||
1390 | return -EINVAL; | ||
1391 | #endif | ||
1392 | |||
1386 | ret = drm_pci_init(&driver, &vmw_pci_driver); | 1393 | ret = drm_pci_init(&driver, &vmw_pci_driver); |
1387 | if (ret) | 1394 | if (ret) |
1388 | DRM_ERROR("Failed initializing DRM.\n"); | 1395 | DRM_ERROR("Failed initializing DRM.\n"); |