From c83299d1fda4b8c67562999d61817177d422d52e Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Mon, 15 Jun 2015 14:51:54 +0100 Subject: lib: Use HAS_GPU_RESET rather than opencode our guess Uses kernel commit 49e4d842f0d0892c3d26c93a81b9f22c1467030e Author: Chris Wilson Date: Mon Jun 15 12:23:48 2015 +0100 drm/i915: Report to userspace if we have a (presumed) working GPU reset to determine whether the kernel has a working GPU reset before injecting a hang (and so skip tests requring hang recovery if not available). --- lib/igt_gt.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) (limited to 'lib/igt_gt.c') diff --git a/lib/igt_gt.c b/lib/igt_gt.c index deb55606..1dcc3c3b 100644 --- a/lib/igt_gt.c +++ b/lib/igt_gt.c @@ -26,6 +26,7 @@ #include #include #include +#include #include #include "drmtest.h" @@ -47,6 +48,20 @@ * engines. */ +static bool has_gpu_reset(int fd) +{ + struct drm_i915_getparam gp; + int val = 0; + + memset(&gp, 0, sizeof(gp)); + gp.param = 35; /* HAS_GPU_RESET */ + gp.value = &val; + + if (ioctl(fd, DRM_IOCTL_I915_GETPARAM, &gp)) + return intel_gen(intel_get_drm_devid(fd)) >= 5; + + return val > 0; +} /** * igt_require_hang_ring: @@ -60,7 +75,7 @@ void igt_require_hang_ring(int fd, int ring) { gem_context_require_ban_period(fd); - igt_require(intel_gen(intel_get_drm_devid(fd)) >= 5); + igt_require(has_gpu_reset(fd)); } /** -- cgit v1.2.3