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 /tools/intel_forcewaked.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 'tools/intel_forcewaked.c')
| -rw-r--r-- | tools/intel_forcewaked.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/tools/intel_forcewaked.c b/tools/intel_forcewaked.c index aa8e3f8b..01ca0253 100644 --- a/tools/intel_forcewaked.c +++ b/tools/intel_forcewaked.c @@ -36,7 +36,6 @@ #include <unistd.h> #include "intel_io.h" #include "intel_chipset.h" -#include "drmtest.h" bool daemonized; @@ -64,7 +63,6 @@ is_alive(void) { int main(int argc, char *argv[]) { - int drm_fd; int ret; if (argc > 2 || (argc == 2 && !strncmp(argv[1], "-h", 2))) { @@ -81,10 +79,7 @@ int main(int argc, char *argv[]) INFO_PRINT("started daemon"); } - /* Just to make sure we open the right debugfs files */ - drm_fd = drm_open_driver_master(DRIVER_INTEL); - - ret = intel_register_access_init(intel_get_pci_device(), 1, drm_fd); + ret = intel_register_access_init(intel_get_pci_device(), 1); if (ret) { INFO_PRINT("Couldn't init register access\n"); exit(1); @@ -95,14 +90,13 @@ int main(int argc, char *argv[]) if (!is_alive()) { INFO_PRINT("gpu reset? restarting daemon\n"); intel_register_access_fini(); - ret = intel_register_access_init(intel_get_pci_device(), 1, drm_fd); + ret = intel_register_access_init(intel_get_pci_device(), 1); if (ret) INFO_PRINT("Reg access init fail\n"); } sleep(1); } intel_register_access_fini(); - close(drm_fd); INFO_PRINT("Forcewake unlock\n"); if (daemonized) { |