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/gem_tiled_swapping.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/gem_tiled_swapping.c')
-rw-r--r-- | tests/gem_tiled_swapping.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/tests/gem_tiled_swapping.c b/tests/gem_tiled_swapping.c index b5849bc1..dce66806 100644 --- a/tests/gem_tiled_swapping.c +++ b/tests/gem_tiled_swapping.c @@ -155,9 +155,9 @@ static void thread_fini(struct thread *t) free(t->idx_arr); } -static void check_memory_layout(void) +static void check_memory_layout(int fd) { - igt_skip_on_f(igt_debugfs_search("i915_swizzle_info", "L-shaped"), + igt_skip_on_f(igt_debugfs_search(fd, "i915_swizzle_info", "L-shaped"), "L-shaped memory configuration detected\n"); igt_debug("normal memory configuration detected, continuing\n"); @@ -173,11 +173,10 @@ igt_main current_tiling_mode = I915_TILING_X; - intel_purge_vm_caches(); - fd = drm_open_driver(DRIVER_INTEL); - check_memory_layout(); + intel_purge_vm_caches(fd); + check_memory_layout(fd); /* lock RAM, leaving only 512MB available */ lock_size = max(0, intel_get_total_ram_mb() - AVAIL_RAM); |