diff options
| author | Tomeu Vizoso <tomeu.vizoso@collabora.com> | 2017-03-02 10:37:11 +0100 |
|---|---|---|
| committer | Tomeu Vizoso <tomeu.vizoso@collabora.com> | 2017-03-21 15:50:54 +0100 |
| commit | 301ad44cdf1b868b1ab89096721da91fa8541fdc (patch) | |
| tree | ef18781db6cadae7f8f49f1fc449dc56b33448ec /tests/drv_hangman.c | |
| parent | e7a0d06730f77842998368660fb45fe5c1738fda (diff) | |
lib: Open debugfs files for the given DRM device
When opening a DRM debugfs file, locate the right path based on the
given DRM device FD.
This is needed so, in setups with more than one DRM device, any
operations on debugfs files affect the expected DRM device.
v2: - rebased and fixed new API additions
v3: - updated chamelium test, which was missed previously
- use the minor of the device for the debugfs path, not the major
- have a proper exit handler for calling igt_hpd_storm_reset with the
right device fd.
Signed-off-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Reviewed-by: Robert Foss <robert.foss@collabora.com>
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'tests/drv_hangman.c')
| -rw-r--r-- | tests/drv_hangman.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/drv_hangman.c b/tests/drv_hangman.c index b8c6b87f..0551ec16 100644 --- a/tests/drv_hangman.c +++ b/tests/drv_hangman.c @@ -88,7 +88,7 @@ static void test_error_state_basic(void) assert_error_state_clear(); /* Manually trigger a hang by request a reset */ - fd = igt_debugfs_open("i915_wedged", O_WRONLY); + fd = igt_debugfs_open(device, "i915_wedged", O_WRONLY); igt_ignore_warn(write(fd, "1\n", 2)); close(fd); @@ -224,7 +224,7 @@ static void hangcheck_unterminated(void) gem_execbuf(device, &execbuf); if (gem_wait(device, handle, &timeout_ns) != 0) { /* need to manually trigger an hang to clean before failing */ - igt_force_gpu_reset(); + igt_force_gpu_reset(device); igt_assert_f(0, "unterminated batch did not trigger an hang!"); } } |