mirror of
https://github.com/torvalds/linux
synced 2024-10-22 03:09:41 +00:00
drm/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>
This commit is contained in:
parent
cc1e3b796b
commit
d76ce03e1a
|
@ -660,7 +660,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;
|
||||
|
@ -1045,7 +1045,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;
|
||||
|
|
|
@ -562,7 +562,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));
|
||||
|
|
|
@ -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)
|
||||
|
@ -439,7 +439,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));
|
||||
|
@ -459,7 +459,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));
|
||||
|
|
Loading…
Reference in a new issue