From: Antonio Argenziano <antonio.argenziano@intel.com>
To: intel-gfx@lists.freedesktop.org
Subject: [PATCH i-g-t v2] tests/gem_reset_stats: Fix retrieval of hangcheck stats expectation
Date: Wed, 13 Dec 2017 16:48:10 -0800 [thread overview]
Message-ID: <20171214004810.23305-1-antonio.argenziano@intel.com> (raw)
The test expected IOCTL 'I915_GET_RESET_STATS' would return an error
when not root. That is no longer true in the driver since commit
4c9c0d09741d ("drm/i915: Fix retrieval of hangcheck stats") and therefore
the test was incorrectly failing.
v2:
- Add the commit that changed the behaviour in the Driver to the
commit message (Michel)
Cc: Michel Thierry <michel.thierry@intel.com>
Cc: Arkadiusz Hiler <arkadiusz.hiler@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Antonio Argenziano <antonio.argenziano@intel.com>
---
tests/gem_reset_stats.c | 25 +++++++++++++++++--------
1 file changed, 17 insertions(+), 8 deletions(-)
diff --git a/tests/gem_reset_stats.c b/tests/gem_reset_stats.c
index edc40767..0c36a7eb 100644
--- a/tests/gem_reset_stats.c
+++ b/tests/gem_reset_stats.c
@@ -605,10 +605,7 @@ static void test_reset_count(const struct intel_execution_engine *e,
c2 = get_reset_count(fd, ctx);
- if (ctx == 0)
- igt_assert(c2 == -EPERM);
- else
- igt_assert(c2 == 0);
+ igt_assert(c2 == 0);
}
igt_waitchildren();
@@ -619,6 +616,11 @@ static void test_reset_count(const struct intel_execution_engine *e,
close(fd);
}
+static int __get_reset_stats(int fd, struct local_drm_i915_reset_stats *rs)
+{
+ return drmIoctl(fd, GET_RESET_STATS_IOCTL, &rs);
+}
+
static int _test_params(int fd, int ctx, uint32_t flags, uint32_t pad)
{
struct local_drm_i915_reset_stats rs;
@@ -644,10 +646,17 @@ static void _check_param_ctx(const int fd, const int ctx, const cap_t cap)
const uint32_t bad = rand() + 1;
if (ctx == 0) {
- if (cap == root)
- igt_assert_eq(_test_params(fd, ctx, 0, 0), 0);
- else
- igt_assert_eq(_test_params(fd, ctx, 0, 0), -EPERM);
+ igt_assert_eq(_test_params(fd, ctx, 0, 0), 0);
+
+ if (cap != root) {
+ struct local_drm_i915_reset_stats rs;
+ rs.ctx_id = ctx;
+ rs.reset_count = rand();
+ rs.batch_active = rand();
+ rs.batch_pending = rand();
+ igt_assert(__get_reset_stats(fd, &rs));
+ igt_assert(rs.reset_count != 0);
+ }
}
igt_assert_eq(_test_params(fd, ctx, 0, bad), -EINVAL);
--
2.14.2
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next reply other threads:[~2017-12-14 0:48 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-12-14 0:48 Antonio Argenziano [this message]
2017-12-14 1:07 ` ✓ Fi.CI.BAT: success for tests/gem_reset_stats: Fix retrieval of hangcheck stats expectation (rev2) Patchwork
2017-12-14 1:52 ` ✗ Fi.CI.IGT: warning " Patchwork
2018-01-16 18:44 ` [PATCH i-g-t v2] tests/gem_reset_stats: Fix retrieval of hangcheck stats expectation Antonio Argenziano
2018-01-16 19:11 ` Michel Thierry
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=20171214004810.23305-1-antonio.argenziano@intel.com \
--to=antonio.argenziano@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 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.