On 1/16/2018 12:56 PM, Antonio Argenziano wrote:
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) v3: - Reuse get_reset_count instead of implementing a new function. (Michel) Cc: Michel Thierry <[email protected]> Cc: Arkadiusz Hiler <[email protected]> Cc: Chris Wilson <[email protected]> Signed-off-by: Antonio Argenziano <[email protected]> --- tests/gem_reset_stats.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/tests/gem_reset_stats.c b/tests/gem_reset_stats.c index edc40767..17a9b648 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();@@ -644,10 +641,11 @@ 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) { + igt_assert(get_reset_count(fd, ctx) == 0); + } }igt_assert_eq(_test_params(fd, ctx, 0, bad), -EINVAL);
This matches the driver's current behavior, which is better than testing for something that is no longer true. Based on that,
Reviewed-by: Michel Thierry <[email protected]> _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
