]> git.baikalelectronics.ru Git - kernel.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)
committerBen Skeggs <bskeggs@redhat.com>
Sun, 13 Jan 2013 08:07:46 +0000 (18:07 +1000)
commit3d140ba23453a6bc569344803a355dbfad65216d
tree9f8dfb6f8d727b231f573483c15db30232c16b47
parent27d52d75ef0ce4426f563af6e70820c0b60e1841
drm/nvc0/fb: fix crash when different mutex is used to protect same list

Fixes regression introduced in commit 0b7964ea
"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>
Cc: stable@vger.kernel.org
drivers/gpu/drm/nouveau/core/subdev/fb/nvc0.c