From 33a0dbe321bbdd98fb4e7d6586b7d95d9aa5a243 Mon Sep 17 00:00:00 2001 From: Anssi Hannula Date: Tue, 9 Feb 2010 18:55:05 +0000 Subject: XFrake: o do not disable loading of dri module for non-glx drivers, as KMS drivers require it as well o do not disable loading of glx module for fbdev, in order to allow AIGLX to work in software rasterizer mode o do not add dbe and extmod modules to xorg.conf anymore, they are loaded by default anyway --- lib/Xconfig/card.pm | 5 +++-- lib/Xconfig/default.pm | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'lib/Xconfig') diff --git a/lib/Xconfig/card.pm b/lib/Xconfig/card.pm index db8d19e..ad464d6 100644 --- a/lib/Xconfig/card.pm +++ b/lib/Xconfig/card.pm @@ -77,8 +77,9 @@ sub to_raw_X { #- if we have some special ModulePath, ensure the last one is the standard ModulePath $raw_X->add_ModulePath(modules_dir()) if $raw_X->get_ModulePaths; - $raw_X->set_load_module('glx', $card->{Driver} ne 'fbdev'); #- glx for everyone, except fbdev - $raw_X->set_load_module('dri', $card->{use_DRI_GLX}); #- dri when needed, except proprietary nvidia + #- un-disable modules that we previously disabled + $raw_X->remove_disable_module('glx'); + $raw_X->remove_disable_module('dri'); $raw_X->remove_Section('DRI'); diff --git a/lib/Xconfig/default.pm b/lib/Xconfig/default.pm index 722ff35..cc09660 100644 --- a/lib/Xconfig/default.pm +++ b/lib/Xconfig/default.pm @@ -22,7 +22,7 @@ sub configure { my $raw_X = Xconfig::xfree->empty_config; - $raw_X->add_load_module($_) foreach qw(dbe v4l extmod); + $raw_X->add_load_module('v4l'); config_mouse($raw_X, $do_pkgs, $mouse); -- cgit v1.2.1