Skip to content

Commit

Permalink
drm/i915/selftests: Drop stale struct_mutex
Browse files Browse the repository at this point in the history
A lately added test was missed when applying the struct_mutex removal
patches. Do so now.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191015085911.10317-1-chris@chris-wilson.co.uk
  • Loading branch information
Chris Wilson committed Oct 16, 2019
1 parent 08fff7a commit 8574685
Showing 1 changed file with 1 addition and 8 deletions.
9 changes: 1 addition & 8 deletions drivers/gpu/drm/i915/gt/selftest_lrc.c
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,6 @@ static int live_unlite_restore(struct drm_i915_private *i915, int prio)
struct intel_engine_cs *engine;
struct i915_gem_context *ctx;
enum intel_engine_id id;
intel_wakeref_t wakeref;
struct igt_spinner spin;
int err = -ENOMEM;

Expand All @@ -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.
*/

mutex_lock(&i915->drm.struct_mutex);
wakeref = intel_runtime_pm_get(&i915->runtime_pm);

if (igt_spinner_init(&spin, &i915->gt))
goto err_unlock;
return err;

ctx = kernel_context(i915);
if (!ctx)
Expand Down Expand Up @@ -264,9 +260,6 @@ static int live_unlite_restore(struct drm_i915_private *i915, int prio)
kernel_context_close(ctx);
err_spin:
igt_spinner_fini(&spin);
err_unlock:
intel_runtime_pm_put(&i915->runtime_pm, wakeref);
mutex_unlock(&i915->drm.struct_mutex);
return err;
}

Expand Down

0 comments on commit 8574685

Please sign in to comment.