Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bf51997c authored by Chris Wilson's avatar Chris Wilson
Browse files

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: 69df05e1 ("drm/i915: Simplify releasing context reference")
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20161219101357.28140-1-chris@chris-wilson.co.uk


Reviewed-by: default avatarJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
parent f73e7399

drivers/gpu/drm/i915/i915_drv.h

+4 −3
Original line number Original line Diff line number Diff line
@@ -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)

static inline void i915_gem_context_put_unlocked(struct i915_gem_context *ctx)

{

{

	kref_put_mutex(&ctx->ref,

	struct mutex *lock = &ctx->i915->drm.struct_mutex;

		       i915_gem_context_free,



		       &ctx->i915->drm.struct_mutex);

	if (kref_put_mutex(&ctx->ref, i915_gem_context_free, lock))

		mutex_unlock(lock);

}

}





static inline struct intel_timeline *

static inline struct intel_timeline *