diff options
author | Tvrtko Ursulin <tvrtko.ursulin@intel.com> | 2020-11-16 17:26:51 +0000 |
---|---|---|
committer | Tvrtko Ursulin <tvrtko.ursulin@intel.com> | 2020-11-17 09:30:03 +0000 |
commit | 402e43dacb86f19a5c5ec7cd3dc2fff3b758e966 (patch) | |
tree | e9f0d0966a3a24dece4f96b29a52c379c49fb5c3 | |
parent | 05a619fc82bff89fd06b2ade732e2883b5fd22ef (diff) |
lib/igt_device_scan: Remember PCI card index after scanning
After devices are sorted post scanning, assing a card index to each so it
can be easily accessed if PCI filter for a card needs to be printed out.
v2:
* Preserve existing pci:..card=N behaviour. (Zbigniew)
Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: Petri Latvala <petri.latvala@intel.com>
Cc: Zbigniew Kempczyński <zbigniew.kempczynski@intel.com>
Reviewed-by: Zbigniew Kempczyński <zbigniew.kempczynski@intel.com>
-rw-r--r-- | lib/igt_device_scan.c | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/lib/igt_device_scan.c b/lib/igt_device_scan.c index c0cd6757..ecb8db29 100644 --- a/lib/igt_device_scan.c +++ b/lib/igt_device_scan.c @@ -166,6 +166,7 @@ struct igt_device { char *vendor; char *device; char *pci_slot_name; + int gpu_index; /* For more than one GPU with same vendor and device. */ struct igt_list_head link; }; @@ -601,6 +602,33 @@ static void sort_all_devices(void) free(devs); } +static void index_pci_devices(void) +{ + struct igt_device *dev; + + igt_list_for_each_entry(dev, &igt_devs.all, link) { + struct igt_device *dev2; + int index = 0; + + if (!is_pci_subsystem(dev)) + continue; + + igt_list_for_each_entry(dev2, &igt_devs.all, link) { + if (!is_pci_subsystem(dev2)) + continue; + + if (dev2 == dev) + break; + + if (!strcasecmp(dev->vendor, dev2->vendor) && + !strcasecmp(dev->device, dev2->device)) + index++; + } + + dev->gpu_index = index; + } +} + /* Core scanning function. * * All scanned devices are kept inside igt_devs.all pointer array. @@ -657,6 +685,7 @@ static void scan_drm_devices(void) udev_unref(udev); sort_all_devices(); + index_pci_devices(); igt_list_for_each_entry(dev, &igt_devs.all, link) { struct igt_device *dev_dup = duplicate_device(dev); |