Commit f3c2b76e authored by Fernando Pacheco's avatar Fernando Pacheco Committed by Chris Wilson

drm/i915/selftests: Check that gpu reset is usable from atomic context

GPU reset is now available with GuC enabled, so re-enable our check that
this reset is usable from atomic context.
Signed-off-by: default avatarFernando Pacheco <fernando.pacheco@intel.com>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20190419230015.18121-6-fernando.pacheco@intel.com
parent 40d211ef
...@@ -1814,9 +1814,6 @@ static int igt_atomic_reset(void *arg) ...@@ -1814,9 +1814,6 @@ static int igt_atomic_reset(void *arg)
/* Check that the resets are usable from atomic context */ /* Check that the resets are usable from atomic context */
if (USES_GUC_SUBMISSION(i915))
return 0; /* guc is dead; long live the guc */
igt_global_reset_lock(i915); igt_global_reset_lock(i915);
mutex_lock(&i915->drm.struct_mutex); mutex_lock(&i915->drm.struct_mutex);
wakeref = intel_runtime_pm_get(i915); wakeref = intel_runtime_pm_get(i915);
...@@ -1846,6 +1843,9 @@ static int igt_atomic_reset(void *arg) ...@@ -1846,6 +1843,9 @@ static int igt_atomic_reset(void *arg)
force_reset(i915); force_reset(i915);
} }
if (USES_GUC_SUBMISSION(i915))
goto unlock;
if (intel_has_reset_engine(i915)) { if (intel_has_reset_engine(i915)) {
struct intel_engine_cs *engine; struct intel_engine_cs *engine;
enum intel_engine_id id; enum intel_engine_id id;
......
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