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 /lib/intel_os.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 'lib/intel_os.c')
| -rw-r--r-- | lib/intel_os.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/lib/intel_os.c b/lib/intel_os.c index e5dea6e5..924ac7e7 100644 --- a/lib/intel_os.c +++ b/lib/intel_os.c @@ -97,11 +97,8 @@ intel_get_avail_ram_mb(void) #ifdef HAVE_STRUCT_SYSINFO_TOTALRAM /* Linux */ struct sysinfo sysinf; - int fd; - fd = drm_open_driver(DRIVER_INTEL); - intel_purge_vm_caches(fd); - close(fd); + intel_purge_vm_caches(); igt_assert(sysinfo(&sysinf) == 0); retval = sysinf.freeram; @@ -295,11 +292,11 @@ void intel_require_memory(uint64_t count, uint64_t size, unsigned mode) igt_skip_on_simulation(); } -void intel_purge_vm_caches(int drm_fd) +void intel_purge_vm_caches(void) { int fd; - igt_drop_caches_set(drm_fd, DROP_SHRINK_ALL); + igt_drop_caches_set(DROP_SHRINK_ALL); fd = open("/proc/sys/vm/drop_caches", O_WRONLY); if (fd >= 0) { |