diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2017-03-21 17:16:03 +0000 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2017-03-21 17:36:02 +0000 |
| commit | 83884e97e18739e3588c6467a210838099d42073 (patch) | |
| tree | 778bab4b309c852d3649cc901952267d0cbb5992 /tests/gem_tiled_swapping.c | |
| parent | 25fbae15262cf570e207e62f50e7c5233e06bc67 (diff) | |
Restore "lib: Open debugfs files for the given DRM device"
This reverts commit 25fbae15262cf570e207e62f50e7c5233e06bc67, restoring
commit 301ad44cdf1b868b1ab89096721da91fa8541fdc
Author: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Date: Thu Mar 2 10:37:11 2017 +0100
lib: Open debugfs files for the given DRM device
with fixes.
Signed-off-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); |