qbit/xenocara
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Introduce a black list of drivers for Xorg -configure, and blacklist

Browse Source 
all radeon driver variants, except radeonold.
This fixes the conflicting symbols warnings seen by Xorg -configure
and forces it to use radeonold in the generated xorg.conf file.

Xorg -configure is still broken in many ways, and should be
avoided.
This commit is contained in:
matthieu 2012-03-04 17:55:31 +00:00
parent b8447e938e
commit e4b13eedd8
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
xserver/hw/xfree86/common/xf86Config.c
View File

@ -499,7 +499,8 @@ static void
fixup_video_driver_list(char **drivers)
{
static const char *fallback[4] = { "vesa", "fbdev", "wsfb", NULL };
char **end, **drv;
static const char *blacklist[] = { "radeonhd", "radeon", NULL };
char **end, **drv, **d;
char *x;
int i;
@ -520,6 +521,16 @@ fixup_video_driver_list(char **drivers)
}
}
}
/* Remove blacklisted drivers */
for (i = 0; blacklist[i]; i++) {
for (drv = drivers; drv != end; drv++) {
if (strcmp(*drv, blacklist[i]) == 0) {
end--;
for (d = drv; d != end; d++)
*d = *(d+1);
}
}
}
}
static char **