From 22d963bc4dc6d8ac810f07cd093bb440a937badf Mon Sep 17 00:00:00 2001
From: stefan11111 <stefan11111@shitposting.expert>
Date: Thu, 11 Sep 2025 00:41:57 +0300
Subject: [PATCH] hw/xfree86/common: remove xf86PostProbe

A long time ago, this function used to initialize
various screen resources.
Now, this function just kills the X server in various circumstances
for no good reason.

Fixes: https://gitlab.freedesktop.org/xorg/xserver/-/commit/fc78bcca21e767697de6ad4d8e03b6728856f613
Fixes: https://gitlab.freedesktop.org/xorg/xserver/-/commit/728b54528d37ffa27b07c9b181c5ed8d2d359379
Fixes: https://gitlab.freedesktop.org/xorg/driver/xf86-video-fbdev/-/issues/9
Signed-off-by: stefan11111 <stefan11111@shitposting.expert>
---
 hw/xfree86/common/xf86Bus.c       | 24 ------------------------
 hw/xfree86/common/xf86Bus.h       |  1 -
 hw/xfree86/common/xf86Configure.c |  2 --
 hw/xfree86/common/xf86Init.c      |  1 -
 4 files changed, 28 deletions(-)

diff --git a/hw/xfree86/common/xf86Bus.c b/hw/xfree86/common/xf86Bus.c
index 1905ec3107..7d874eb4b1 100644
--- a/hw/xfree86/common/xf86Bus.c
+++ b/hw/xfree86/common/xf86Bus.c
@@ -553,30 +553,6 @@ xf86GetDevFromEntity(int entityIndex, int instance)
     return NULL;
 }
 
-/*
- * xf86PostProbe() -- Allocate all non conflicting resources
- * This function gets called by xf86Init().
- */
-void
-xf86PostProbe(void)
-{
-    if (fbSlotClaimed && (
-#if (defined(__sparc__) || defined(__sparc)) && !defined(__OpenBSD__)
-                             sbusSlotClaimed ||
-#endif
-#ifdef XSERVER_PLATFORM_BUS
-                             platformSlotClaimed ||
-#endif
-#ifdef XSERVER_LIBPCIACCESS
-                             pciSlotClaimed
-#else
-                             TRUE
-#endif
-        ))
-        FatalError("Cannot run in framebuffer mode. Please specify busIDs "
-                   "       for all framebuffer devices\n");
-}
-
 Bool
 xf86IsEntityShared(int entityIndex)
 {
diff --git a/hw/xfree86/common/xf86Bus.h b/hw/xfree86/common/xf86Bus.h
index 5072cb9ec6..d80ca29f2d 100644
--- a/hw/xfree86/common/xf86Bus.h
+++ b/hw/xfree86/common/xf86Bus.h
@@ -83,7 +83,6 @@ _X_EXPORT /* only for internal int10 module - not supposed to be used by OOT dri
 ScrnInfoPtr xf86FindScreenForEntity(int entityIndex);
 
 Bool xf86BusConfig(void);
-void xf86PostProbe(void);
 void xf86ClearEntityListForScreen(ScrnInfoPtr pScrn);
 void xf86RemoveDevFromEntity(int entityIndex, GDevPtr dev);
 
diff --git a/hw/xfree86/common/xf86Configure.c b/hw/xfree86/common/xf86Configure.c
index 2bcc215c07..b94ee7a08a 100644
--- a/hw/xfree86/common/xf86Configure.c
+++ b/hw/xfree86/common/xf86Configure.c
@@ -769,8 +769,6 @@ DoConfigure(void)
         goto bail;
     }
 
-    xf86PostProbe();
-
     for (j = 0; j < xf86NumScreens; j++) {
         xf86Screens[j]->scrnIndex = j;
     }
diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
index 893503a049..cd1cddb968 100644
--- a/hw/xfree86/common/xf86Init.c
+++ b/hw/xfree86/common/xf86Init.c
@@ -444,7 +444,6 @@ InitOutput(int argc, char **argv)
         if (xf86BusConfig() == FALSE)
             return;
 
-        xf86PostProbe();
 
         /*
          * Sort the drivers to match the requested ording.  Using a slow