Mesa (master): loader: always map the "amdgpu" kernel driver name to radeonsi (v2)

[GitLab Mirror]

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

Author: Jiang, Sonny <Sonny.Jiang at amd.com>
Date:   Tue Sep  3 22:33:57 2019 +0000

loader: always map the "amdgpu" kernel driver name to radeonsi (v2)

v2: cleanup

Signed-off-by: Sonny Jiang <sonny.jiang at amd.com>
Signed-off-by: Marek Olšák <marek.olsak at amd.com>
Acked-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer at amd.com>

---

 src/loader/loader.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/loader/loader.c b/src/loader/loader.c
index 6894c65114f..a45328e2464 100644
--- a/src/loader/loader.c
+++ b/src/loader/loader.c
@@ -459,6 +459,15 @@ loader_get_driver_for_fd(int fd)
       return driver;
 #endif
 
+   driver = loader_get_kernel_driver_name(fd);
+   bool is_amdgpu = driver && strcmp(driver, "amdgpu") == 0;
+   free(driver);
+
+   if (is_amdgpu) {
+      driver = strdup("radeonsi");
+      goto out;
+   }
+
    if (!loader_get_pci_id_for_fd(fd, &vendor_id, &chip_id)) {
       driver = loader_get_kernel_driver_name(fd);
       if (driver)