3.16-stable patches

added patches:
	drm-nouveau-bump-version-from-1.1.1-to-1.1.2.patch

diff --git a/queue-3.16/drm-nouveau-bump-version-from-1.1.1-to-1.1.2.patch b/queue-3.16/drm-nouveau-bump-version-from-1.1.1-to-1.1.2.patch
new file mode 100644 (file)
index 0000000..0e7585f
--- /dev/null
+++ b/queue-3.16/drm-nouveau-bump-version-from-1.1.1-to-1.1.2.patch
@@ -0,0 +1,49 @@
+From 7820e5eef0faa4a5e10834296680827f7ce78a89 Mon Sep 17 00:00:00 2001
+From: Mario Kleiner <mario.kleiner.de@gmail.com>
+Date: Wed, 6 Aug 2014 06:09:44 +0200
+Subject: drm/nouveau: Bump version from 1.1.1 to 1.1.2
+
+From: Mario Kleiner <mario.kleiner.de@gmail.com>
+
+commit 7820e5eef0faa4a5e10834296680827f7ce78a89 upstream.
+
+Linux 3.16 fixed multiple bugs in kms pageflip completion events
+and timestamping, which were originally introduced in Linux 3.13.
+
+These fixes have been backported to all stable kernels since 3.13.
+
+However, the userspace nouveau-ddx needs to be aware if it is
+running on a kernel on which these bugs are fixed, or not.
+
+Bump the patchlevel of the drm driver version to signal this,
+so backporting this patch to stable 3.13+ kernels will give the
+ddx the required info.
+
+Signed-off-by: Mario Kleiner <mario.kleiner.de@gmail.com>
+Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/gpu/drm/nouveau/nouveau_drm.h |    4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+--- a/drivers/gpu/drm/nouveau/nouveau_drm.h
++++ b/drivers/gpu/drm/nouveau/nouveau_drm.h
+@@ -10,7 +10,7 @@
+ 
+ #define DRIVER_MAJOR          1
+ #define DRIVER_MINOR          1
+-#define DRIVER_PATCHLEVEL     1
++#define DRIVER_PATCHLEVEL     2
+ 
+ /*
+  * 1.1.1:
+@@ -21,6 +21,8 @@
+  *        to control registers on the MPs to enable performance counters,
+  *        and to control the warp error enable mask (OpenGL requires out of
+  *        bounds access to local memory to be silently ignored / return 0).
++ * 1.1.2:
++ *      - fixes multiple bugs in flip completion events and timestamping
+  */
+ 
+ #include <core/client.h>

diff --git a/queue-3.16/series b/queue-3.16/series
index 740b7653ae39672757efd3c09b3d0d385ab4432b..3a25fde6ff0cad0dd00bc3acb787eca3326beb04 100644 (file)
--- a/queue-3.16/series
+++ b/queue-3.16/series
@@ -151,3 +151,4 @@ blkcg-don-t-call-into-policy-draining-if-root_blkg-is-already-gone.patch
 dm-table-propagate-queue_flag_no_sg_merge.patch
 ib-srp-fix-deadlock-between-host-removal-and-multipathd.patch
 drm-nouveau-dis-enable-vblank-irqs-during-suspend-resume.patch
+drm-nouveau-bump-version-from-1.1.1-to-1.1.2.patch