diff options
| author | Thomas Hellstrom <thellstrom@vmware.com> | 2018-08-28 18:44:21 +0200 |
|---|---|---|
| committer | Thomas Hellstrom <thellstrom@vmware.com> | 2018-08-31 14:10:23 +0200 |
| commit | a866523eb2de4dff7049ab8c2343a7ad2e0d1e7e (patch) | |
| tree | edd0755868ad97c33298087c1b9e496b116c3555 | |
| parent | f90abd7aaf4fb40f0b267bc24624183ba3d6eb2f (diff) | |
vmwgfx: Replace unconditional mutex unlocked warnings with lockdep counterpart
Replace instances of WARN_ON[_ONCE](!mutex_is_held()) with
lockdep_assert_held(). This makes sure the checking process actually
holds the mutex and also removes the checks from release builds
Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: Sinclair Yeh <syeh@vmware.com>
Reviewed-by: Deepak Rawat <drawat@vmware.com>
| -rw-r--r-- | vmwgfx_cmdbuf.c | 4 | ||||
| -rw-r--r-- | vmwgfx_shader.c | 2 | ||||
| -rw-r--r-- | vmwgfx_so.c | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/vmwgfx_cmdbuf.c b/vmwgfx_cmdbuf.c index e688a5a..eba0d13 100644 --- a/vmwgfx_cmdbuf.c +++ b/vmwgfx_cmdbuf.c @@ -662,7 +662,7 @@ static void __vmw_cmdbuf_cur_flush(struct vmw_cmdbuf_man *man) { struct vmw_cmdbuf_header *cur = man->cur; - WARN_ON(!mutex_is_locked(&man->cur_mutex)); + lockdep_assert_held_once(&man->cur_mutex); if (!cur) return; @@ -1069,7 +1069,7 @@ static void vmw_cmdbuf_commit_cur(struct vmw_cmdbuf_man *man, { struct vmw_cmdbuf_header *cur = man->cur; - WARN_ON(!mutex_is_locked(&man->cur_mutex)); + lockdep_assert_held_once(&man->cur_mutex); WARN_ON(size > cur->reserved); man->cur_pos += size; diff --git a/vmwgfx_shader.c b/vmwgfx_shader.c index b488d54..f858bda 100644 --- a/vmwgfx_shader.c +++ b/vmwgfx_shader.c @@ -561,7 +561,7 @@ void vmw_dx_shader_cotable_list_scrub(struct vmw_private *dev_priv, { struct vmw_dx_shader *entry, *next; - WARN_ON_ONCE(!mutex_is_locked(&dev_priv->binding_mutex)); + lockdep_assert_held_once(&dev_priv->binding_mutex); list_for_each_entry_safe(entry, next, list, cotable_head) { WARN_ON(vmw_dx_shader_scrub(&entry->res)); diff --git a/vmwgfx_so.c b/vmwgfx_so.c index 5a73eeb..1722d68 100644 --- a/vmwgfx_so.c +++ b/vmwgfx_so.c @@ -208,7 +208,7 @@ static int vmw_view_destroy(struct vmw_resource *res) union vmw_view_destroy body; } *cmd; - WARN_ON_ONCE(!mutex_is_locked(&dev_priv->binding_mutex)); + lockdep_assert_held_once(&dev_priv->binding_mutex); vmw_binding_res_list_scrub(&res->binding_head); if (!view->committed || res->id == -1) @@ -435,7 +435,7 @@ void vmw_view_cotable_list_destroy(struct vmw_private *dev_priv, { struct vmw_view *entry, *next; - WARN_ON_ONCE(!mutex_is_locked(&dev_priv->binding_mutex)); + lockdep_assert_held_once(&dev_priv->binding_mutex); list_for_each_entry_safe(entry, next, list, cotable_head) WARN_ON(vmw_view_destroy(&entry->res)); @@ -455,7 +455,7 @@ void vmw_view_surface_list_destroy(struct vmw_private *dev_priv, { struct vmw_view *entry, *next; - WARN_ON_ONCE(!mutex_is_locked(&dev_priv->binding_mutex)); + lockdep_assert_held_once(&dev_priv->binding_mutex); list_for_each_entry_safe(entry, next, list, srf_head) WARN_ON(vmw_view_destroy(&entry->res)); |