xserver: Branch 'server-1.20-branch'

[GitLab Mirror]

 hw/xfree86/common/xf86platformBus.c |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 2355155640494ba212c00be410bc3de9d1e131c0
Author: nerdopolis <rbos at rbos>
Date:   Thu Sep 30 08:51:18 2021 -0400

    xf86: Accept devices with the 'simpledrm' driver.
    
    SimpleDRM 'devices' are a fallback device, and do not have a busid
    so they are getting skipped. This will allow simpledrm to work
    with the modesetting driver
    
    (cherry picked from commit b9218fadf3c09d83566549279d68886d8258f79c)
    Signed-off-by: Jocelyn Falempe <jfalempe at redhat.com>

diff --git a/hw/xfree86/common/xf86platformBus.c b/hw/xfree86/common/xf86platformBus.c
index cef47da03..d4fdab3c2 100644
--- a/hw/xfree86/common/xf86platformBus.c
+++ b/hw/xfree86/common/xf86platformBus.c
@@ -546,8 +546,13 @@ xf86platformProbeDev(DriverPtr drvp)
             }
             else {
                 /* for non-seat0 servers assume first device is the master */
-                if (ServerIsNotSeat0())
+                if (ServerIsNotSeat0()) {
                     break;
+                } else {
+                    /* Accept the device if the driver is simpledrm */
+                    if (strcmp(xf86_platform_devices[j].attribs->driver, "simpledrm") == 0)
+                        break;
+                }
 
                 if (xf86IsPrimaryPlatform(&xf86_platform_devices[j]))
                     break;