diff options
| author | Michał Winiarski <michal.winiarski@intel.com> | 2019-03-12 13:48:13 +0100 |
|---|---|---|
| committer | Michał Winiarski <michal.winiarski@intel.com> | 2019-03-20 10:36:36 +0100 |
| commit | 8ae86621d6fff60b6e20c6b0f9b336785c935b0f (patch) | |
| tree | 12d83d267f5dafb16bcef5edec173ff57cf4dfbd /lib/ioctl_wrappers.c | |
| parent | 1bbe0b11a40cbb8433a3863745b7023e54c36ae3 (diff) | |
lib/igt_device: Move intel_get_pci_device under igt_device
It allows us to make things a little bit more generic. Also, we now
require fd rather than doing guesswork when it comes to pci address.
v2: Use readlinkat rather than string concat, move stuff around, provide
a version that does not assert. (Chris)
v3: Print addr on failure, avoid assignment in conditionals. (Chris)
Signed-off-by: Michał Winiarski <michal.winiarski@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'lib/ioctl_wrappers.c')
| -rw-r--r-- | lib/ioctl_wrappers.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/ioctl_wrappers.c b/lib/ioctl_wrappers.c index 39920f87..a66eb4bc 100644 --- a/lib/ioctl_wrappers.c +++ b/lib/ioctl_wrappers.c @@ -53,6 +53,7 @@ #include "intel_chipset.h" #include "intel_io.h" #include "igt_debugfs.h" +#include "igt_device.h" #include "igt_sysfs.h" #include "config.h" @@ -1096,9 +1097,9 @@ uint64_t gem_aperture_size(int fd) * * Returns: The mappable gtt address space size. */ -uint64_t gem_mappable_aperture_size(void) +uint64_t gem_mappable_aperture_size(int fd) { - struct pci_device *pci_dev = intel_get_pci_device(); + struct pci_device *pci_dev = igt_device_get_pci_device(fd); int bar; if (intel_gen(pci_dev->device_id) < 3) |