From beca36ffbdb5d185e46fa3c9cb880847b783d31d Mon Sep 17 00:00:00 2001 From: Michal Wajdeczko Date: Wed, 22 May 2019 19:31:57 +0000 Subject: [PATCH] drm/i915/selftests: Use prepare/finish during atomic reset test We were testing full GPU reset in atomic context without correctly wrapping it by prepare/finish steps. This could confuse our GuC reset handling code. Signed-off-by: Michal Wajdeczko Cc: Chris Wilson Reviewed-by: Chris Wilson Signed-off-by: Chris Wilson Link: https://patchwork.freedesktop.org/patch/msgid/20190522193203.23932-4-michal.wajdeczko@intel.com --- drivers/gpu/drm/i915/gt/selftest_reset.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/gpu/drm/i915/gt/selftest_reset.c b/drivers/gpu/drm/i915/gt/selftest_reset.c index 4560ed2751a4..607473439eb0 100644 --- a/drivers/gpu/drm/i915/gt/selftest_reset.c +++ b/drivers/gpu/drm/i915/gt/selftest_reset.c @@ -74,7 +74,9 @@ static int igt_atomic_reset(void *arg) GEM_TRACE("intel_gpu_reset under %s\n", p->name); p->critical_section_begin(); + reset_prepare(i915); err = intel_gpu_reset(i915, ALL_ENGINES); + reset_finish(i915); p->critical_section_end(); if (err) { -- 2.11.0