Mesa (master): pipe-loader: Default to kmsro if probe fails

[GitLab Mirror]

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

Author: Alyssa Rosenzweig <alyssa.rosenzweig at collabora.com>
Date:   Sat Oct 19 16:46:54 2019 -0400

pipe-loader: Default to kmsro if probe fails

A device supported by kmsro will not automatically probe kmsro since the
driver name will be panfrost/lima/v3d/..., not "kmsro". Since kmsro is a
bit of a catch-all for generic (mostly embedded) GPUs, add a fallback on
kmsro for the dynamic loader.

Signed-off-by: Alyssa Rosenzweig <alyssa.rosenzweig at collabora.com>
Reviewed-by: Christian Gmeiner <christian.gmeiner at gmail.com>
Acked-by: Karol Herbst <kherbst at redhat.com>

---

 src/gallium/auxiliary/pipe-loader/pipe_loader_drm.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/gallium/auxiliary/pipe-loader/pipe_loader_drm.c b/src/gallium/auxiliary/pipe-loader/pipe_loader_drm.c
index 45b941e1f13..3b9b39f62a3 100644
--- a/src/gallium/auxiliary/pipe-loader/pipe_loader_drm.c
+++ b/src/gallium/auxiliary/pipe-loader/pipe_loader_drm.c
@@ -208,6 +208,11 @@ pipe_loader_drm_probe_fd_nodup(struct pipe_loader_device **dev, int fd)
    plib = &ddev->lib;
 #endif
    ddev->dd = get_driver_descriptor(ddev->base.driver_name, plib);
+
+   /* kmsro supports lots of drivers, try as a fallback */
+   if (!ddev->dd)
+      ddev->dd = get_driver_descriptor("kmsro", plib);
+
    if (!ddev->dd)
       goto fail;