From 83884e97e18739e3588c6467a210838099d42073 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Tue, 21 Mar 2017 17:16:03 +0000 Subject: Restore "lib: Open debugfs files for the given DRM device" This reverts commit 25fbae15262cf570e207e62f50e7c5233e06bc67, restoring commit 301ad44cdf1b868b1ab89096721da91fa8541fdc Author: Tomeu Vizoso 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 --- tools/intel_panel_fitter.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'tools/intel_panel_fitter.c') diff --git a/tools/intel_panel_fitter.c b/tools/intel_panel_fitter.c index 5519361e..48b2fd89 100644 --- a/tools/intel_panel_fitter.c +++ b/tools/intel_panel_fitter.c @@ -33,6 +33,7 @@ #include "intel_io.h" #include "intel_chipset.h" #include "intel_reg.h" +#include "drmtest.h" int gen; @@ -265,7 +266,7 @@ static void print_usage(void) int main (int argc, char *argv[]) { - int opt; + int opt, drm_fd; int ret = 0; char intel_pipe = '\0'; int x = 0, y = 0; @@ -278,8 +279,11 @@ 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); + intel_register_access_init(pci_dev, 0, drm_fd); devid = pci_dev->device_id; if (!HAS_PCH_SPLIT(devid)) { @@ -342,5 +346,6 @@ int main (int argc, char *argv[]) out: intel_register_access_fini(); + close(drm_fd); return ret; } -- cgit v1.2.3