xserver: Branch 'master'

[GitLab Mirror]

 hw/xfree86/os-support/meson.build |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 5468123822bbe8cd0a0abe07bbbd3a9cb14ed2cb
Author: Austin Shafer <ashafer at nvidia.com>
Date:   Thu Mar 17 12:49:09 2022 -0400

    Add DRM platform for BSD
    
    This moves lnx_platform.c to the shared directory and adds it to
    the BSD build. This is needed for PRIME render offload.
    
    Acked-by: Olivier Fourdan <ofourdan at redhat.com>

diff --git a/hw/xfree86/os-support/meson.build b/hw/xfree86/os-support/meson.build
index 64a6c9adb..4c58cd327 100644
--- a/hw/xfree86/os-support/meson.build
+++ b/hw/xfree86/os-support/meson.build
@@ -36,10 +36,10 @@ if host_machine.system() == 'linux'
         'linux/lnx_bell.c',
         'linux/lnx_init.c',
         'linux/lnx_kmod.c',
-        'linux/lnx_platform.c',
         'linux/lnx_video.c',
         'misc/SlowBcopy.c',
         'shared/VTsw_usl.c',
+        'shared/drm_platform.c',
     ]
     if build_agp
         srcs_xorg_os_support += 'linux/lnx_agp.c'
@@ -96,6 +96,7 @@ elif host_machine.system().endswith('bsd')
         'bsd/bsd_VTsw.c',
         'bsd/bsd_bell.c',
         'bsd/bsd_init.c',
+        'shared/drm_platform.c',
 	'shared/pm_noop.c'
     ]
 
diff --git a/hw/xfree86/os-support/linux/lnx_platform.c b/hw/xfree86/os-support/shared/drm_platform.c
similarity index 100%
rename from hw/xfree86/os-support/linux/lnx_platform.c
rename to hw/xfree86/os-support/shared/drm_platform.c