summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorMario Kleiner <mario.kleiner.de@gmail.com>2014-08-06 06:09:44 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-09-17 09:19:28 -0700
commitd7fbe53dbb070277d3fc389924dbdf0ab38ff345 (patch)
tree3d966e3e6668ecf2233ba211c1af3e06b64e3971 /drivers
parent45a317f0809cbbcbb9ff71637175b830050da228 (diff)
downloadkernel-common-d7fbe53dbb070277d3fc389924dbdf0ab38ff345.tar.gz
kernel-common-d7fbe53dbb070277d3fc389924dbdf0ab38ff345.tar.bz2
kernel-common-d7fbe53dbb070277d3fc389924dbdf0ab38ff345.zip
drm/nouveau: Bump version from 1.1.1 to 1.1.2
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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpu/drm/nouveau/nouveau_drm.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.h b/drivers/gpu/drm/nouveau/nouveau_drm.h
index 23ca7a517246..74ed08a750f4 100644
--- 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>