summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2005-09-16 09:26:03 +0000
committerPascal Rigaux <pixel@mandriva.com>2005-09-16 09:26:03 +0000
commit4740cee1c5581765e397aee0f6b35482b5ef2fab (patch)
tree79f8314a3b3d21628df7ca588cf49147ad64b8ed
parente11009e000a63c26f153c8846769cb84da0cb2c5 (diff)
downloaddrakx-4740cee1c5581765e397aee0f6b35482b5ef2fab.tar
drakx-4740cee1c5581765e397aee0f6b35482b5ef2fab.tar.gz
drakx-4740cee1c5581765e397aee0f6b35482b5ef2fab.tar.bz2
drakx-4740cee1c5581765e397aee0f6b35482b5ef2fab.tar.xz
drakx-4740cee1c5581765e397aee0f6b35482b5ef2fab.zip
don't load glx with fbdev (since glx is used for various things nowadays, dixit fredl)
-rw-r--r--perl-install/Xconfig/card.pm2
1 files changed, 1 insertions, 1 deletions
diff --git a/perl-install/Xconfig/card.pm b/perl-install/Xconfig/card.pm
index 486ec13d3..23e1d1e18 100644
--- a/perl-install/Xconfig/card.pm
+++ b/perl-install/Xconfig/card.pm
@@ -63,7 +63,7 @@ sub to_raw_X {
$raw_X->get_ServerLayout->{Xinerama} = { commented => !$card->{Xinerama}, Option => 1 }
if defined $card->{Xinerama};
- $raw_X->set_load_module('glx', !$card->{DRI_GLX_SPECIAL}); #- glx for everyone, except proprietary nvidia
+ $raw_X->set_load_module('glx', !$card->{DRI_GLX_SPECIAL} && $card->{Driver} ne 'fbdev'); #- glx for everyone, except proprietary nvidia and fbdev
$raw_X->set_load_module('dri', $card->{use_DRI_GLX} && !$card->{DRI_GLX_SPECIAL});
# This loads the NVIDIA GLX extension module.