Intel-GFX Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Fernando Pacheco <fernando.pacheco@intel.com>
To: intel-gfx@lists.freedesktop.org
Subject: [PATCH v2 5/5] drm/i915/selftests: Check that gpu reset is usable from atomic context
Date: Thu, 18 Apr 2019 16:31:51 -0700	[thread overview]
Message-ID: <20190418233151.17510-6-fernando.pacheco@intel.com> (raw)
In-Reply-To: <20190418233151.17510-1-fernando.pacheco@intel.com>

GPU reset is now available with GuC enabled,
so re-enable our check that this reset is usable
from atomic context.

Signed-off-by: Fernando Pacheco <fernando.pacheco@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 050bd1e19e02..2fd33aad8683 100644
--- a/drivers/gpu/drm/i915/selftests/intel_hangcheck.c
+++ b/drivers/gpu/drm/i915/selftests/intel_hangcheck.c
@@ -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;
-- 
2.21.0

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

  parent reply	other threads:[~2019-04-18 23:34 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-04-18 23:31 [PATCH v2 0/5] Perma-pin uC firmware and re-enable global reset Fernando Pacheco
2019-04-18 23:31 ` [PATCH v2 1/5] drm/i915/uc: Rename uC firmware init/fini functions Fernando Pacheco
2019-04-18 23:31 ` [PATCH v2 2/5] drm/i915/uc: Reserve upper range of GGTT Fernando Pacheco
2019-04-19  7:14   ` Chris Wilson
2019-04-19 17:14     ` Fernando Pacheco
2019-04-19 17:22       ` Chris Wilson
2019-04-18 23:31 ` [PATCH v2 3/5] drm/i915/uc: Place uC firmware in " Fernando Pacheco
2019-04-19  7:15   ` Chris Wilson
2019-04-18 23:31 ` [PATCH v2 4/5] Revert "drm/i915/guc: Disable global reset" Fernando Pacheco
2019-04-18 23:31 ` Fernando Pacheco [this message]
2019-04-18 23:43 ` [PATCH v2 0/5] Perma-pin uC firmware and re-enable global reset Fernando Pacheco
2019-04-18 23:45 ` ✗ Fi.CI.SPARSE: warning for Perma-pin uC firmware and re-enable global reset (rev2) Patchwork
2019-04-19  0:04 ` ✓ Fi.CI.BAT: success " Patchwork
2019-04-19  2:55 ` ✓ Fi.CI.IGT: " Patchwork

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190418233151.17510-6-fernando.pacheco@intel.com \
    --to=fernando.pacheco@intel.com \
    --cc=intel-gfx@lists.freedesktop.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox