frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xfree86: provide xf86DisableGeneralHandler() 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>
This commit is contained in:
Enrico Weigelt, metux IT consult 2025-06-23 11:09:45 +02:00
parent 40dc3b6419
commit 3f5e4b1d97
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
hw/xfree86/common/xf86Events.c
View File

@ -342,20 +342,32 @@ xf86UpdateHasVTProperty(Bool hasVT)
static void xf86DisableInputHandler(void *handler); static void xf86DisableInputHandler(void *handler);
static void xf86EnableInputHandler(void *handler); static void xf86EnableInputHandler(void *handler);
static void xf86DisableGeneralHandler(void *handler);
static void _xf86EnableGeneralHandler(void *handler); static void _xf86EnableGeneralHandler(void *handler);
static void _xf86DisableGeneralHandler(void *handler);
_X_EXPORT /* needs to be exported for Nvidia legacy (470.256.02) */ _X_EXPORT /* needs to be exported for Nvidia legacy (470.256.02) */
void xf86EnableGeneralHandler(void *handler); void xf86EnableGeneralHandler(void *handler);
_X_EXPORT /* needs to be exported for Nvidia legacy (470.256.02) */
void xf86DisableGeneralHandler(void *handler);
void xf86EnableGeneralHandler(void *handler) { void xf86EnableGeneralHandler(void *handler) {
LogMessageVerb(X_WARNING, 0, "Outdated driver still using xf86EnableGeneralHandler() !\n"); 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, "File a bug report to driver vendor or use a FOSS driver.\n");
LogMessageVerb(X_WARNING, 0, "https://forums.developer.nvidia.com/c/gpu-graphics/linux/148\n");
LogMessageVerb(X_WARNING, 0, "Proprietary drivers are inherently unstable, they just can't be done right.\n"); LogMessageVerb(X_WARNING, 0, "Proprietary drivers are inherently unstable, they just can't be done right.\n");
_xf86EnableGeneralHandler(handler); _xf86EnableGeneralHandler(handler);
} }
void xf86DisableGeneralHandler(void *handler) {
LogMessageVerb(X_WARNING, 0, "Outdated driver still using xf86DisableGeneralHandler() !\n");
LogMessageVerb(X_WARNING, 0, "File a bug report to driver vendor or use a FOSS driver.\n");
LogMessageVerb(X_WARNING, 0, "https://forums.developer.nvidia.com/c/gpu-graphics/linux/148\n");
LogMessageVerb(X_WARNING, 0, "Proprietary drivers are inherently unstable, they just can't be done right.\n");
_xf86DisableGeneralHandler(handler);
}
static void static void
xf86VTLeave(void) xf86VTLeave(void)
{ {
@ -383,7 +395,7 @@ xf86VTLeave(void)
if (ih->is_input) if (ih->is_input)
xf86DisableInputHandler(ih); xf86DisableInputHandler(ih);
else else
xf86DisableGeneralHandler(ih); _xf86DisableGeneralHandler(ih);
} }
for (pInfo = xf86InputDevs; pInfo; pInfo = pInfo->next) for (pInfo = xf86InputDevs; pInfo; pInfo = pInfo->next)
xf86DisableInputDeviceForVTSwitch(pInfo); xf86DisableInputDeviceForVTSwitch(pInfo);
@ -649,7 +661,7 @@ static void xf86DisableInputHandler(void *handler)
RemoveNotifyFd(ih->fd); RemoveNotifyFd(ih->fd);
} }
static void xf86DisableGeneralHandler(void *handler) static void _xf86DisableGeneralHandler(void *handler)
{ {
IHPtr ih; IHPtr ih;