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 /tools/intel_infoframes.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 'tools/intel_infoframes.c')
| -rw-r--r-- | tools/intel_infoframes.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/tools/intel_infoframes.c b/tools/intel_infoframes.c index e03cb2c0..813430c9 100644 --- a/tools/intel_infoframes.c +++ b/tools/intel_infoframes.c @@ -1081,6 +1081,7 @@ 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; @@ -1107,8 +1108,11 @@ 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); + intel_register_access_init(pci_dev, 0, drm_fd); intel_check_pch(); if (IS_GEN4(pci_dev->device_id)) @@ -1257,5 +1261,6 @@ int main(int argc, char *argv[]) out: intel_register_access_fini(); + close(drm_fd); return ret; } |