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 /lib/ioctl_wrappers.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 'lib/ioctl_wrappers.c')
-rw-r--r-- | lib/ioctl_wrappers.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/ioctl_wrappers.c b/lib/ioctl_wrappers.c index a66eb4bc..39920f87 100644 --- a/lib/ioctl_wrappers.c +++ b/lib/ioctl_wrappers.c @@ -53,7 +53,6 @@ #include "intel_chipset.h" #include "intel_io.h" #include "igt_debugfs.h" -#include "igt_device.h" #include "igt_sysfs.h" #include "config.h" @@ -1097,9 +1096,9 @@ uint64_t gem_aperture_size(int fd) * * Returns: The mappable gtt address space size. */ -uint64_t gem_mappable_aperture_size(int fd) +uint64_t gem_mappable_aperture_size(void) { - struct pci_device *pci_dev = igt_device_get_pci_device(fd); + struct pci_device *pci_dev = intel_get_pci_device(); int bar; if (intel_gen(pci_dev->device_id) < 3) |