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 /tools/intel_gtt.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 'tools/intel_gtt.c')
| -rw-r--r-- | tools/intel_gtt.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/tools/intel_gtt.c b/tools/intel_gtt.c index 311694ba..5740e794 100644 --- a/tools/intel_gtt.c +++ b/tools/intel_gtt.c @@ -34,6 +34,8 @@ #include <pciaccess.h> #include <unistd.h> +#include "drmtest.h" +#include "igt_device.h" #include "intel_io.h" #include "intel_chipset.h" @@ -140,13 +142,17 @@ int main(int argc, char **argv) { struct pci_device *pci_dev; unsigned int start, gtt_size; + int fd; int flag[] = { PCI_DEV_MAP_FLAG_WRITE_COMBINE, PCI_DEV_MAP_FLAG_WRITABLE, 0 }, f; - pci_dev = intel_get_pci_device(); + fd = drm_open_driver(DRIVER_INTEL); + pci_dev = igt_device_get_pci_device(fd); + close(fd); + devid = pci_dev->device_id; if (IS_GEN2(devid)) { |