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

Push the fallback drivers to the end of the list so driver probe order 

stays useful.
This commit is contained in:
Adam Jackson 2005-12-09 05:36:41 +00:00
parent 80ea67e379
commit 17ac5e9fec
1 changed files with 47 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
hw/xfree86/common/xf86Config.c
View File

@ -458,9 +458,55 @@ static char **
GenerateDriverlist(char * dirname, char * drivernames)
{
#ifdef XFree86LOADER
char **ret;
char *subdirs[] = { dirname, NULL };
static const char *patlist[] = {"(.*)_drv\\.so", "(.*)_drv\\.o", NULL};
return LoaderListDirs(subdirs, patlist);
ret = LoaderListDirs(subdirs, patlist);
/* fix up the probe order for video drivers */
if (strstr(dirname, "drivers")) {
char **tmp, **vesa, **vga, **fbdev, **wsfb;
char *x;
/* walk to the end of the list */
for (tmp = ret; *tmp && **tmp; tmp++) ;
tmp--;
/*
* for each of the fallback drivers, if we find it in the list,
* swap it with the last available non-fallback driver.
*/
for (vga = ret; vga != tmp; vga++) {
if (strstr(*vga, "vga")) {
x = *vga; *vga = *tmp; *tmp = x;
tmp--;
break;
}
}
for (vesa = ret; vesa != tmp; vesa++) {
if (strstr(*vesa, "vesa")) {
x = *vesa; *vesa = *tmp; *tmp = x;
tmp--;
break;
}
}
for (fbdev = ret; fbdev != tmp; fbdev++) {
if (strstr(*fbdev, "fbdev")) {
x = *fbdev; *fbdev = *tmp; *fbdev = x;
tmp--;
break;
}
}
for (wsfb = ret; wsfb != tmp; wsfb++) {
if (strstr(*wsfb, "wsfb")) {
x = *wsfb; *wsfb = *tmp; *wsfb = x;
tmp--;
break;
}
}
}
return ret;
#else /* non-loadable server */
char *cp, **driverlist;
int count;