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

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
Loading
Loading
Loading
Loading
+3 −3
Original line number Diff line number Diff line
@@ -1814,9 +1814,6 @@ static int igt_atomic_reset(void *arg)

	/* 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);
	mutex_lock(&i915->drm.struct_mutex);
	wakeref = intel_runtime_pm_get(i915);
@@ -1846,6 +1843,9 @@ static int igt_atomic_reset(void *arg)
		force_reset(i915);
	}

	if (USES_GUC_SUBMISSION(i915))
		goto unlock;

	if (intel_has_reset_engine(i915)) {
		struct intel_engine_cs *engine;
		enum intel_engine_id id;