xfree86: drop xf86VGAarbiter.h

It doesn't serve any practical purpose anymore and also isn't included
by any external driver, thus also no need to keep it in SDK.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>

hw/xfree86/common/meson.build

@@ -39,7 +39,6 @@ xorg_sdk_headers = [
     'xisb.h',
     'xorgVersion.h',
     'xf86sbusBus.h',
-    'xf86VGAarbiter.h',
     'xf86Optionstr.h',
     'xf86platformBus.h',
     'xaarop.h',

hw/xfree86/common/xf86.h

@@ -125,8 +125,6 @@ extern _X_EXPORT ScrnInfoPtr xf86ConfigPciEntity(ScrnInfoPtr pScrn,
                                                  EntityProc enter,
                                                  EntityProc leave,
                                                  void *private);
-#else
-#define xf86VGAarbiterDeviceDecodes() do {} while (0)
 #endif
 
 /* xf86Bus.c */

hw/xfree86/common/xf86Init.c

@@ -84,9 +84,6 @@
 #include "picturestr.h"
 #include "randrstr.h"
 #include "xf86Bus.h"
-#ifdef XSERVER_LIBPCIACCESS
-#include "xf86VGAarbiter.h"
-#endif
 #include "globals.h"
 #include "xserver-properties.h"
 

hw/xfree86/common/xf86VGAarbiter.c

@@ -137,15 +137,6 @@ xf86VGAarbiterScrnInit(ScrnInfoPtr pScrn)
     pScrn->vgaDev = dev;
 }
 
-void
-xf86VGAarbiterDeviceDecodes(ScrnInfoPtr pScrn, int rsrc)
-{
-    if (vga_no_arb)
-        return;
-    pci_device_vgaarb_set_target(pScrn->vgaDev);
-    pci_device_vgaarb_decodes(rsrc);
-}
-
 Bool
 xf86VGAarbiterWrapFunctions(void)
 {

hw/xfree86/common/xf86VGAarbiter.h

@@ -1,41 +0,0 @@
-/*
- * Copyright (c) 2009 Tiago Vignatti
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef __XF86VGAARBITER_H
-#define __XF86VGAARBITER_H
-
-#include "screenint.h"
-#include "misc.h"
-#include "xf86.h"
-
-/* 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);
-
-/* DRI and arbiter are really not possible together,
- * you really want to remove the card from arbitration if you can */
-extern _X_EXPORT Bool xf86VGAarbiterAllowDRI(ScreenPtr pScreen);
-
-#endif                          /* __XF86VGAARBITER_H */

hw/xfree86/common/xf86VGAarbiter_priv.h

@@ -7,7 +7,7 @@
 
 #include <X11/Xdefs.h>
 
-#include "xf86VGAarbiter.h"
+#include "xf86str.h"
 
 #ifdef XSERVER_LIBPCIACCESS
 
@@ -29,4 +29,6 @@ static inline void xf86VGAarbiterUnlock(ScrnInfoPtr pScrn) {}
 
 #endif /* XSERVER_LIBPCIACCESS */
 
+Bool xf86VGAarbiterAllowDRI(ScreenPtr pScreen);
+
 #endif /* _XSERVER_XF86VGAARBITERPRIV_H */

hw/xfree86/dri/dri.c

@@ -72,7 +72,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "xf86_os_support.h"
 #include "xf86_OSproc.h"
 #include "inputstr.h"
-#include "xf86VGAarbiter.h"
+#include "xf86VGAarbiter_priv.h"
 #include "xf86Extensions.h"
 
 static int DRIEntPrivIndex = -1;

hw/xfree86/sdksyms.sh

@@ -122,9 +122,6 @@ cat > sdksyms.c << EOF
 #include "xf86.h"
 #include "xf86Module.h"
 #include "xf86Opt.h"
-#ifdef XSERVER_LIBPCIACCESS
- #include "xf86VGAarbiter.h"
-#endif
 #include "xf86Priv.h"
 #include "xf86Privstr.h"
 #include "xf86cmap.h"