lkml.org 
[lkml]   [2016]   [Jul]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.4 083/146] drm/i915: Update ifdeffery for mutex->owner
    Date
    4.4-stable review patch.  If anyone has any objections, please let me know.

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

    From: Chris Wilson <chris@chris-wilson.co.uk>

    commit b19240062722c39fa92c99f04cbfd93034625123 upstream.

    In commit 7608a43d8f2e ("locking/mutexes: Use MUTEX_SPIN_ON_OWNER when
    appropriate") the owner field in the mutex was updated from being
    dependent upon CONFIG_SMP to using optimistic spin. Update our peek
    function to suite.

    Fixes:7608a43d8f2e ("locking/mutexes: Use MUTEX_SPIN_ON_OWNER...")
    Reported-by: Hong Liu <hong.liu@intel.com>
    Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
    Link: http://patchwork.freedesktop.org/patch/msgid/1468244777-4888-1-git-send-email-chris@chris-wilson.co.uk
    Reviewed-by: Matthew Auld <matthew.auld@intel.com>
    (cherry picked from commit 4f074a5393431a7d2cc0de7fcfe2f61d24854628)
    Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

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

    --- a/drivers/gpu/drm/i915/i915_gem_shrinker.c
    +++ b/drivers/gpu/drm/i915/i915_gem_shrinker.c
    @@ -39,7 +39,7 @@ static bool mutex_is_locked_by(struct mu
    if (!mutex_is_locked(mutex))
    return false;

    -#if defined(CONFIG_SMP) || defined(CONFIG_DEBUG_MUTEXES)
    +#if defined(CONFIG_DEBUG_MUTEXES) || defined(CONFIG_MUTEX_SPIN_ON_OWNER)
    return mutex->owner == task;
    #else
    /* Since UP may be pre-empted, we cannot assume that we own the lock */

    \
     
     \ /
      Last update: 2016-07-26 01:21    [W:4.026 / U:1.612 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site