xserver: Branch 'master'

[GitLab Mirror]

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

New commits:
commit 2e6edeb56911d594cc0d9afec07d70f58961a25d
Author: Thomas Zimmermann <tzimmermann at suse.de>
Date:   Mon Dec 13 16:10:35 2021 +0100

    xf86: Accept devices with the 'hyperv_drm' driver
    
    Put in a workaround to accept devices of the kernel's hyperv_drm
    driver. Makes Xorg work on HyperV Gen 1/2 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 45028f7a6..071f44b2a 100644
--- a/hw/xfree86/common/xf86platformBus.c
+++ b/hw/xfree86/common/xf86platformBus.c
@@ -560,6 +560,9 @@ xf86platformProbeDev(DriverPtr drvp)
                 if (ServerIsNotSeat0()) {
                     break;
                 } else {
+                    /* 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 simpledrm */
                     if (strcmp(xf86_platform_devices[j].attribs->driver, "simpledrm") == 0)
                         break;