From c692580d74c3acf7f0a74899058619e92d46a827 Mon Sep 17 00:00:00 2001
From: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Tue, 17 Jun 2025 14:36:09 -0700
Subject: [PATCH] Revert "xfree86: common: move private defs out of
 xf86VGAarbiter.h"

This reverts commit 013eaacdd02ac82c0511f72e6dcbc137fc4a5748.

Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2027>
---
 hw/xfree86/common/xf86.h                |  6 +++++
 hw/xfree86/common/xf86Bus.c             |  2 +-
 hw/xfree86/common/xf86DPMS.c            |  2 +-
 hw/xfree86/common/xf86Init.c            |  1 -
 hw/xfree86/common/xf86VGAarbiter.c      |  2 +-
 hw/xfree86/common/xf86VGAarbiter.h      |  8 +++++++
 hw/xfree86/common/xf86VGAarbiter_priv.h | 32 -------------------------
 7 files changed, 17 insertions(+), 36 deletions(-)
 delete mode 100644 hw/xfree86/common/xf86VGAarbiter_priv.h

diff --git a/hw/xfree86/common/xf86.h b/hw/xfree86/common/xf86.h
index 653352e4d..8d0cb0532 100644
--- a/hw/xfree86/common/xf86.h
+++ b/hw/xfree86/common/xf86.h
@@ -126,7 +126,13 @@ extern _X_EXPORT ScrnInfoPtr xf86ConfigPciEntity(ScrnInfoPtr pScrn,
                                                  EntityProc leave,
                                                  void *private);
 #else
+#define xf86VGAarbiterInit() do {} while (0)
+#define xf86VGAarbiterFini() do {} while (0)
+#define xf86VGAarbiterLock(x) do {} while (0)
+#define xf86VGAarbiterUnlock(x) do {} while (0)
+#define xf86VGAarbiterScrnInit(x) do {} while (0)
 #define xf86VGAarbiterDeviceDecodes() do {} while (0)
+#define xf86VGAarbiterWrapFunctions() do {} while (0)
 #endif
 
 /* xf86Bus.c */
diff --git a/hw/xfree86/common/xf86Bus.c b/hw/xfree86/common/xf86Bus.c
index 6c3921717..af1a8d715 100644
--- a/hw/xfree86/common/xf86Bus.c
+++ b/hw/xfree86/common/xf86Bus.c
@@ -50,7 +50,7 @@
 
 #include "xf86_OSproc.h"
 #ifdef XSERVER_LIBPCIACCESS
-#include "xf86VGAarbiter_priv.h"
+#include "xf86VGAarbiter.h"
 #endif
 /* Entity data */
 EntityPtr *xf86Entities = NULL; /* Bus slots claimed by drivers */
diff --git a/hw/xfree86/common/xf86DPMS.c b/hw/xfree86/common/xf86DPMS.c
index 7fec44087..ee495483e 100644
--- a/hw/xfree86/common/xf86DPMS.c
+++ b/hw/xfree86/common/xf86DPMS.c
@@ -44,7 +44,7 @@
 #include "dpmsproc.h"
 #endif
 #ifdef XSERVER_LIBPCIACCESS
-#include "xf86VGAarbiter_priv.h"
+#include "xf86VGAarbiter.h"
 #endif
 
 #ifdef DPMSExtension
diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
index b2dd37510..92004dd79 100644
--- a/hw/xfree86/common/xf86Init.c
+++ b/hw/xfree86/common/xf86Init.c
@@ -64,7 +64,6 @@
 #include "windowstr.h"
 #include "scrnintstr.h"
 #include "systemd-logind.h"
-#include "xf86VGAarbiter_priv.h"
 #include "loaderProcs.h"
 
 #include "xf86Module_priv.h"
diff --git a/hw/xfree86/common/xf86VGAarbiter.c b/hw/xfree86/common/xf86VGAarbiter.c
index 55487b48b..9db8d044f 100644
--- a/hw/xfree86/common/xf86VGAarbiter.c
+++ b/hw/xfree86/common/xf86VGAarbiter.c
@@ -30,7 +30,7 @@
 
 #include "xorg-config.h"
 
-#include "xf86VGAarbiter_priv.h"
+#include "xf86VGAarbiter.h"
 #include "xf86VGAarbiterPriv.h"
 #include "xf86Bus.h"
 #include "xf86Priv.h"
diff --git a/hw/xfree86/common/xf86VGAarbiter.h b/hw/xfree86/common/xf86VGAarbiter.h
index 260d366d4..bb52cf78a 100644
--- a/hw/xfree86/common/xf86VGAarbiter.h
+++ b/hw/xfree86/common/xf86VGAarbiter.h
@@ -30,6 +30,14 @@
 #include "misc.h"
 #include "xf86.h"
 
+/* Functions */
+extern void xf86VGAarbiterInit(void);
+extern void xf86VGAarbiterFini(void);
+void xf86VGAarbiterScrnInit(ScrnInfoPtr pScrn);
+extern Bool xf86VGAarbiterWrapFunctions(void);
+extern void xf86VGAarbiterLock(ScrnInfoPtr pScrn);
+extern void xf86VGAarbiterUnlock(ScrnInfoPtr pScrn);
+
 /* allow a driver to remove itself from arbiter - really should be
  * done in the kernel though */
 extern _X_EXPORT void xf86VGAarbiterDeviceDecodes(ScrnInfoPtr pScrn, int rsrc);
diff --git a/hw/xfree86/common/xf86VGAarbiter_priv.h b/hw/xfree86/common/xf86VGAarbiter_priv.h
deleted file mode 100644
index 5c23d83d3..000000000
--- a/hw/xfree86/common/xf86VGAarbiter_priv.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* SPDX-License-Identifier: MIT OR X11
- *
- * Copyright © 2024 Enrico Weigelt, metux IT consult <info@metux.net>
- */
-#ifndef _XSERVER_XF86VGAARBITERPRIV_H
-#define _XSERVER_XF86VGAARBITERPRIV_H
-
-#include <X11/Xdefs.h>
-
-#include "xf86VGAarbiter.h"
-
-#ifdef XSERVER_LIBPCIACCESS
-
-void xf86VGAarbiterInit(void);
-void xf86VGAarbiterFini(void);
-void xf86VGAarbiterScrnInit(ScrnInfoPtr pScrn);
-Bool xf86VGAarbiterWrapFunctions(void);
-void xf86VGAarbiterLock(ScrnInfoPtr pScrn);
-void xf86VGAarbiterUnlock(ScrnInfoPtr pScrn);
-
-#else /* XSERVER_LIBPCIACCESS */
-
-static inline void xf86VGAarbiterInit() {}
-static inline void xf86VGAarbiterFini() {}
-static inline void xf86VGAarbiterScrnInit(ScrnInfoPtr pScrn) {}
-static inline void xf86VGAarbiterWrapFunctions(void) { return FALSE; }
-static inline void xf86VGAarbiterLock(ScrnInfoPtr pScrn) {}
-static inline void xf86VGAarbiterUnlock(ScrnInfoPtr pScrn) {}
-
-#endif /* XSERVER_LIBPCIACCESS */
-
-#endif /* _XSERVER_XF86VGAARBITERPRIV_H */