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_infoframes.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_infoframes.c')
| -rw-r--r-- | tools/intel_infoframes.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/tools/intel_infoframes.c b/tools/intel_infoframes.c index 813430c9..e03cb2c0 100644 --- a/tools/intel_infoframes.c +++ b/tools/intel_infoframes.c @@ -1081,7 +1081,6 @@ printf("Options:\n" int main(int argc, char *argv[]) { int opt; - int drm_fd; int ret = 0; Transcoder transcoder = TRANSC_INVALID; DipType dip = DIP_INVALID; @@ -1108,11 +1107,8 @@ int main(int argc, char *argv[]) printf("WARNING: This is just a debugging tool! Don't expect it to work" " perfectly: the Kernel might undo our changes.\n"); - /* Just to make sure we open the right debugfs files */ - drm_fd = drm_open_driver_master(DRIVER_INTEL); - pci_dev = intel_get_pci_device(); - intel_register_access_init(pci_dev, 0, drm_fd); + intel_register_access_init(pci_dev, 0); intel_check_pch(); if (IS_GEN4(pci_dev->device_id)) @@ -1261,6 +1257,5 @@ int main(int argc, char *argv[]) out: intel_register_access_fini(); - close(drm_fd); return ret; } |