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 /benchmarks | |
| 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 'benchmarks')
| -rw-r--r-- | benchmarks/gem_latency.c | 4 | ||||
| -rw-r--r-- | benchmarks/gem_wsim.c | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/benchmarks/gem_latency.c b/benchmarks/gem_latency.c index a20bbf8a..c3fc4bf0 100644 --- a/benchmarks/gem_latency.c +++ b/benchmarks/gem_latency.c @@ -44,8 +44,6 @@ #include <sys/resource.h> #include "drm.h" -#include "igt_device.h" - #define LOCAL_I915_EXEC_FENCE_IN (1<<16) #define LOCAL_I915_EXEC_FENCE_OUT (1<<17) @@ -458,7 +456,7 @@ static int run(int seconds, if (gen < 6) return IGT_EXIT_SKIP; /* Needs BCS timestamp */ - intel_register_access_init(igt_device_get_pci_device(fd), false, fd); + intel_register_access_init(intel_get_pci_device(), false, fd); if (gen == 6) timestamp_reg = REG(RCS_TIMESTAMP); diff --git a/benchmarks/gem_wsim.c b/benchmarks/gem_wsim.c index 21e26686..afb9644d 100644 --- a/benchmarks/gem_wsim.c +++ b/benchmarks/gem_wsim.c @@ -41,6 +41,7 @@ #include <limits.h> #include <pthread.h> + #include "intel_chipset.h" #include "intel_reg.h" #include "drm.h" @@ -49,7 +50,6 @@ #include "intel_io.h" #include "igt_aux.h" -#include "igt_device.h" #include "igt_rand.h" #include "igt_perf.h" #include "sw_sync.h" @@ -2223,7 +2223,7 @@ static void init_clocks(void) uint32_t rcs_start, rcs_end; double overhead, t; - intel_register_access_init(igt_device_get_pci_device(fd), false, fd); + intel_register_access_init(intel_get_pci_device(), false, fd); if (verbose <= 1) return; |