Commit 092273f6 authored by Chris Wilson's avatar Chris Wilson 😣

lib: Restore the i915.reset modparam before cleaning up

We force a reset on test exit so that we can rapidly cleanup after a
naughty test, it is not unknown for us to leave a queue of hanging
batches around. However, if we have also fiddled with the i915.reset
parameter in the meantime, this can leave the kernel unable to fulfil
our request (and those naughty batches continue to disrupt testing).
Signed-off-by: Chris Wilson's avatarChris Wilson <chris@chris-wilson.co.uk>
Cc: Mika Kuoppala <mika.kuoppala@intel.com>
Cc: Petri Latvala <petri.latvala@intel.com>
Acked-by: Antonio Argenziano's avatarAntonio Argenziano <antonio.argenziano@intel.com>
parent edf2930c
Pipeline #20024 canceled with stages
......@@ -54,6 +54,7 @@
#include "igt_device.h"
#include "igt_gt.h"
#include "igt_kmod.h"
#include "igt_sysfs.h"
#include "version.h"
#include "config.h"
#include "intel_reg.h"
......@@ -345,6 +346,7 @@ static void __cancel_work_at_exit(int fd)
{
igt_terminate_spin_batches(); /* for older kernels */
igt_sysfs_set_parameter(fd, "reset", "%x", -1u /* any method */);
igt_drop_caches_set(fd,
/* cancel everything */
DROP_RESET_ACTIVE | DROP_RESET_SEQNO |
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment