From: Chris Wilson Date: Mon, 19 Dec 2016 10:13:57 +0000 (+0000) Subject: drm/i915: Drop mutex after successful kref_put_mutex() X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=bf51997c91e097e552ce219f38c1520e4039b637;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git drm/i915: Drop mutex after successful kref_put_mutex() The kref_put_mutex() returns with the mutex held after freeing the object - so we must remember to drop it... Fixes: 69df05e11ab8 ("drm/i915: Simplify releasing context reference") Signed-off-by: Chris Wilson Cc: Tvrtko Ursulin Link: http://patchwork.freedesktop.org/patch/msgid/20161219101357.28140-1-chris@chris-wilson.co.uk Reviewed-by: Joonas Lahtinen --- diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index 202a6ac51c05..785e04c56171 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -3520,9 +3520,10 @@ static inline void i915_gem_context_put(struct i915_gem_context *ctx) static inline void i915_gem_context_put_unlocked(struct i915_gem_context *ctx) { - kref_put_mutex(&ctx->ref, - i915_gem_context_free, - &ctx->i915->drm.struct_mutex); + struct mutex *lock = &ctx->i915->drm.struct_mutex; + + if (kref_put_mutex(&ctx->ref, i915_gem_context_free, lock)) + mutex_unlock(lock); } static inline struct intel_timeline *