On Wed, May 23, 2012 at 10:05:53PM +1000, Christopher James Halse Rogers wrote: > This makes life a bit easier for the drivers
These look good, all committed. Except for the nouveau patch, of course. Kristian > Signed-off-by: Christopher James Halse Rogers > <[email protected]> > --- > hw/xfree86/common/xf86Config.c | 12 ++++++++++++ > 1 file changed, 12 insertions(+) > > diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c > index 7364a34..b916422 100644 > --- a/hw/xfree86/common/xf86Config.c > +++ b/hw/xfree86/common/xf86Config.c > @@ -125,6 +125,7 @@ static ModuleDefault ModuleDefaults[] = { > #ifdef DRI2 > {.name = "dri2", .toLoad = TRUE, .load_opt=NULL}, > #endif > + {.name = "xwayland", .toLoad = FALSE, .load_opt=NULL}, > {.name = NULL, .toLoad = FALSE, .load_opt=NULL} > }; > > @@ -264,6 +265,17 @@ xf86ModulelistFromConfig(pointer **optlist) > xf86Msg(X_ERROR, "Cannot access global config data structure\n"); > return NULL; > } > + > + /* > + * Set the xwayland module to autoload if requested. > + */ > + if (xorgWayland) { > + for (i=0 ; ModuleDefaults[i].name != NULL ; i++) { > + if (strcmp(ModuleDefaults[i].name, "xwayland") == 0) { > + ModuleDefaults[i].toLoad = TRUE; > + } > + } > + } > > if (xf86configptr->conf_modules) { > /* Walk the disable list and let people know what we've parsed to > -- > 1.7.10 > > _______________________________________________ > wayland-devel mailing list > [email protected] > http://lists.freedesktop.org/mailman/listinfo/wayland-devel _______________________________________________ wayland-devel mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/wayland-devel
