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/pm_sseu.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/pm_sseu.c')
| -rw-r--r-- | tests/pm_sseu.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/tests/pm_sseu.c b/tests/pm_sseu.c index 3e60a5f8..317bb261 100644 --- a/tests/pm_sseu.c +++ b/tests/pm_sseu.c @@ -35,6 +35,19 @@ IGT_TEST_DESCRIPTION("Tests slice/subslice/EU power gating functionality.\n"); +struct { + int init; + int drm_fd; + int devid; + int gen; + int has_ppgtt; + drm_intel_bufmgr *bufmgr; + struct intel_batchbuffer *batch; + igt_media_spinfunc_t spinfunc; + struct igt_buf buf; + uint32_t spins_per_msec; +} gem; + static double to_dt(const struct timespec *start, const struct timespec *end) { @@ -174,7 +187,7 @@ dbg_get_status(struct status *stat) static void dbg_init(void) { - dbg.status_fd = igt_debugfs_open("i915_sseu_status", O_RDONLY); + dbg.status_fd = igt_debugfs_open(gem.drm_fd, "i915_sseu_status", O_RDONLY); igt_skip_on_f(dbg.status_fd == -1, "debugfs entry 'i915_sseu_status' not found\n"); dbg.init = 1; @@ -190,19 +203,6 @@ dbg_deinit(void) } } -struct { - int init; - int drm_fd; - int devid; - int gen; - int has_ppgtt; - drm_intel_bufmgr *bufmgr; - struct intel_batchbuffer *batch; - igt_media_spinfunc_t spinfunc; - struct igt_buf buf; - uint32_t spins_per_msec; -} gem; - static void gem_check_spin(uint32_t spins) { |