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_reg.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'tools/intel_reg.c') diff --git a/tools/intel_reg.c b/tools/intel_reg.c index 7b58d0b8..01a3671e 100644 --- a/tools/intel_reg.c +++ b/tools/intel_reg.c @@ -32,7 +32,6 @@ #include #include -#include "igt.h" #include "intel_io.h" #include "intel_chipset.h" @@ -58,7 +57,6 @@ struct config { struct pci_device *pci_dev; char *mmiofile; uint32_t devid; - int drm_fd; /* read: number of registers to read */ uint32_t count; @@ -411,7 +409,7 @@ static int intel_reg_read(struct config *config, int argc, char *argv[]) if (config->mmiofile) intel_mmio_use_dump_file(config->mmiofile); else - intel_register_access_init(config->pci_dev, 0, config->drm_fd); + intel_register_access_init(config->pci_dev, 0); for (i = 1; i < argc; i++) { struct reg reg; @@ -441,7 +439,7 @@ static int intel_reg_write(struct config *config, int argc, char *argv[]) return EXIT_FAILURE; } - intel_register_access_init(config->pci_dev, 0, config->drm_fd); + intel_register_access_init(config->pci_dev, 0); for (i = 1; i < argc; i += 2) { struct reg reg; @@ -479,7 +477,7 @@ static int intel_reg_dump(struct config *config, int argc, char *argv[]) if (config->mmiofile) intel_mmio_use_dump_file(config->mmiofile); else - intel_register_access_init(config->pci_dev, 0, config->drm_fd); + intel_register_access_init(config->pci_dev, 0); for (i = 0; i < config->regcount; i++) { reg = &config->regs[i]; @@ -879,9 +877,6 @@ int main(int argc, char *argv[]) config.devid = config.pci_dev->device_id; } - /* Just to make sure we open the right debugfs files */ - config.drm_fd = drm_open_driver_master(DRIVER_INTEL); - if (read_reg_spec(&config) < 0) { return EXIT_FAILURE; } @@ -900,7 +895,6 @@ int main(int argc, char *argv[]) ret = command->function(&config, argc, argv); - close(config.drm_fd); free(config.mmiofile); return ret; -- cgit v1.2.3