Mesa (master): loader: not having a pci-id should not be a warn

Rob Clark robclark at kemper.freedesktop.org
Sat Feb 21 22:11:54 UTC 2015


Module: Mesa
Branch: master
Commit: 9153dd4b7eb95728aa9746a45a9dd136458d0213
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=9153dd4b7eb95728aa9746a45a9dd136458d0213

Author: Rob Clark <robclark at freedesktop.org>
Date:   Sun Feb 15 01:59:17 2015 -0500

loader: not having a pci-id should not be a warn

If there is no pci-id, which is valid for vc4 and freedreno, just emit
an info msg.  Keep malformed but existing pci-id's as a warning.

Mostly just to clean up a warning that confuses users for the non-pci
devices.

Signed-off-by: Rob Clark <robclark at freedesktop.org>

---

 src/loader/loader.c |    9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/loader/loader.c b/src/loader/loader.c
index 94c993a..9ff5115 100644
--- a/src/loader/loader.c
+++ b/src/loader/loader.c
@@ -207,9 +207,12 @@ libudev_get_pci_id_for_fd(int fd, int *vendor_id, int *chip_id)
    }
 
    pci_id = udev_device_get_property_value(parent, "PCI_ID");
-   if (pci_id == NULL ||
-       sscanf(pci_id, "%x:%x", vendor_id, chip_id) != 2) {
-      log_(_LOADER_WARNING, "MESA-LOADER: malformed or no PCI ID\n");
+   if (pci_id == NULL) {
+      log_(_LOADER_INFO, "MESA-LOADER: no PCI ID\n");
+      *chip_id = -1;
+      goto out;
+   } else if (sscanf(pci_id, "%x:%x", vendor_id, chip_id) != 2) {
+      log_(_LOADER_WARNING, "MESA-LOADER: malformed PCI ID\n");
       *chip_id = -1;
       goto out;
    }




More information about the mesa-commit mailing list