Commit fb89ac51 authored Jan 08, 2016 by Thomas Hellstrom Committed by Dave Airlie Jan 14, 2016

drm/vmwgfx: Fix an incorrect lock check



With CONFIG_SMP=n and CONFIG_DEBUG_SPINLOCK=y the vmwgfx kernel module
would unconditionally throw a bug when checking for a held spinlock
in the command buffer code. Fix this by using a lockdep check.

Cc: <stable@vger.kernel.org>
Reported-and-tested-by: Tetsuo Handa <penguin-kernel@i-love-sakura.ne.jp>
Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: Sinclair Yeh <syeh@vmware.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>

parent 38b17519

drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -247,7 +247,7 @@ static void __vmw_cmdbuf_header_free(struct vmw_cmdbuf_header *header)
		{
		struct vmw_cmdbuf_man *man = header->man;

		BUG_ON(!spin_is_locked(&man->lock));
		lockdep_assert_held_once(&man->lock);

		if (header->inline_space) {
		vmw_cmdbuf_header_inline_free(header);