diff options
| author |   Marcin Slusarz <marcin.slusarz@gmail.com> | 2013-02-04 21:52:54 +0100 |
|---|---|---|
| committer |   Ben Skeggs <bskeggs@redhat.com> | 2013-02-09 10:12:21 +1000 |
| commit | 5f97ab913cf0fbc378ea8ffc3ee66f4890d11c55 (patch) | |
| tree | 1f3341522f74292c1890a93b368fc9c94d5a726d /drivers/gpu/drm/nouveau/core/core/subdev.c | |
| parent | drm/nv50/fb: Fix nullptr-deref on IGPs (diff) | |
| download | linux-dev-5f97ab913cf0fbc378ea8ffc3ee66f4890d11c55.tar.xz linux-dev-5f97ab913cf0fbc378ea8ffc3ee66f4890d11c55.zip | |
drm/nouveau: add lockdep annotations
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>
Cc: stable@vger.kernel.org [3.7, but needs s/const ofuncs/ofuncs/ to build]
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/core/core/subdev.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/core/core/subdev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/core/core/subdev.c b/drivers/gpu/drm/nouveau/core/core/subdev.c index f74c30aa33a0..48f06378d3f9 100644 --- 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_object *parent, if (ret) return ret; - mutex_init(&subdev->mutex); + __mutex_init(&subdev->mutex, subname, &oclass->lock_class_key); subdev->name = subname; if (parent) { |