Commit fb89ac51 authored by Thomas Hellstrom's avatar Thomas Hellstrom Committed by Dave Airlie

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: default avatarTetsuo Handa <penguin-kernel@i-love-sakura.ne.jp>
Signed-off-by: default avatarThomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: default avatarSinclair Yeh <syeh@vmware.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 38b17519
...@@ -247,7 +247,7 @@ static void __vmw_cmdbuf_header_free(struct vmw_cmdbuf_header *header) ...@@ -247,7 +247,7 @@ static void __vmw_cmdbuf_header_free(struct vmw_cmdbuf_header *header)
{ {
struct vmw_cmdbuf_man *man = header->man; struct vmw_cmdbuf_man *man = header->man;
BUG_ON(!spin_is_locked(&man->lock)); lockdep_assert_held_once(&man->lock);
if (header->inline_space) { if (header->inline_space) {
vmw_cmdbuf_header_inline_free(header); vmw_cmdbuf_header_inline_free(header);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment