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/i915_pm_rpm.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/i915_pm_rpm.c')
| -rw-r--r-- | tests/i915/i915_pm_rpm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/i915/i915_pm_rpm.c b/tests/i915/i915_pm_rpm.c index 18adaf6b..03de609c 100644 --- a/tests/i915/i915_pm_rpm.c +++ b/tests/i915/i915_pm_rpm.c @@ -1368,7 +1368,7 @@ static void gem_evict_pwrite_subtest(void) unsigned int num_trash_bos, n; uint32_t buf; - num_trash_bos = gem_mappable_aperture_size(drm_fd) / (1024*1024) + 1; + num_trash_bos = gem_mappable_aperture_size() / (1024*1024) + 1; trash_bos = malloc(num_trash_bos * sizeof(*trash_bos)); igt_assert(trash_bos); @@ -1412,7 +1412,7 @@ static bool device_in_pci_d3(void) uint16_t val; int rc; - rc = pci_device_cfg_read_u16(igt_device_get_pci_device(drm_fd), &val, 0xd4); + rc = pci_device_cfg_read_u16(intel_get_pci_device(), &val, 0xd4); igt_assert_eq(rc, 0); igt_debug("%s: PCI D3 state=%d\n", __func__, val & 0x3); |