summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/gt
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2019-10-15 09:59:11 +0100
committerChris Wilson <chris@chris-wilson.co.uk>2019-10-16 09:54:28 +0100
commit8574685547bdc4f11cc528f386e5396212409f9c (patch)
tree337f3b959d85347f2c23a5f0d7ab6154b689e44f /drivers/gpu/drm/i915/gt
parent08fff7aeddc9dd72161b4c8fc27fbab12b4b9352 (diff)
downloadlinux-8574685547bdc4f11cc528f386e5396212409f9c.tar.bz2
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: 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
Diffstat (limited to 'drivers/gpu/drm/i915/gt')
-rw-r--r--drivers/gpu/drm/i915/gt/selftest_lrc.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/drivers/gpu/drm/i915/gt/selftest_lrc.c b/drivers/gpu/drm/i915/gt/selftest_lrc.c
index 1276da059dc6..9c1f34fb5882 100644
--- a/drivers/gpu/drm/i915/gt/selftest_lrc.c
+++ b/drivers/gpu/drm/i915/gt/selftest_lrc.c
@@ -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;
@@ -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)
@@ -264,9 +260,6 @@ err_ce:
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;
}