lkml.org 
[lkml]   [2015]   [Jan]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.18 028/183] drm/vmwgfx: Fix fence event code
    Date
    3.18-stable review patch.  If anyone has any objections, please let me know.

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

    From: Thomas Hellstrom <thellstrom@vmware.com>

    commit 89669e7a7f96be3ee8d9a22a071d7c0d3b4428fc upstream.

    The commit "vmwgfx: Rework fence event action" introduced a number of bugs
    that are fixed with this commit:

    a) A forgotten return stateemnt.
    b) An if statement with identical branches.

    Reported-by: Rob Clark <robdclark@gmail.com>
    Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
    Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
    Reviewed-by: Sinclair Yeh <syeh@vmware.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/gpu/drm/vmwgfx/vmwgfx_fence.c | 17 ++++++-----------
    1 file changed, 6 insertions(+), 11 deletions(-)

    --- a/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c
    +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c
    @@ -1087,6 +1087,8 @@ static int vmw_event_fence_action_create
    if (ret != 0)
    goto out_no_queue;

    + return 0;
    +
    out_no_queue:
    event->base.destroy(&event->base);
    out_no_event:
    @@ -1162,17 +1164,10 @@ int vmw_fence_event_ioctl(struct drm_dev

    BUG_ON(fence == NULL);

    - if (arg->flags & DRM_VMW_FE_FLAG_REQ_TIME)
    - ret = vmw_event_fence_action_create(file_priv, fence,
    - arg->flags,
    - arg->user_data,
    - true);
    - else
    - ret = vmw_event_fence_action_create(file_priv, fence,
    - arg->flags,
    - arg->user_data,
    - true);
    -
    + ret = vmw_event_fence_action_create(file_priv, fence,
    + arg->flags,
    + arg->user_data,
    + true);
    if (unlikely(ret != 0)) {
    if (ret != -ERESTARTSYS)
    DRM_ERROR("Failed to attach event to fence.\n");



    \
     
     \ /
      Last update: 2015-01-25 20:01    [W:7.190 / U:0.020 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site