Chris Wilson <ch...@chris-wilson.co.uk> writes: > Trim the struct_mutex hold and exclude the call to i915_gem_set_wedged() > as a reminder that it must be callable without struct_mutex held. > > Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> > Cc: Michal Wajdeczko <michal.wajdec...@intel.com> > Cc: Mika Kuoppala <mika.kuopp...@intel.com>
Reviewed-by: Mika Kuoppala <mika.kuopp...@linux.intel.com> > --- > drivers/gpu/drm/i915/selftests/intel_hangcheck.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/gpu/drm/i915/selftests/intel_hangcheck.c > b/drivers/gpu/drm/i915/selftests/intel_hangcheck.c > index 67431355cd6e..28144fd72550 100644 > --- a/drivers/gpu/drm/i915/selftests/intel_hangcheck.c > +++ b/drivers/gpu/drm/i915/selftests/intel_hangcheck.c > @@ -389,16 +389,16 @@ static int igt_wedged_reset(void *arg) > /* Check that we can recover a wedged device with a GPU reset */ > > igt_global_reset_lock(i915); > - mutex_lock(&i915->drm.struct_mutex); > wakeref = intel_runtime_pm_get(i915); > > i915_gem_set_wedged(i915); > - GEM_BUG_ON(!i915_terminally_wedged(&i915->gpu_error)); > > + 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); > - mutex_unlock(&i915->drm.struct_mutex); > igt_global_reset_unlock(i915); > > return i915_terminally_wedged(&i915->gpu_error) ? -EIO : 0; > -- > 2.20.1 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/intel-gfx _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
