From 45b1e6e0bb11338a3b154dd67e8a96eb7cb2bd76 Mon Sep 17 00:00:00 2001
From: Collin <haplessgaming@gmail.com>
Date: Thu, 26 Jun 2025 18:58:51 -0500
Subject: [PATCH] Update loader.c to add ABI Mismatch Warning for NVIDIA Driver

makes the -IgnoreABI flag assumed and adds a new warning in logs to show ABI mismatch. It warns in the log of the mismatch and returns true instead of killing X with this modification. It is unknown how long the latest nvidia driver will continue working with IgnoreABI, but I think its a worthy feature to add in the interm of a better solution.
---
 hw/xfree86/loader/loader.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/hw/xfree86/loader/loader.c b/hw/xfree86/loader/loader.c
index 5af7a54f3..4595cffde 100644
--- a/hw/xfree86/loader/loader.c
+++ b/hw/xfree86/loader/loader.c
@@ -157,7 +157,14 @@ LoaderSetOptions(unsigned long opts)
 Bool
 LoaderShouldIgnoreABI(void)
 {
-    return (LoaderOptions & LDR_OPT_ABI_MISMATCH_NONFATAL) != 0;
+    LogMessage(X_WARNING,
+               "ABI mismatch detected possibly from an NVIDIA driver. Attempting to continue loading X...\n"
+               "Expected ABI versions: ANSIC=%d, VideoDriver=%d, XInput=%d, Extension=%d\n",
+               LoaderVersionInfo.ansicVersion,
+               LoaderVersionInfo.videodrvVersion,
+               LoaderVersionInfo.xinputVersion,
+               LoaderVersionInfo.extensionVersion);
+    return TRUE;
 }
 
 int