summaryrefslogtreecommitdiff
path: root/tools/intel_infoframes.c
diff options
context:
space:
mode:
authorVille Syrjälä <ville.syrjala@linux.intel.com>2019-03-27 20:52:52 +0200
committerVille Syrjälä <ville.syrjala@linux.intel.com>2019-03-29 22:23:27 +0200
commite408d569973b610ba4aafdba016c48b25e563468 (patch)
treee3e1050d63918d053369c7669b62097d501a0451 /tools/intel_infoframes.c
parent1ac3264e0370134d06e2cff211c0da4aa5c7d83b (diff)
Revert "lib/igt_device: Move intel_get_pci_device under igt_device"
One significant usecase for intel_reg/etc. is to be able to examine the hardware state *before* loading the driver. If the tool forces the driver to load we've totally lost that capability. This reverts commit 8ae86621d6fff60b6e20c6b0f9b336785c935b0f. Cc: Michał Winiarski <michal.winiarski@intel.com> Cc: Chris Wilson <chris@chris-wilson.co.uk> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Acked-by: Jani Nikula <jani.nikula@intel.com> Acked-by: Michał Winiarski <michal.winiarski@intel.com>
Diffstat (limited to 'tools/intel_infoframes.c')
-rw-r--r--tools/intel_infoframes.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/tools/intel_infoframes.c b/tools/intel_infoframes.c
index 9129572a..2ef5d4fd 100644
--- a/tools/intel_infoframes.c
+++ b/tools/intel_infoframes.c
@@ -30,7 +30,6 @@
#include <stdlib.h>
#include <string.h>
#include <getopt.h>
-#include "igt_device.h"
#include "intel_io.h"
#include "intel_chipset.h"
#include "drmtest.h"
@@ -1082,7 +1081,6 @@ printf("Options:\n"
int main(int argc, char *argv[])
{
int opt;
- int fd;
int ret = 0;
Transcoder transcoder = TRANSC_INVALID;
DipType dip = DIP_INVALID;
@@ -1109,10 +1107,7 @@ int main(int argc, char *argv[])
printf("WARNING: This is just a debugging tool! Don't expect it to work"
" perfectly: the Kernel might undo our changes.\n");
- fd = drm_open_driver(DRIVER_INTEL);
- pci_dev = igt_device_get_pci_device(fd);
- close(fd);
-
+ pci_dev = intel_get_pci_device();
intel_register_access_init(pci_dev, 0, -1);
intel_check_pch();