From 66547c7971a8a6a60c41b7a3cad34eab5899d6d2 Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Fri, 20 Jun 2025 16:48:51 +0200
Subject: [PATCH] xfree86: provide xf86EnableGeneralHandler() for Nvidia driver

The proprietary NVidia driver want's to call an internal function for reasons
unknown to us. Adding a little wrapper for it, that's also printing out some
warning message in the log.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
---
 hw/xfree86/common/xf86Events.c | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/hw/xfree86/common/xf86Events.c b/hw/xfree86/common/xf86Events.c
index 442579200..133a73b30 100644
--- a/hw/xfree86/common/xf86Events.c
+++ b/hw/xfree86/common/xf86Events.c
@@ -343,7 +343,18 @@ xf86UpdateHasVTProperty(Bool hasVT)
 static void xf86DisableInputHandler(void *handler);
 static void xf86EnableInputHandler(void *handler);
 static void xf86DisableGeneralHandler(void *handler);
-static void xf86EnableGeneralHandler(void *handler);
+
+static void _xf86EnableGeneralHandler(void *handler);
+
+_X_EXPORT /* needs to be exported for Nvidia legacy (470.256.02) */
+void xf86EnableGeneralHandler(void *handler);
+
+void xf86EnableGeneralHandler(void *handler) {
+    LogMessageVerb(X_WARNING, 0, "Outdated driver still using xf86EnableGeneralHandler() !\n");
+    LogMessageVerb(X_WARNING, 0, "File a bug report to driver vendor or use a FOSS driver.\n");
+    LogMessageVerb(X_WARNING, 0, "Proprietary drivers are inherently unstable, they just can't be done right.\n");
+    _xf86EnableGeneralHandler(handler);
+}
 
 static void
 xf86VTLeave(void)
@@ -432,7 +443,7 @@ switch_failed:
         if (ih->is_input)
             xf86EnableInputHandler(ih);
         else
-            xf86EnableGeneralHandler(ih);
+            _xf86EnableGeneralHandler(ih);
     }
     input_unlock();
 }
@@ -480,7 +491,7 @@ xf86VTEnter(void)
         if (ih->is_input)
             xf86EnableInputHandler(ih);
         else
-            xf86EnableGeneralHandler(ih);
+            _xf86EnableGeneralHandler(ih);
     }
 #ifdef XSERVER_PLATFORM_BUS
     /* check for any new output devices */
@@ -664,7 +675,7 @@ static void xf86EnableInputHandler(void *handler)
         SetNotifyFd(ih->fd, xf86InputHandlerNotify, X_NOTIFY_READ, ih);
 }
 
-static void xf86EnableGeneralHandler(void *handler)
+static void _xf86EnableGeneralHandler(void *handler)
 {
     IHPtr ih;