]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
drm/i915/selftests: Drop unnecessary struct_mutex around i915_reset()
authorChris Wilson <chris@chris-wilson.co.uk>
Fri, 15 Feb 2019 10:27:32 +0000 (10:27 +0000)
committerChris Wilson <chris@chris-wilson.co.uk>
Fri, 15 Feb 2019 18:17:30 +0000 (18:17 +0000)
Since we no longer need to hold struct_mutex to perform a global device
reset, don't do so for igt_reset_wedge().

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Reviewed-by: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190215102732.15520-2-chris@chris-wilson.co.uk
drivers/gpu/drm/i915/selftests/intel_hangcheck.c

index 92475596ff40ab6946eb321cd338c9f1a60ccd57..74e743b101d9c37e7d344409b68593363e2a3944 100644 (file)
@@ -399,10 +399,8 @@ static int igt_wedged_reset(void *arg)
 
        i915_gem_set_wedged(i915);
 
-       mutex_lock(&i915->drm.struct_mutex);
        GEM_BUG_ON(!i915_terminally_wedged(&i915->gpu_error));
        i915_reset(i915, ALL_ENGINES, NULL);
-       mutex_unlock(&i915->drm.struct_mutex);
 
        intel_runtime_pm_put(i915, wakeref);
        igt_global_reset_unlock(i915);