Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

drm/vmwgfx: respect 'nomodeset' 



Signed-off-by: default avatarRob Clark <robdclark@gmail.com>
Reviewed-by: default avatarThomas Hellstrom <thellstrom@vmware.com&gt;.>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 2ad14a6c

drivers/gpu/drm/vmwgfx/vmwgfx_drv.c

+7 −0
Original line number Diff line number Diff line
@@ -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");