]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
drm/nvc0/fb: fix crash when different mutex is used to protect same list
authorAleksi Torhamo <aleksi@torhamo.net>
Wed, 9 Jan 2013 18:08:48 +0000 (20:08 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 17 Jan 2013 16:46:38 +0000 (08:46 -0800)
commit39c5cda91b2d77399030ea038626c85fac182f89
tree46f1880120474f62c3781d992ab423f02ed4ec15
parentc6f94c3c86878b82463a2f94998ff0c54bc68025
drm/nvc0/fb: fix crash when different mutex is used to protect same list

commit 43f789792e2c7ea2bff37195e4c4b4239e9e02b7 upstream.

Fixes regression introduced in commit 861d2107
"drm/nouveau/fb: merge fb/vram and port to subdev interfaces"

nv50_fb_vram_{new,del} functions were changed to use
nouveau_subdev->mutex instead of the old nouveau_mm->mutex.
nvc0_fb_vram_new still uses the nouveau_mm->mutex, but nvc0 doesn't
have its own fb_vram_del function, using nv50_fb_vram_del instead.
Because of this, on nvc0 a different mutex ends up being used to protect
additions and deletions to the same list.

This patch is a -stable candidate for 3.7.

Signed-off-by: Aleksi Torhamo <aleksi@torhamo.net>
Reported-by: Roy Spliet <r.spliet@student.tudelft.nl>
Tested-by: Roy Spliet <r.spliet@student.tudelft.nl>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/gpu/drm/nouveau/core/subdev/fb/nvc0.c