diff options
| author | Tomeu Vizoso <tomeu.vizoso@collabora.com> | 2017-03-21 17:57:04 +0100 |
|---|---|---|
| committer | Tomeu Vizoso <tomeu.vizoso@collabora.com> | 2017-03-21 18:01:13 +0100 |
| commit | 25fbae15262cf570e207e62f50e7c5233e06bc67 (patch) | |
| tree | 56c91c2dbf6b5a205a7ad9cc7a098c00dae82e84 /tests/gem_tiled_swapping.c | |
| parent | 7be509c411db2b35f6593e41222b0ad4c0e764e0 (diff) | |
Revert "lib: Open debugfs files for the given DRM device"
This reverts commit 301ad44cdf1b868b1ab89096721da91fa8541fdc.
When a render-only device is opened and gem_quiescent_gpu is called, we
need to use the debugfs dir for the master device instead.
Signed-off-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Diffstat (limited to 'tests/gem_tiled_swapping.c')
| -rw-r--r-- | tests/gem_tiled_swapping.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/tests/gem_tiled_swapping.c b/tests/gem_tiled_swapping.c index dce66806..b5849bc1 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(int fd) +static void check_memory_layout(void) { - igt_skip_on_f(igt_debugfs_search(fd, "i915_swizzle_info", "L-shaped"), + igt_skip_on_f(igt_debugfs_search("i915_swizzle_info", "L-shaped"), "L-shaped memory configuration detected\n"); igt_debug("normal memory configuration detected, continuing\n"); @@ -173,10 +173,11 @@ igt_main current_tiling_mode = I915_TILING_X; + intel_purge_vm_caches(); + fd = drm_open_driver(DRIVER_INTEL); - intel_purge_vm_caches(fd); - check_memory_layout(fd); + check_memory_layout(); /* lock RAM, leaving only 512MB available */ lock_size = max(0, intel_get_total_ram_mb() - AVAIL_RAM); |