xserver: Branch 'master' - 6 commits

[GitLab Mirror]

 hw/xfree86/common/xf86AutoConfig.c    |    3 +++
 hw/xfree86/common/xf86str.h           |    2 +-
 hw/xfree86/os-support/bsd/ppc_video.c |    4 ++++
 hw/xfree86/os-support/meson.build     |    8 ++++++--
 include/meson.build                   |    2 +-
 5 files changed, 15 insertions(+), 4 deletions(-)

New commits:
commit 997e17eabe8b7611407e8e425364a5a13f31abf2
Author: John Kennedy <warlock at phouka.net>
Date:   Thu Oct 5 20:12:46 2023 +0300

    Enable USE_DEV_IO on FreeBSD/aarch64

diff --git a/include/meson.build b/include/meson.build
index 3e71e4621..64cf0aeee 100644
--- a/include/meson.build
+++ b/include/meson.build
@@ -379,7 +379,7 @@ xorg_data.set('HAVE_SYS_VT_H', cc.has_header('sys/vt.h') ? '1' : false)
 xorg_data.set('HAVE_MODESETTING_DRIVER', build_modesetting ? '1' : false)
 
 if host_machine.system() == 'freebsd' or host_machine.system() == 'dragonfly'
-    if host_machine.cpu_family() == 'x86' or host_machine.cpu_family() == 'x86_64'
+    if host_machine.cpu_family() == 'x86' or host_machine.cpu_family() == 'x86_64' or host_machine.cpu_family() == 'aarch64'
         xorg_data.set('USE_DEV_IO', '1')
     endif
 elif host_machine.system() == 'netbsd'
commit cf44a4dda3df9255514aa420ce394e32f9918290
Author: John Kennedy <warlock at phouka.net>
Date:   Thu Oct 5 20:04:05 2023 +0300

    Extented 'arm' case to 'aarch64' on BSD.

diff --git a/hw/xfree86/os-support/meson.build b/hw/xfree86/os-support/meson.build
index e9b0bcd59..04b218183 100644
--- a/hw/xfree86/os-support/meson.build
+++ b/hw/xfree86/os-support/meson.build
@@ -116,7 +116,7 @@ elif host_machine.system().endswith('bsd')
         if host_machine.system() == 'netbsd' or host_machine.system() == 'openbsd'
             os_dep += cc.find_library('i386')
         endif
-    elif host_machine.cpu_family() == 'arm'
+    elif host_machine.cpu_family() == 'arm' or host_machine.cpu_family() == 'aarch64'
         srcs_xorg_os_support += 'bsd/arm_video.c'
     elif host_machine.cpu_family() == 'ppc' or host_machine.cpu_family() == 'ppc64'
         srcs_xorg_os_support += 'bsd/ppc_video.c'
commit 947d1c7ecf5571cdb4028d20e3b06e70d18c2672
Author: Austin Shafer <ashafer at badland.io>
Date:   Thu Oct 5 20:03:42 2023 +0300

    Compile lnx_platform.c on FreeBSD too.

diff --git a/hw/xfree86/os-support/meson.build b/hw/xfree86/os-support/meson.build
index 4c58cd327..e9b0bcd59 100644
--- a/hw/xfree86/os-support/meson.build
+++ b/hw/xfree86/os-support/meson.build
@@ -97,9 +97,13 @@ elif host_machine.system().endswith('bsd')
         'bsd/bsd_bell.c',
         'bsd/bsd_init.c',
         'shared/drm_platform.c',
-	'shared/pm_noop.c'
+        'shared/pm_noop.c'
     ]
 
+    if host_machine.system() == 'freebsd'
+        srcs_xorg_os_support += ['linux/lnx_platform.c', 'misc/SlowBcopy.c']
+    endif
+
     if host_machine.cpu_family() == 'x86_64'
         srcs_xorg_os_support += 'bsd/i386_video.c'
         if host_machine.system() == 'netbsd'
commit 84ff599d0b7135d89f5df6a8d24c76648eba50e4
Author: Peter Grehan <grehan at FreeBSD.org>
Date:   Thu Oct 5 19:35:40 2023 +0300

    Fix build on FreeBSD/PowerPC architecture.

diff --git a/hw/xfree86/os-support/bsd/ppc_video.c b/hw/xfree86/os-support/bsd/ppc_video.c
index 5a58da19d..a39295cfe 100644
--- a/hw/xfree86/os-support/bsd/ppc_video.c
+++ b/hw/xfree86/os-support/bsd/ppc_video.c
@@ -79,7 +79,11 @@ xf86DisableIO()
 {
 
     if (ioBase != MAP_FAILED) {
+#if defined(__FreeBSD__)
+        munmap(__DEVOLATILE(unsigned char *, ioBase), 0x10000);
+#else
         munmap(__UNVOLATILE(ioBase), 0x10000);
+#endif
         ioBase = MAP_FAILED;
     }
 }
commit b1abb2efcb4aeca3ea1129ac5eeb497ff7e9c710
Author: Gleb Popov <6yearold at gmail.com>
Date:   Thu Oct 5 19:22:36 2023 +0300

    The framebuffer driver on FreeBSD is called scfb, use it.

diff --git a/hw/xfree86/common/xf86AutoConfig.c b/hw/xfree86/common/xf86AutoConfig.c
index ee5587d93..2b8e0060e 100644
--- a/hw/xfree86/common/xf86AutoConfig.c
+++ b/hw/xfree86/common/xf86AutoConfig.c
@@ -302,6 +302,9 @@ listPossibleVideoDrivers(XF86MatchedDrivers *md)
 #if defined(__linux__)
     xf86AddMatchedDriver(md, "fbdev");
 #endif
+#if defined(__FreeBSD__)
+    xf86AddMatchedDriver(md, "scfb");
+#endif
 
     /* Fallback to platform default hardware */
 #if defined(__i386__) || defined(__amd64__) || defined(__hurd__)
commit 5528b0606efb12b50148155faf259db7c2e7570b
Author: Niclas Zeising <zeising at FreeBSD.org>
Date:   Thu Oct 5 19:12:58 2023 +0300

    Extend Linux #ifdef to FreeBSD OS.

diff --git a/hw/xfree86/common/xf86str.h b/hw/xfree86/common/xf86str.h
index 9072932cb..d410e411a 100644
--- a/hw/xfree86/common/xf86str.h
+++ b/hw/xfree86/common/xf86str.h
@@ -249,7 +249,7 @@ typedef struct _DriverRec {
  */
 
 /* Tolerate prior #include <linux/input.h> */
-#if defined(__linux__)
+#if defined(__linux__) || defined(__FreeBSD__)
 #undef BUS_NONE
 #undef BUS_PCI
 #undef BUS_SBUS