xserver: Branch 'master' - 2 commits

[GitLab Mirror]

 hw/xfree86/os-support/meson.build            |    6 +++++-
 hw/xfree86/os-support/shared/platform_noop.c |   14 ++++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

New commits:
commit cab385690370008656fb348e8fd9d774dfef751b
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date:   Fri Feb 28 15:15:14 2025 +0100

    xfree86: os-support: fix FTBS when no recent enough libdrm found
    
    On Linux, the only supported platform bus backend (*1) is via DRM/DRI.
    Trying to build it w/o (recent enough) libdrm fails as it tries to
    compile the drm-based implementation, w/o having drm.h available. (*2)
    
    In order to fix this, we need to compile noop-implementation instead.
    
    *1) platform specific code for detecting video devices
    *2) https://gitlab.freedesktop.org/xorg/xserver/-/issues/1771
    
    Issue: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1771
    Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1848>

diff --git a/hw/xfree86/os-support/meson.build b/hw/xfree86/os-support/meson.build
index de392572a..c312162f3 100644
--- a/hw/xfree86/os-support/meson.build
+++ b/hw/xfree86/os-support/meson.build
@@ -36,8 +36,12 @@ if host_machine.system() == 'linux'
         'linux/lnx_video.c',
         'misc/SlowBcopy.c',
         'shared/VTsw_usl.c',
-        'shared/drm_platform.c',
     ]
+    if libdrm_dep.found()
+        srcs_xorg_os_support += 'shared/drm_platform.c'
+    else
+        srcs_xorg_os_support += 'shared/platform_noop.c'
+    endif
     if build_agp
         srcs_xorg_os_support += 'linux/lnx_agp.c'
     else
commit e2ac4616290ed9b67a201465fafa0ab4e2b00a4b
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date:   Fri Feb 28 15:05:46 2025 +0100

    xfree86: platform_noop: add missing functions
    
    In order to be able to build on Linux w/ platform_noop
    (when no recent enough libdrm found), a few more dummy functions
    are needed here.
    
    Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1848>

diff --git a/hw/xfree86/os-support/shared/platform_noop.c b/hw/xfree86/os-support/shared/platform_noop.c
index 2ff1deafa..ed0ff93ed 100644
--- a/hw/xfree86/os-support/shared/platform_noop.c
+++ b/hw/xfree86/os-support/shared/platform_noop.c
@@ -3,6 +3,8 @@
 #include <xorg-config.h>
 #endif
 
+#include "config/hotplug_priv.h"
+
 #ifdef XSERVER_PLATFORM_BUS
 /* noop platform device support */
 #include "xf86_OSproc.h"
@@ -19,6 +21,18 @@ xf86PlatformDeviceCheckBusID(struct xf86_platform_device *device, const char *bu
 
 void xf86PlatformDeviceProbe(struct OdevAttributes *attribs)
 {
+}
+
+void xf86PlatformReprobeDevice(int index, struct OdevAttributes *attribs)
+{
+}
+
+void DeleteGPUDeviceRequest(struct OdevAttributes *attribs)
+{
+}
 
+void NewGPUDeviceRequest(struct OdevAttributes *attribs)
+{
 }
+
 #endif