Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3abd6143 authored by Chris Wilson's avatar Chris Wilson
Browse files

drm/i915/selftests: verify_gt_engine_wa() needs rpm wakeref 



The mmio readback for verify_gt_engine_wa() also needs a runtime-pm
wakeref, so effectively do the entirety of both engine workarounds
tests. As such simplify the rpm behaviour here by acquiring the wakeref
for the whole of each subtest. It would be still useful to later verify
the registers retain their magic values across rpm suspend/resume.

Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20181206180713.6827-1-chris@chris-wilson.co.uk
parent 7e90e8d0

drivers/gpu/drm/i915/selftests/intel_workarounds.c

+4 −11
Original line number Original line Diff line number Diff line
@@ -333,7 +333,6 @@ static bool verify_gt_engine_wa(struct drm_i915_private *i915, const char *str) 
	bool ok = true;

	bool ok = true;





	ok &= intel_gt_verify_workarounds(i915, str);

	ok &= intel_gt_verify_workarounds(i915, str);



	for_each_engine(engine, i915, id)

	for_each_engine(engine, i915, id)

		ok &= intel_engine_verify_workarounds(engine, str);

		ok &= intel_engine_verify_workarounds(engine, str);
@@ -353,19 +352,19 @@ live_gpu_reset_gt_engine_workarounds(void *arg) 
	pr_info("Verifying after GPU reset...\n");

	pr_info("Verifying after GPU reset...\n");





	igt_global_reset_lock(i915);

	igt_global_reset_lock(i915);

	intel_runtime_pm_get(i915);





	ok = verify_gt_engine_wa(i915, "before reset");

	ok = verify_gt_engine_wa(i915, "before reset");

	if (!ok)

	if (!ok)

		goto out;

		goto out;





	intel_runtime_pm_get(i915);

	set_bit(I915_RESET_HANDOFF, &error->flags);

	set_bit(I915_RESET_HANDOFF, &error->flags);

	i915_reset(i915, ALL_ENGINES, "live_workarounds");

	i915_reset(i915, ALL_ENGINES, "live_workarounds");

	intel_runtime_pm_put(i915);





	ok = verify_gt_engine_wa(i915, "after reset");

	ok = verify_gt_engine_wa(i915, "after reset");





out:

out:

	intel_runtime_pm_put(i915);

	igt_global_reset_unlock(i915);

	igt_global_reset_unlock(i915);





	return ok ? 0 : -ESRCH;

	return ok ? 0 : -ESRCH;
@@ -390,6 +389,7 @@ live_engine_reset_gt_engine_workarounds(void *arg) 
		return PTR_ERR(ctx);

		return PTR_ERR(ctx);





	igt_global_reset_lock(i915);

	igt_global_reset_lock(i915);

	intel_runtime_pm_get(i915);





	for_each_engine(engine, i915, id) {

	for_each_engine(engine, i915, id) {

		bool ok;

		bool ok;
@@ -402,9 +402,7 @@ live_engine_reset_gt_engine_workarounds(void *arg) 
			goto err;

			goto err;

		}

		}





		intel_runtime_pm_get(i915);

		i915_reset_engine(engine, "live_workarounds");

		i915_reset_engine(engine, "live_workarounds");

		intel_runtime_pm_put(i915);





		ok = verify_gt_engine_wa(i915, "after idle reset");

		ok = verify_gt_engine_wa(i915, "after idle reset");

		if (!ok) {

		if (!ok) {
@@ -416,13 +414,10 @@ live_engine_reset_gt_engine_workarounds(void *arg) 
		if (ret)

		if (ret)

			goto err;

			goto err;





		intel_runtime_pm_get(i915);



		rq = igt_spinner_create_request(&spin, ctx, engine, MI_NOOP);

		rq = igt_spinner_create_request(&spin, ctx, engine, MI_NOOP);

		if (IS_ERR(rq)) {

		if (IS_ERR(rq)) {

			ret = PTR_ERR(rq);

			ret = PTR_ERR(rq);

			igt_spinner_fini(&spin);

			igt_spinner_fini(&spin);

			intel_runtime_pm_put(i915);

			goto err;

			goto err;

		}

		}
@@ -431,15 +426,12 @@ live_engine_reset_gt_engine_workarounds(void *arg) 
		if (!igt_wait_for_spinner(&spin, rq)) {

		if (!igt_wait_for_spinner(&spin, rq)) {

			pr_err("Spinner failed to start\n");

			pr_err("Spinner failed to start\n");

			igt_spinner_fini(&spin);

			igt_spinner_fini(&spin);

			intel_runtime_pm_put(i915);

			ret = -ETIMEDOUT;

			ret = -ETIMEDOUT;

			goto err;

			goto err;

		}

		}





		i915_reset_engine(engine, "live_workarounds");

		i915_reset_engine(engine, "live_workarounds");





		intel_runtime_pm_put(i915);



		igt_spinner_end(&spin);

		igt_spinner_end(&spin);

		igt_spinner_fini(&spin);

		igt_spinner_fini(&spin);
@@ -451,6 +443,7 @@ live_engine_reset_gt_engine_workarounds(void *arg) 
	}

	}





err:

err:

	intel_runtime_pm_put(i915);

	igt_global_reset_unlock(i915);

	igt_global_reset_unlock(i915);

	kernel_context_close(ctx);

	kernel_context_close(ctx);