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

Merge 8921ce7466 into d403cbd25c

This commit is contained in:
Collin 2025-07-04 13:42:57 -07:00 committed by GitHub
parent d403cbd25c 8921ce7466
commit 4417e66018
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hw/xfree86/loader/loadmod.c
View File

@ -417,7 +417,10 @@ CheckVersion(const char *module, XF86ModuleVersionInfo * data,
{ {
int vercode[4]; int vercode[4];
long ver = data->xf86version; long ver = data->xf86version;
/* Only ignore ABI mismatches for NVIDIA proprietary driver */
if (data->vendor && strstr(data->vendor, "NVIDIA") != NULL) {
LoaderOptions |= LDR_OPT_ABI_MISMATCH_NONFATAL;
}
LogMessage(X_INFO, "Module %s: vendor=\"%s\"\n", LogMessage(X_INFO, "Module %s: vendor=\"%s\"\n",
data->modname ? data->modname : "UNKNOWN!", data->modname ? data->modname : "UNKNOWN!",
data->vendor ? data->vendor : "UNKNOWN!"); data->vendor ? data->vendor : "UNKNOWN!");
@ -482,7 +485,6 @@ CheckVersion(const char *module, XF86ModuleVersionInfo * data,
} }
} }
} }
/* Check against requirements that the caller has specified */ /* Check against requirements that the caller has specified */
if (req) { if (req) {
if (data->majorversion != req->majorversion) { if (data->majorversion != req->majorversion) {