Commit bb6892b7 authored by Chris Wilson's avatar Chris Wilson

drm/i915/gt: Use the correct err_unlock unwind path for a closed context

A silly cut'n'paste copied the unlocked error path and used it inside
the pin_mutex lock, we need to drop that lock before returning.

Fixes: b412c63f ("drm/i915/gt: Report context-is-closed prior to pinning")
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Reviewed-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200322123241.17694-1-chris@chris-wilson.co.uk
parent b412c63f
...@@ -114,7 +114,7 @@ int __intel_context_do_pin(struct intel_context *ce) ...@@ -114,7 +114,7 @@ int __intel_context_do_pin(struct intel_context *ce)
if (unlikely(intel_context_is_closed(ce))) { if (unlikely(intel_context_is_closed(ce))) {
err = -ENOENT; err = -ENOENT;
goto out_release; goto out_unlock;
} }
if (likely(!atomic_add_unless(&ce->pin_count, 1, 0))) { if (likely(!atomic_add_unless(&ce->pin_count, 1, 0))) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment