diff options
author | Michał Winiarski <michal.winiarski@intel.com> | 2019-03-12 13:48:13 +0100 |
---|---|---|
committer | Michał Winiarski <michal.winiarski@intel.com> | 2019-03-20 10:36:36 +0100 |
commit | 8ae86621d6fff60b6e20c6b0f9b336785c935b0f (patch) | |
tree | 12d83d267f5dafb16bcef5edec173ff57cf4dfbd /tools/intel_perf_counters.c | |
parent | 1bbe0b11a40cbb8433a3863745b7023e54c36ae3 (diff) |
lib/igt_device: Move intel_get_pci_device under igt_device
It allows us to make things a little bit more generic. Also, we now
require fd rather than doing guesswork when it comes to pci address.
v2: Use readlinkat rather than string concat, move stuff around, provide
a version that does not assert. (Chris)
v3: Print addr on failure, avoid assignment in conditionals. (Chris)
Signed-off-by: Michał Winiarski <michal.winiarski@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'tools/intel_perf_counters.c')
-rw-r--r-- | tools/intel_perf_counters.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/intel_perf_counters.c b/tools/intel_perf_counters.c index 50c4bce6..105a0924 100644 --- a/tools/intel_perf_counters.c +++ b/tools/intel_perf_counters.c @@ -45,6 +45,7 @@ #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" @@ -483,7 +484,7 @@ main(int argc, char **argv) if (oacontrol) { /* Forcewake */ - intel_register_access_init(intel_get_pci_device(), 0, fd); + intel_register_access_init(igt_device_get_pci_device(fd), 0, fd); /* Enable performance counters */ intel_register_write(OACONTROL, |