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 /tests/i915/gem_mmap_gtt.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 'tests/i915/gem_mmap_gtt.c')
| -rw-r--r-- | tests/i915/gem_mmap_gtt.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/i915/gem_mmap_gtt.c b/tests/i915/gem_mmap_gtt.c index 639de190..58922ee3 100644 --- a/tests/i915/gem_mmap_gtt.c +++ b/tests/i915/gem_mmap_gtt.c @@ -562,7 +562,7 @@ test_huge_bo(int fd, int huge, int tiling) switch (huge) { case -1: - size = gem_mappable_aperture_size(fd) / 2; + size = gem_mappable_aperture_size() / 2; /* Power of two fence size, natural fence * alignment, and the guard page at the end @@ -577,7 +577,7 @@ test_huge_bo(int fd, int huge, int tiling) size /= 2; break; case 0: - size = gem_mappable_aperture_size(fd) + PAGE_SIZE; + size = gem_mappable_aperture_size() + PAGE_SIZE; break; default: size = gem_global_aperture_size(fd) + PAGE_SIZE; @@ -658,13 +658,13 @@ test_huge_copy(int fd, int huge, int tiling_a, int tiling_b, int ncpus) switch (huge) { case -2: - huge_object_size = gem_mappable_aperture_size(fd) / 4; + huge_object_size = gem_mappable_aperture_size() / 4; break; case -1: - huge_object_size = gem_mappable_aperture_size(fd) / 2; + huge_object_size = gem_mappable_aperture_size() / 2; break; case 0: - huge_object_size = gem_mappable_aperture_size(fd) + PAGE_SIZE; + huge_object_size = gem_mappable_aperture_size() + PAGE_SIZE; break; case 1: huge_object_size = gem_global_aperture_size(fd) + PAGE_SIZE; |