lkml.org 
[lkml]   [2016]   [Apr]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.19.y-ckt 31/56] drm/udl: Use unlocked gem unreferencing
    Date
    3.19.8-ckt19 -stable review patch.  If anyone has any objections, please let me know.

    ---8<------------------------------------------------------------

    From: Daniel Vetter <daniel.vetter@ffwll.ch>

    commit 72b9ff0612ad8fc969b910cd00ac16b57a1a9ba4 upstream.

    For drm_gem_object_unreference callers are required to hold
    dev->struct_mutex, which these paths don't. Enforcing this requirement
    has become a bit more strict with

    commit ef4c6270bf2867e2f8032e9614d1a8cfc6c71663
    Author: Daniel Vetter <daniel.vetter@ffwll.ch>
    Date: Thu Oct 15 09:36:25 2015 +0200

    drm/gem: Check locking in drm_gem_object_unreference

    Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
    Signed-off-by: Kamal Mostafa <kamal@canonical.com>
    ---
    drivers/gpu/drm/udl/udl_fb.c | 2 +-
    drivers/gpu/drm/udl/udl_gem.c | 2 +-
    2 files changed, 2 insertions(+), 2 deletions(-)

    diff --git a/drivers/gpu/drm/udl/udl_fb.c b/drivers/gpu/drm/udl/udl_fb.c
    index 8cbcb45..169326f 100644
    --- a/drivers/gpu/drm/udl/udl_fb.c
    +++ b/drivers/gpu/drm/udl/udl_fb.c
    @@ -546,7 +546,7 @@ static int udlfb_create(struct drm_fb_helper *helper,

    return ret;
    out_gfree:
    - drm_gem_object_unreference(&ufbdev->ufb.obj->base);
    + drm_gem_object_unreference_unlocked(&ufbdev->ufb.obj->base);
    out:
    return ret;
    }
    diff --git a/drivers/gpu/drm/udl/udl_gem.c b/drivers/gpu/drm/udl/udl_gem.c
    index 2a0a784..d7528e0 100644
    --- a/drivers/gpu/drm/udl/udl_gem.c
    +++ b/drivers/gpu/drm/udl/udl_gem.c
    @@ -52,7 +52,7 @@ udl_gem_create(struct drm_file *file,
    return ret;
    }

    - drm_gem_object_unreference(&obj->base);
    + drm_gem_object_unreference_unlocked(&obj->base);
    *handle_p = handle;
    return 0;
    }
    --
    2.7.4
    \
     
     \ /
      Last update: 2016-04-12 23:21    [W:4.294 / U:0.856 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site