From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Tue, 1 Mar 2016 19:21:30 +0000 (-0800)
Subject: 3.14-stable patches
X-Git-Tag: v3.10.99~28
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c1ecf2eab169c3bbbee09cd4f8d2791504110300;p=thirdparty%2Fkernel%2Fstable-queue.git

3.14-stable patches

added patches:
	drm-vmwgfx-respect-nomodeset.patch
---

diff --git a/queue-3.14/drm-vmwgfx-respect-nomodeset.patch b/queue-3.14/drm-vmwgfx-respect-nomodeset.patch
new file mode 100644
index 00000000000..e420b6fcbfc
--- /dev/null
+++ b/queue-3.14/drm-vmwgfx-respect-nomodeset.patch
@@ -0,0 +1,41 @@
+From 96c5d076f0a5e2023ecdb44d8261f87641ee71e0 Mon Sep 17 00:00:00 2001
+From: Rob Clark <robdclark@gmail.com>
+Date: Wed, 15 Oct 2014 15:00:47 -0400
+Subject: drm/vmwgfx: respect 'nomodeset'
+
+From: Rob Clark <robdclark@gmail.com>
+
+commit 96c5d076f0a5e2023ecdb44d8261f87641ee71e0 upstream.
+
+Signed-off-by: Rob Clark <robdclark@gmail.com>
+Reviewed-by: Thomas Hellstrom <thellstrom@vmware.com>.
+Signed-off-by: Dave Airlie <airlied@redhat.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/gpu/drm/vmwgfx/vmwgfx_drv.c |    7 +++++++
+ 1 file changed, 7 insertions(+)
+
+--- 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"
+@@ -1383,6 +1384,12 @@ static int vmw_probe(struct pci_dev *pde
+ 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");
diff --git a/queue-3.14/series b/queue-3.14/series
index 079c7102512..c2fbfa4410f 100644
--- a/queue-3.14/series
+++ b/queue-3.14/series
@@ -103,3 +103,4 @@ mmc-mmci-fix-an-ages-old-detection-error.patch
 cputime-prevent-32bit-overflow-in-time_to_cputime.patch
 edac-robustify-workqueues-destruction.patch
 sparc64-fix-incorrect-sign-extension-in-sys_sparc64_personality.patch
+drm-vmwgfx-respect-nomodeset.patch