Igt-dev Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [igt-dev] [PATCH i-g-t 1/2] lib/igt_device_scan: Remember vendor/device for pci devices
@ 2020-11-17  9:48 Zbigniew Kempczyński
  2020-11-17  9:48 ` [igt-dev] [PATCH i-g-t 2/2] tools/intel_gpu_top: Add generation info in header Zbigniew Kempczyński
                   ` (3 more replies)
  0 siblings, 4 replies; 7+ messages in thread
From: Zbigniew Kempczyński @ 2020-11-17  9:48 UTC (permalink / raw)
  To: igt-dev; +Cc: Petri Latvala, Tvrtko Ursulin

If we want to use pci device id for not opened device we need to
keep it in card structure.

To avoid compiler warnings after adding vendor/device fields
increase pci_slot_name length.

Signed-off-by: Zbigniew Kempczyński <zbigniew.kempczynski@intel.com>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: Petri Latvala <petri.latvala@intel.com>
---
 lib/igt_device_scan.c | 8 ++++++++
 lib/igt_device_scan.h | 3 ++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/lib/igt_device_scan.c b/lib/igt_device_scan.c
index e97f7163..5793ef84 100644
--- a/lib/igt_device_scan.c
+++ b/lib/igt_device_scan.c
@@ -463,6 +463,14 @@ __copy_dev_to_card(struct igt_device *dev, struct igt_device_card *card)
 	if (dev->pci_slot_name != NULL)
 		strncpy(card->pci_slot_name, dev->pci_slot_name,
 			PCI_SLOT_NAME_SIZE + 1);
+
+	if (dev->vendor != NULL && strlen(dev->vendor) == 4)
+		if (sscanf(dev->vendor, "%hx", &card->pci_vendor) != 1)
+			card->pci_vendor = 0;
+
+	if (dev->device != NULL && strlen(dev->device) == 4)
+		if (sscanf(dev->device, "%hx", &card->pci_device) != 1)
+			card->pci_device = 0;
 }
 
 /*
diff --git a/lib/igt_device_scan.h b/lib/igt_device_scan.h
index bb4be723..e96d8a25 100644
--- a/lib/igt_device_scan.h
+++ b/lib/igt_device_scan.h
@@ -57,7 +57,8 @@ struct igt_device_card {
 	char subsystem[NAME_MAX];
 	char card[NAME_MAX];
 	char render[NAME_MAX];
-	char pci_slot_name[PCI_SLOT_NAME_SIZE+1];
+	char pci_slot_name[PCI_SLOT_NAME_SIZE+2];
+	uint16_t pci_vendor, pci_device;
 };
 
 void igt_devices_scan(bool force);
-- 
2.26.0

_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev

^ permalink raw reply related	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2020-11-17 13:18 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-11-17  9:48 [igt-dev] [PATCH i-g-t 1/2] lib/igt_device_scan: Remember vendor/device for pci devices Zbigniew Kempczyński
2020-11-17  9:48 ` [igt-dev] [PATCH i-g-t 2/2] tools/intel_gpu_top: Add generation info in header Zbigniew Kempczyński
2020-11-17 10:15   ` Tvrtko Ursulin
2020-11-17 10:16 ` [igt-dev] [PATCH i-g-t 1/2] lib/igt_device_scan: Remember vendor/device for pci devices Tvrtko Ursulin
2020-11-17 10:38   ` Zbigniew Kempczyński
2020-11-17 11:44 ` [igt-dev] ✓ Fi.CI.BAT: success for series starting with [i-g-t,1/2] " Patchwork
2020-11-17 13:18 ` [igt-dev] ✗ Fi.CI.IGT: failure " Patchwork

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox