diff options
| author |   Rob Clark <robdclark@gmail.com> | 2014-10-15 15:00:47 -0400 |
|---|---|---|
| committer |   Dave Airlie <airlied@redhat.com> | 2016-01-29 10:03:44 +1000 |
| commit | 96c5d076f0a5e2023ecdb44d8261f87641ee71e0 (patch) | |
| tree | 65def3c98cce20a69dbc23c591b2e9107bf8a91b /drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | |
| parent | Merge tag 'drm-vc4-fixes-2015-01-19' of http://github.com/anholt/linux into drm-fixes (diff) | |
| download | linux-dev-96c5d076f0a5e2023ecdb44d8261f87641ee71e0.tar.xz linux-dev-96c5d076f0a5e2023ecdb44d8261f87641ee71e0.zip | |
drm/vmwgfx: respect 'nomodeset'
Signed-off-by: Rob Clark <robdclark@gmail.com>
Reviewed-by: Thomas Hellstrom <thellstrom@vmware.com>.
Cc: stable@vger.kernel.org
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to '')
| -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 c49812b80dd0..24fb348a44e1 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c @@ -25,6 +25,7 @@ * **************************************************************************/ #include <linux/module.h> +#include <linux/console.h> #include <drm/drmP.h> #include "vmwgfx_drv.h" @@ -1538,6 +1539,12 @@ static int vmw_probe(struct pci_dev *pdev, const struct pci_device_id *ent) static int __init vmwgfx_init(void) { int ret; + +#ifdef CONFIG_VGA_CONSOLE + if (vgacon_text_force()) + return -EINVAL; +#endif + ret = drm_pci_init(&driver, &vmw_pci_driver); if (ret) DRM_ERROR("Failed initializing DRM.\n"); |