diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2016-07-04 08:38:48 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2016-07-04 08:39:58 +0100 |
| commit | c2893a90365d101d0a07de8bd5b882d53817bb19 (patch) | |
| tree | 7df79fb16e7a6cf87b77b459f7859f3129bb7a6f /lib/igt_gt.c | |
| parent | 376b813e7c60826357034f4ea40ffada514fbdc3 (diff) | |
lib: Enable squelching of simulated error states
If the error state just contains the hanging batch, and we are not
verifying the error capture, tell the kernel to ignore it.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'lib/igt_gt.c')
| -rw-r--r-- | lib/igt_gt.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/lib/igt_gt.c b/lib/igt_gt.c index a3d6a731..0d899a65 100644 --- a/lib/igt_gt.c +++ b/lib/igt_gt.c @@ -38,9 +38,7 @@ #include "intel_reg.h" #include "intel_chipset.h" -#if NEW_CONTEXT_PARAM_NO_ERROR_CAPTURE_API #define LOCAL_CONTEXT_PARAM_NO_ERROR_CAPTURE 0x4 -#endif /** * SECTION:igt_gt @@ -150,7 +148,6 @@ igt_hang_ring_t igt_hang_ctx(int fd, param.size = 0; if ((flags & HANG_ALLOW_CAPTURE) == 0) { -#if NEW_CONTEXT_PARAM_NO_ERROR_CAPTURE_API param.param = LOCAL_CONTEXT_PARAM_NO_ERROR_CAPTURE; param.value = 1; /* Older kernels may not have NO_ERROR_CAPTURE, in which case @@ -158,7 +155,6 @@ igt_hang_ring_t igt_hang_ctx(int fd, * the right one). */ __gem_context_set_param(fd, ¶m); -#endif } param.param = LOCAL_CONTEXT_PARAM_BAN_PERIOD; @@ -277,14 +273,10 @@ void igt_post_hang_ring(int fd, struct igt_hang_ring arg) gem_context_set_param(fd, ¶m); if ((arg.flags & HANG_ALLOW_CAPTURE) == 0) { -#if NEW_CONTEXT_PARAM_NO_ERROR_CAPTURE_API param.param = LOCAL_CONTEXT_PARAM_NO_ERROR_CAPTURE; param.value = 0; if (__gem_context_set_param(fd, ¶m)) eat_error_state(); -#else - eat_error_state(); -#endif } } |