diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2020-03-22 12:32:41 +0000 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2020-03-22 13:44:24 +0000 |
| commit | bb6892b7ce15acc0742f32b740ecaa5594bf31ec (patch) | |
| tree | c0b2861932b4de2b53d3ca4681b9deec1fdfdd6c | |
| parent | b412c63f1cba70b0e21927ae840aa45e024be97f (diff) | |
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: b412c63f1cba ("drm/i915/gt: Report context-is-closed prior to pinning")
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200322123241.17694-1-chris@chris-wilson.co.uk
| -rw-r--r-- | drivers/gpu/drm/i915/gt/intel_context.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/gt/intel_context.c b/drivers/gpu/drm/i915/gt/intel_context.c index 7132bf616cc49..e4aece20bc808 100644 --- a/drivers/gpu/drm/i915/gt/intel_context.c +++ b/drivers/gpu/drm/i915/gt/intel_context.c @@ -114,7 +114,7 @@ int __intel_context_do_pin(struct intel_context *ce) if (unlikely(intel_context_is_closed(ce))) { err = -ENOENT; - goto out_release; + goto out_unlock; } if (likely(!atomic_add_unless(&ce->pin_count, 1, 0))) { |