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_display_poller.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_display_poller.c')
| -rw-r--r-- | tools/intel_display_poller.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/tools/intel_display_poller.c b/tools/intel_display_poller.c index 63c930fb..c501c79d 100644 --- a/tools/intel_display_poller.c +++ b/tools/intel_display_poller.c @@ -965,6 +965,7 @@ int main(int argc, char *argv[]) int pipe = 0, bit = 0, target_scanline = 0, target_fuzz = 1; bool test_pixelcount = false; uint32_t devid; + int drm_fd; uint32_t min[2*128] = {}; uint32_t max[2*128] = {}; uint32_t a, b; @@ -1186,7 +1187,10 @@ int main(int argc, char *argv[]) break; } - intel_register_access_init(intel_get_pci_device(), 0); + /* Just to make sure we open the right debugfs files */ + drm_fd = drm_open_driver_master(DRIVER_INTEL); + + intel_register_access_init(intel_get_pci_device(), 0, drm_fd); printf("%s?\n", test_name(test, pipe, bit, test_pixelcount)); @@ -1263,6 +1267,8 @@ int main(int argc, char *argv[]) intel_register_access_fini(); + close(drm_fd); + if (quit) return 0; |