xserver: Branch 'master'

[GitLab Mirror]

 hw/xfree86/common/xf86platformBus.c |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit cd617f2d0fdb3d40151fc9a4bc7a678179b3b0e6
Author: Thomas Zimmermann <tzimmermann at suse.de>
Date:   Wed May 18 10:44:06 2022 +0200

    xf86: Accept devices with the kernel's ofdrm driver
    
    Add a workaround to accept devices of the kernel's ofdrm driver.
    Makes Xorg work on Open Firmware's pre-configured display with the
    DRM graphics stack.
    
    Signed-off-by: Thomas Zimmermann <tzimmermann at suse.de>

diff --git a/hw/xfree86/common/xf86platformBus.c b/hw/xfree86/common/xf86platformBus.c
index abd09054d..b7fdb4dd6 100644
--- a/hw/xfree86/common/xf86platformBus.c
+++ b/hw/xfree86/common/xf86platformBus.c
@@ -579,6 +579,9 @@ xf86platformProbeDev(DriverPtr drvp)
                     /* Accept the device if the driver is hyperv_drm */
                     if (strcmp(xf86_platform_devices[j].attribs->driver, "hyperv_drm") == 0)
                         break;
+                    /* Accept the device if the driver is ofdrm */
+                    if (strcmp(xf86_platform_devices[j].attribs->driver, "ofdrm") == 0)
+                        break;
                     /* Accept the device if the driver is simpledrm */
                     if (strcmp(xf86_platform_devices[j].attribs->driver, "simpledrm") == 0)
                         break;