3.7-stable patches

added patches:
	drm-nouveau-add-lockdep-annotations.patch

diff --git a/queue-3.7/drm-nouveau-add-lockdep-annotations.patch b/queue-3.7/drm-nouveau-add-lockdep-annotations.patch
new file mode 100644 (file)
index 0000000..448d15a
--- /dev/null
+++ b/queue-3.7/drm-nouveau-add-lockdep-annotations.patch
@@ -0,0 +1,77 @@
+From 5f97ab913cf0fbc378ea8ffc3ee66f4890d11c55 Mon Sep 17 00:00:00 2001
+From: Marcin Slusarz <marcin.slusarz@gmail.com>
+Date: Mon, 4 Feb 2013 21:52:54 +0100
+Subject: drm/nouveau: add lockdep annotations
+
+From: Marcin Slusarz <marcin.slusarz@gmail.com>
+
+commit 5f97ab913cf0fbc378ea8ffc3ee66f4890d11c55 upstream.
+
+1) Lockdep thinks all nouveau subdevs belong to the same class and can be
+locked in arbitrary order, which is not true (at least in general case).
+Tell it to distinguish subdevs by (o)class type.
+2) DRM client can be locked under user client lock - tell lockdep to put
+DRM client lock in a separate class.
+
+Reported-by: Arend van Spriel <arend@broadcom.com>
+Reported-by: Peter Hurley <peter@hurleysoftware.com>
+Reported-by: Maarten Lankhorst <maarten.lankhorst@canonical.com>
+Reported-by: Daniel J Blueman <daniel@quora.org>
+Signed-off-by: Marcin Slusarz <marcin.slusarz@gmail.com>
+Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/gpu/drm/nouveau/core/core/subdev.c         |    2 +-
+ drivers/gpu/drm/nouveau/core/include/core/object.h |    7 +++++--
+ drivers/gpu/drm/nouveau/nouveau_drm.c              |    3 +++
+ 3 files changed, 9 insertions(+), 3 deletions(-)
+
+--- a/drivers/gpu/drm/nouveau/core/core/subdev.c
++++ b/drivers/gpu/drm/nouveau/core/core/subdev.c
+@@ -99,7 +99,7 @@ nouveau_subdev_create_(struct nouveau_ob
+       if (ret)
+               return ret;
+ 
+-      mutex_init(&subdev->mutex);
++      __mutex_init(&subdev->mutex, subname, &oclass->lock_class_key);
+       subdev->name = subname;
+ 
+       if (parent) {
+--- a/drivers/gpu/drm/nouveau/core/include/core/object.h
++++ b/drivers/gpu/drm/nouveau/core/include/core/object.h
+@@ -50,10 +50,13 @@ int  nouveau_object_fini(struct nouveau_
+ 
+ extern struct nouveau_ofuncs nouveau_object_ofuncs;
+ 
++/* Don't allocate dynamically, because lockdep needs lock_class_keys to be in
++ * ".data". */
+ struct nouveau_oclass {
+       u32 handle;
+-      struct nouveau_ofuncs *ofuncs;
+-      struct nouveau_omthds *omthds;
++      struct nouveau_ofuncs * ofuncs;
++      struct nouveau_omthds * const omthds;
++      struct lock_class_key lock_class_key;
+ };
+ 
+ #define nv_oclass(o)    nv_object(o)->oclass
+--- a/drivers/gpu/drm/nouveau/nouveau_drm.c
++++ b/drivers/gpu/drm/nouveau/nouveau_drm.c
+@@ -241,6 +241,8 @@ nouveau_drm_probe(struct pci_dev *pdev,
+       return 0;
+ }
+ 
++static struct lock_class_key drm_client_lock_class_key;
++
+ static int
+ nouveau_drm_load(struct drm_device *dev, unsigned long flags)
+ {
+@@ -252,6 +254,7 @@ nouveau_drm_load(struct drm_device *dev,
+       ret = nouveau_cli_create(pdev, "DRM", sizeof(*drm), (void**)&drm);
+       if (ret)
+               return ret;
++      lockdep_set_class(&drm->client.mutex, &drm_client_lock_class_key);
+ 
+       dev->dev_private = drm;
+       drm->dev = dev;

diff --git a/queue-3.7/series b/queue-3.7/series
index 4ee59152555468bfaffb65bb50183e9422dd76a8..33ae70fbee9da538484f50c2fc7bc2af19176190 100644 (file)
--- a/queue-3.7/series
+++ b/queue-3.7/series
@@ -58,3 +58,4 @@ tcp-splice-fix-an-infinite-loop-in-tcp_read_sock.patch
 tcp-fix-splice-and-tcp-collapsing-interaction.patch
 net-splice-avoid-high-order-page-splitting.patch
 net-splice-fix-__splice_segment.patch
+drm-nouveau-add-lockdep-annotations.patch