All of lore.kernel.org
 help / color / mirror / Atom feed
From: Ulrich Hecht <ulrich.hecht+renesas@gmail.com>
To: intel-gfx@lists.freedesktop.org
Cc: linux-renesas-soc@vger.kernel.org,
	laurent.pinchart@ideasonboard.com,
	Ulrich Hecht <ulrich.hecht+renesas@gmail.com>
Subject: [PATCH igt 4/8] lib/igt_gt: check for presence of GPU reset before using it
Date: Thu, 15 Mar 2018 15:45:40 +0100	[thread overview]
Message-ID: <1521125144-28614-5-git-send-email-ulrich.hecht+renesas@gmail.com> (raw)
In-Reply-To: <1521125144-28614-1-git-send-email-ulrich.hecht+renesas@gmail.com>

Fixes failed assertion on non-i915 devices.

Signed-off-by: Ulrich Hecht <ulrich.hecht+renesas@gmail.com>
---
 lib/igt_gt.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/igt_gt.c b/lib/igt_gt.c
index 9cb07c2..825ea52 100644
--- a/lib/igt_gt.c
+++ b/lib/igt_gt.c
@@ -166,14 +166,15 @@ igt_hang_t igt_allow_hang(int fd, unsigned ctx, unsigned flags)
 	struct drm_i915_gem_context_param param;
 	unsigned ban;
 
+	if (!igt_check_boolean_env_var("IGT_HANG_WITHOUT_RESET", false))
+		igt_require(has_gpu_reset(fd));
+
 	igt_assert(igt_sysfs_set_parameter
 		   (fd, "reset", "%d", INT_MAX /* any reset method */));
 
 	if (!igt_check_boolean_env_var("IGT_HANG", true))
 		igt_skip("hang injection disabled by user");
 	gem_context_require_bannable(fd);
-	if (!igt_check_boolean_env_var("IGT_HANG_WITHOUT_RESET", false))
-		igt_require(has_gpu_reset(fd));
 
 	param.ctx_id = ctx;
 	param.size = 0;
-- 
2.7.4

WARNING: multiple messages have this Message-ID (diff)
From: Ulrich Hecht <ulrich.hecht+renesas@gmail.com>
To: intel-gfx@lists.freedesktop.org
Cc: linux-renesas-soc@vger.kernel.org,
	Ulrich Hecht <ulrich.hecht+renesas@gmail.com>,
	laurent.pinchart@ideasonboard.com
Subject: [PATCH igt 4/8] lib/igt_gt: check for presence of GPU reset before using it
Date: Thu, 15 Mar 2018 15:45:40 +0100	[thread overview]
Message-ID: <1521125144-28614-5-git-send-email-ulrich.hecht+renesas@gmail.com> (raw)
In-Reply-To: <1521125144-28614-1-git-send-email-ulrich.hecht+renesas@gmail.com>

Fixes failed assertion on non-i915 devices.

Signed-off-by: Ulrich Hecht <ulrich.hecht+renesas@gmail.com>
---
 lib/igt_gt.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/igt_gt.c b/lib/igt_gt.c
index 9cb07c2..825ea52 100644
--- a/lib/igt_gt.c
+++ b/lib/igt_gt.c
@@ -166,14 +166,15 @@ igt_hang_t igt_allow_hang(int fd, unsigned ctx, unsigned flags)
 	struct drm_i915_gem_context_param param;
 	unsigned ban;
 
+	if (!igt_check_boolean_env_var("IGT_HANG_WITHOUT_RESET", false))
+		igt_require(has_gpu_reset(fd));
+
 	igt_assert(igt_sysfs_set_parameter
 		   (fd, "reset", "%d", INT_MAX /* any reset method */));
 
 	if (!igt_check_boolean_env_var("IGT_HANG", true))
 		igt_skip("hang injection disabled by user");
 	gem_context_require_bannable(fd);
-	if (!igt_check_boolean_env_var("IGT_HANG_WITHOUT_RESET", false))
-		igt_require(has_gpu_reset(fd));
 
 	param.ctx_id = ctx;
 	param.size = 0;
-- 
2.7.4

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

  parent reply	other threads:[~2018-03-15 14:46 UTC|newest]

Thread overview: 57+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-03-15 14:45 [PATCH igt 0/8] Non-Intel test suite fixes Ulrich Hecht
2018-03-15 14:45 ` Ulrich Hecht
2018-03-15 14:45 ` [PATCH igt 1/8] tests/kms_addfb_basic: skip i915-specific tests on other platforms Ulrich Hecht
2018-03-15 14:45   ` Ulrich Hecht
2018-03-16  8:51   ` [Intel-gfx] " Daniel Vetter
2018-03-16  8:51     ` Daniel Vetter
2018-03-20 11:24   ` Laurent Pinchart
2018-03-20 11:24     ` Laurent Pinchart
2018-03-15 14:45 ` [PATCH igt 2/8] tests/kms_panel_fitting: check for i915 before checking version Ulrich Hecht
2018-03-15 14:45   ` Ulrich Hecht
2018-03-16  8:51   ` [Intel-gfx] " Daniel Vetter
2018-03-16  8:51     ` Daniel Vetter
2018-03-20 11:24   ` Laurent Pinchart
2018-03-20 11:24     ` Laurent Pinchart
2018-03-21  8:34     ` [Intel-gfx] " Daniel Vetter
2018-03-21  8:34       ` Daniel Vetter
2018-03-21  8:52       ` [Intel-gfx] " Laurent Pinchart
2018-03-21  8:52         ` Laurent Pinchart
2018-03-27  6:41         ` [Intel-gfx] " Daniel Vetter
2018-03-27  6:41           ` Daniel Vetter
2018-03-15 14:45 ` [PATCH igt 3/8] lib/igt_gt: has_gpu_reset(): fix failed assertion on non-i915 platforms Ulrich Hecht
2018-03-15 14:45   ` Ulrich Hecht
2018-03-15 17:28   ` [Intel-gfx] " Ville Syrjälä
2018-03-15 17:28     ` Ville Syrjälä
2018-03-16  8:46     ` [Intel-gfx] " Daniel Vetter
2018-03-16  8:46       ` Daniel Vetter
2018-03-15 14:45 ` Ulrich Hecht [this message]
2018-03-15 14:45   ` [PATCH igt 4/8] lib/igt_gt: check for presence of GPU reset before using it Ulrich Hecht
2018-03-15 14:45 ` [PATCH igt 5/8] tests/kms_plane_lowres: skip i915-specific tests on other platforms Ulrich Hecht
2018-03-15 14:45   ` Ulrich Hecht
2018-03-15 17:33   ` [Intel-gfx] " Ville Syrjälä
2018-03-15 17:33     ` Ville Syrjälä
2018-03-15 14:45 ` [PATCH igt 6/8] lib/igt_pm: turn absence of autosuspend_delay_ms from fail to skip Ulrich Hecht
2018-03-15 14:45   ` Ulrich Hecht
2018-03-15 17:43   ` [Intel-gfx] " Ville Syrjälä
2018-03-15 17:43     ` Ville Syrjälä
2018-03-15 14:45 ` [PATCH igt 7/8] tests/kms_addfb_basic: size_tests(): reduce test buffer size Ulrich Hecht
2018-03-15 14:45   ` Ulrich Hecht
2018-03-16  8:53   ` [Intel-gfx] " Daniel Vetter
2018-03-16  8:53     ` Daniel Vetter
2018-03-15 14:45 ` [PATCH igt 8/8] test/kms_addfb_basic: tolerate absence of 8-bit format Ulrich Hecht
2018-03-15 14:45   ` Ulrich Hecht
2018-03-16  8:49   ` [Intel-gfx] " Daniel Vetter
2018-03-16  8:49     ` Daniel Vetter
2018-03-15 15:03 ` ✗ Fi.CI.BAT: failure for Non-Intel test suite fixes Patchwork
2018-03-16  8:55 ` [Intel-gfx] [PATCH igt 0/8] " Daniel Vetter
2018-03-16  8:55   ` Daniel Vetter
2018-03-19 16:41   ` [Intel-gfx] " Ulrich Hecht
2018-03-19 16:41     ` Ulrich Hecht
2018-03-20 11:32     ` [Intel-gfx] " Laurent Pinchart
2018-03-20 11:32       ` Laurent Pinchart
2018-03-21  8:37       ` [Intel-gfx] " Daniel Vetter
2018-03-21  8:37         ` Daniel Vetter
2018-04-27 16:03 ` Laurent Pinchart
2018-04-27 16:03   ` Laurent Pinchart
2018-05-08 16:03   ` Ulrich Hecht
2018-05-08 16:03     ` Ulrich Hecht

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=1521125144-28614-5-git-send-email-ulrich.hecht+renesas@gmail.com \
    --to=ulrich.hecht+renesas@gmail.com \
    --cc=intel-gfx@lists.freedesktop.org \
    --cc=laurent.pinchart@ideasonboard.com \
    --cc=linux-renesas-soc@vger.kernel.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.