Mesa (master): loader: move "using driver..." message to loader_get_kernel_driver_name

[GitLab Mirror]

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

Author: Emil Velikov <emil.velikov at collabora.com>
Date:   Thu Mar  5 14:30:51 2020 +0000

loader: move "using driver..." message to  loader_get_kernel_driver_name

Move the message to the function which fetches the name.

While here use the same DEBUG/WARNING approach like in the PCI case. The
current method spam a tad much, plus isn't consistent.

Signed-off-by: Emil Velikov <emil.velikov at collabora.com>
Reviewed-by: Adam Jackson <ajax at redhat.com>
Reviewed-by: Eric Engestrom <eric at engestrom.ch>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4084>

---

 src/loader/loader.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/loader/loader.c b/src/loader/loader.c
index a2e726465af..38d8752e26e 100644
--- a/src/loader/loader.c
+++ b/src/loader/loader.c
@@ -111,6 +111,8 @@ static char *loader_get_kernel_driver_name(int fd)
    }
 
    driver = strndup(version->name, version->name_len);
+   log_(driver ? _LOADER_DEBUG : _LOADER_WARNING, "using driver %s for %d\n",
+        driver, fd);
 
    drmFreeVersion(version);
    return driver;
@@ -451,8 +453,6 @@ loader_get_driver_for_fd(int fd)
 
    if (!loader_get_pci_id_for_fd(fd, &vendor_id, &chip_id)) {
       driver = loader_get_kernel_driver_name(fd);
-      if (driver)
-         log_(_LOADER_INFO, "using driver %s for %d\n", driver, fd);
       return driver;
    }