]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
drm/i915/gt: Use the correct err_unlock unwind path for a closed context
authorChris Wilson <chris@chris-wilson.co.uk>
Sun, 22 Mar 2020 12:32:41 +0000 (12:32 +0000)
committerChris Wilson <chris@chris-wilson.co.uk>
Sun, 22 Mar 2020 13:44:24 +0000 (13:44 +0000)
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
drivers/gpu/drm/i915/gt/intel_context.c

index 7132bf616cc49fee25e9f2d745af98fa76376a8a..e4aece20bc8089b0cff67256c12f0e7153ea2294 100644 (file)
@@ -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))) {