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>
diff --git a/tests/i915/gem_concurrent_all.c b/tests/i915/gem_concurrent_all.c
index f719b0a..6049372 100644
--- a/tests/i915/gem_concurrent_all.c
+++ b/tests/i915/gem_concurrent_all.c
@@ -1850,7 +1850,7 @@
c->name, s->name, "small");
igt_subtest_group {
igt_fixture {
- count = num_buffers(gem_mappable_aperture_size(fd)/4,
+ count = num_buffers(gem_mappable_aperture_size()/4,
s, c, CHECK_RAM);
}
run_modes(name, c, modes, s, count);
@@ -1861,7 +1861,7 @@
c->name, s->name, "thrash");
igt_subtest_group {
igt_fixture {
- count = num_buffers(gem_mappable_aperture_size(fd),
+ count = num_buffers(gem_mappable_aperture_size(),
s, c, CHECK_RAM);
}
run_modes(name, c, modes, s, count);
@@ -1893,7 +1893,7 @@
c->name, s->name, "shrink");
igt_subtest_group {
igt_fixture {
- count = num_buffers(gem_mappable_aperture_size(fd),
+ count = num_buffers(gem_mappable_aperture_size(),
s, c, CHECK_RAM);
igt_fork_shrink_helper(fd);
@@ -1909,8 +1909,8 @@
c->name, s->name, "swap");
igt_subtest_group {
igt_fixture {
- if (intel_get_avail_ram_mb() > gem_mappable_aperture_size(fd)/(1024*1024)) {
- pin_sz = intel_get_avail_ram_mb() - gem_mappable_aperture_size(fd)/(1024*1024);
+ if (intel_get_avail_ram_mb() > gem_mappable_aperture_size()/(1024*1024)) {
+ pin_sz = intel_get_avail_ram_mb() - gem_mappable_aperture_size()/(1024*1024);
igt_debug("Pinning %lld MiB\n", (long long)pin_sz);
pin_sz *= 1024 * 1024;
@@ -1924,7 +1924,7 @@
igt_require(pinned);
}
- count = num_buffers(gem_mappable_aperture_size(fd),
+ count = num_buffers(gem_mappable_aperture_size(),
s, c, CHECK_RAM | CHECK_SWAP);
}
run_modes(name, c, modes, s, count);