From 69df05e11ab8c10e57bb5aaaa3e6d3d1b251b333 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Sun, 18 Dec 2016 15:37:21 +0000 Subject: drm/i915: Simplify releasing context reference A few users only take the struct_mutex in order to release a reference to a context. We can expose a kref_put_mutex() wrapper in order to simplify these users, and optimise taking of the mutex to the final unref. Signed-off-by: Chris Wilson Reviewed-by: Tvrtko Ursulin Link: http://patchwork.freedesktop.org/patch/msgid/20161218153724.8439-4-chris@chris-wilson.co.uk --- drivers/gpu/drm/i915/i915_perf.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) (limited to 'drivers/gpu/drm/i915/i915_perf.c') diff --git a/drivers/gpu/drm/i915/i915_perf.c b/drivers/gpu/drm/i915/i915_perf.c index da8537cb8136..a1b7eec58be2 100644 --- a/drivers/gpu/drm/i915/i915_perf.c +++ b/drivers/gpu/drm/i915/i915_perf.c @@ -1555,8 +1555,6 @@ static long i915_perf_ioctl(struct file *file, */ static void i915_perf_destroy_locked(struct i915_perf_stream *stream) { - struct drm_i915_private *dev_priv = stream->dev_priv; - if (stream->enabled) i915_perf_disable_locked(stream); @@ -1565,11 +1563,8 @@ static void i915_perf_destroy_locked(struct i915_perf_stream *stream) list_del(&stream->link); - if (stream->ctx) { - mutex_lock(&dev_priv->drm.struct_mutex); - i915_gem_context_put(stream->ctx); - mutex_unlock(&dev_priv->drm.struct_mutex); - } + if (stream->ctx) + i915_gem_context_put_unlocked(stream->ctx); kfree(stream); } @@ -1738,11 +1733,8 @@ err_open: err_alloc: kfree(stream); err_ctx: - if (specific_ctx) { - mutex_lock(&dev_priv->drm.struct_mutex); - i915_gem_context_put(specific_ctx); - mutex_unlock(&dev_priv->drm.struct_mutex); - } + if (specific_ctx) + i915_gem_context_put_unlocked(specific_ctx); err: return ret; } -- cgit