Commit 85746855 authored by Chris Wilson's avatar Chris Wilson

drm/i915/selftests: Drop stale struct_mutex

A lately added test was missed when applying the struct_mutex removal
patches. Do so now.
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191015085911.10317-1-chris@chris-wilson.co.uk
parent 08fff7ae
...@@ -107,7 +107,6 @@ static int live_unlite_restore(struct drm_i915_private *i915, int prio) ...@@ -107,7 +107,6 @@ static int live_unlite_restore(struct drm_i915_private *i915, int prio)
struct intel_engine_cs *engine; struct intel_engine_cs *engine;
struct i915_gem_context *ctx; struct i915_gem_context *ctx;
enum intel_engine_id id; enum intel_engine_id id;
intel_wakeref_t wakeref;
struct igt_spinner spin; struct igt_spinner spin;
int err = -ENOMEM; int err = -ENOMEM;
...@@ -116,11 +115,8 @@ static int live_unlite_restore(struct drm_i915_private *i915, int prio) ...@@ -116,11 +115,8 @@ static int live_unlite_restore(struct drm_i915_private *i915, int prio)
* on the same engine from the same parent context. * on the same engine from the same parent context.
*/ */
mutex_lock(&i915->drm.struct_mutex);
wakeref = intel_runtime_pm_get(&i915->runtime_pm);
if (igt_spinner_init(&spin, &i915->gt)) if (igt_spinner_init(&spin, &i915->gt))
goto err_unlock; return err;
ctx = kernel_context(i915); ctx = kernel_context(i915);
if (!ctx) if (!ctx)
...@@ -264,9 +260,6 @@ static int live_unlite_restore(struct drm_i915_private *i915, int prio) ...@@ -264,9 +260,6 @@ static int live_unlite_restore(struct drm_i915_private *i915, int prio)
kernel_context_close(ctx); kernel_context_close(ctx);
err_spin: err_spin:
igt_spinner_fini(&spin); igt_spinner_fini(&spin);
err_unlock:
intel_runtime_pm_put(&i915->runtime_pm, wakeref);
mutex_unlock(&i915->drm.struct_mutex);
return err; return err;
} }
......
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