diff options
author | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2019-03-27 20:52:52 +0200 |
---|---|---|
committer | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2019-03-29 22:23:27 +0200 |
commit | e408d569973b610ba4aafdba016c48b25e563468 (patch) | |
tree | e3e1050d63918d053369c7669b62097d501a0451 /tools/intel_perf_counters.c | |
parent | 1ac3264e0370134d06e2cff211c0da4aa5c7d83b (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_perf_counters.c')
-rw-r--r-- | tools/intel_perf_counters.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tools/intel_perf_counters.c b/tools/intel_perf_counters.c index 105a0924..50c4bce6 100644 --- a/tools/intel_perf_counters.c +++ b/tools/intel_perf_counters.c @@ -45,7 +45,6 @@ #include "drm.h" #include "i915_drm.h" #include "drmtest.h" -#include "igt_device.h" #include "intel_io.h" #include "intel_bufmgr.h" #include "intel_batchbuffer.h" @@ -484,7 +483,7 @@ main(int argc, char **argv) if (oacontrol) { /* Forcewake */ - intel_register_access_init(igt_device_get_pci_device(fd), 0, fd); + intel_register_access_init(intel_get_pci_device(), 0, fd); /* Enable performance counters */ intel_register_write(OACONTROL, |