diff options
author | Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com> | 2016-03-01 11:01:32 +0000 |
---|---|---|
committer | Mika Kuoppala <mika.kuoppala@intel.com> | 2016-03-01 16:57:00 +0200 |
commit | 03c7f84eb1c95b9761bbff3c9fcaed8472c3c6fb (patch) | |
tree | 84de6693b6e50b5f2d196dbe4102030dc3b70e21 /tests/gem_eio.c | |
parent | 094e0cbabb9615c87d8e813a91f158fe439b536d (diff) |
lib: move i915_wedged_set to ig_gt.c
Upcoming tests will call it to recover from bad states caused by
hangcheck bugs.the function was renamed to igt_force_gpu_reset to have a
naming closer to other hang-related functions in the same file.
The value written to the debugfs has also been changed to -1; this makes
no differences with the current implementation but copes with upcoming
TDR changes (still under discussion) that should allow the resetting of
a mask of rings.
Signed-off-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Signed-off-by: Mika Kuoppala <mika.kuoppala@intel.com>
Diffstat (limited to 'tests/gem_eio.c')
-rw-r--r-- | tests/gem_eio.c | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/tests/gem_eio.c b/tests/gem_eio.c index d209816c..ab3facc7 100644 --- a/tests/gem_eio.c +++ b/tests/gem_eio.c @@ -58,24 +58,9 @@ static bool i915_reset_control(bool enable) return ret; } -static bool i915_wedged_set(void) -{ - int fd, ret; - - igt_debug("Triggering GPU reset\n"); - - fd = igt_debugfs_open("i915_wedged", O_RDWR); - igt_require(fd >= 0); - - ret = write(fd, "1\n", 2) == 2; - close(fd); - - return ret; -} - static void trigger_reset(int fd) { - igt_assert(i915_wedged_set()); + igt_force_gpu_reset(); /* And just check the gpu is indeed running again */ igt_debug("Checking that the GPU recovered\n"); |