From 25fbae15262cf570e207e62f50e7c5233e06bc67 Mon Sep 17 00:00:00 2001 From: Tomeu Vizoso Date: Tue, 21 Mar 2017 17:57:04 +0100 Subject: 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 --- tools/intel_display_poller.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'tools/intel_display_poller.c') diff --git a/tools/intel_display_poller.c b/tools/intel_display_poller.c index c501c79d..63c930fb 100644 --- a/tools/intel_display_poller.c +++ b/tools/intel_display_poller.c @@ -965,7 +965,6 @@ 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; @@ -1187,10 +1186,7 @@ int main(int argc, char *argv[]) break; } - /* 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); + intel_register_access_init(intel_get_pci_device(), 0); printf("%s?\n", test_name(test, pipe, bit, test_pixelcount)); @@ -1267,8 +1263,6 @@ int main(int argc, char *argv[]) intel_register_access_fini(); - close(drm_fd); - if (quit) return 0; -- cgit v1.2.3