drm/nouveau: Add a separate class for the kernel channel mutex.
authorFrancisco Jerez <currojerez@riseup.net>
Mon, 25 Oct 2010 21:38:59 +0000 (23:38 +0200)
committerBen Skeggs <bskeggs@redhat.com>
Fri, 3 Dec 2010 05:11:18 +0000 (15:11 +1000)
commite419cf0954901bb3a987f8b76cbc9654ca06121c
tree550f2a7c40b6112f88306f362dc0eaa4d0a8198f
parent1f6d2de2c539df6fe52ad2187191a9dfe10c7233
drm/nouveau: Add a separate class for the kernel channel mutex.

nouveau_bo_move_m2mf() needs to lock the kernel channel, and it may be
called from the pushbuf IOCTL with an user channel already locked. Use
a separate subclass for the kernel channel mutex because this is
legitimate mutex nesting.

Signed-off-by: Francisco Jerez <currojerez@riseup.net>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
drivers/gpu/drm/nouveau/nouveau_bo.c
drivers/gpu/drm/nouveau/nouveau_drv.h