lkml.org 
[lkml]   [2014]   [May]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.14 056/140] drm/vmwgfx: Fix query buffer locking order violation
    Date
    3.14-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Thomas Hellstrom <thellstrom@vmware.com>

    commit c8e5e010ef12df6707a1d711a5279a22f67a355e upstream.

    The query buffers were reserved while holding the binding mutex, which
    caused a circular locking dependency.

    Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
    Reviewed-by: Brian Paul <brianp@vmware.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/gpu/drm/vmwgfx/vmwgfx_context.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    --- a/drivers/gpu/drm/vmwgfx/vmwgfx_context.c
    +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_context.c
    @@ -117,10 +117,10 @@ static void vmw_hw_context_destroy(struc
    (void) vmw_context_binding_state_kill
    (&container_of(res, struct vmw_user_context, res)->cbs);
    (void) vmw_gb_context_destroy(res);
    + mutex_unlock(&dev_priv->binding_mutex);
    if (dev_priv->pinned_bo != NULL &&
    !dev_priv->query_cid_valid)
    __vmw_execbuf_release_pinned_bo(dev_priv, NULL);
    - mutex_unlock(&dev_priv->binding_mutex);
    mutex_unlock(&dev_priv->cmdbuf_mutex);
    return;
    }



    \
     
     \ /
      Last update: 2014-05-29 08:41    [W:2.251 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site