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_panel_fitter.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'tools/intel_panel_fitter.c') diff --git a/tools/intel_panel_fitter.c b/tools/intel_panel_fitter.c index 48b2fd89..5519361e 100644 --- a/tools/intel_panel_fitter.c +++ b/tools/intel_panel_fitter.c @@ -33,7 +33,6 @@ #include "intel_io.h" #include "intel_chipset.h" #include "intel_reg.h" -#include "drmtest.h" int gen; @@ -266,7 +265,7 @@ static void print_usage(void) int main (int argc, char *argv[]) { - int opt, drm_fd; + int opt; int ret = 0; char intel_pipe = '\0'; int x = 0, y = 0; @@ -279,11 +278,8 @@ int main (int argc, char *argv[]) "with overscan compensation properties: it is just a temporary " "solution that may or may not work. Use it at your own risk.\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); devid = pci_dev->device_id; if (!HAS_PCH_SPLIT(devid)) { @@ -346,6 +342,5 @@ int main (int argc, char *argv[]) out: intel_register_access_fini(); - close(drm_fd); return ret; } -- cgit v1.2.3