summaryrefslogtreecommitdiffstats
path: root/lib/Xconfig/various.pm
diff options
context:
space:
mode:
authorChristophe Fergeau <cfergeau@mandriva.com>2009-04-21 13:01:03 +0000
committerChristophe Fergeau <cfergeau@mandriva.com>2009-04-21 13:01:03 +0000
commit19be4fd74c24b0a05522c61b4658b0cffa144f59 (patch)
tree398fc19abcb114298065efaf82398599f8e4bd45 /lib/Xconfig/various.pm
parent3e2aa7762ff206975582cd2af4e483983614ed72 (diff)
downloaddrakx-kbd-mouse-x11-19be4fd74c24b0a05522c61b4658b0cffa144f59.tar
drakx-kbd-mouse-x11-19be4fd74c24b0a05522c61b4658b0cffa144f59.tar.gz
drakx-kbd-mouse-x11-19be4fd74c24b0a05522c61b4658b0cffa144f59.tar.bz2
drakx-kbd-mouse-x11-19be4fd74c24b0a05522c61b4658b0cffa144f59.tar.xz
drakx-kbd-mouse-x11-19be4fd74c24b0a05522c61b4658b0cffa144f59.zip
Tweak xorg.conf writing with intel driver
Diffstat (limited to 'lib/Xconfig/various.pm')
-rw-r--r--lib/Xconfig/various.pm20
1 files changed, 16 insertions, 4 deletions
diff --git a/lib/Xconfig/various.pm b/lib/Xconfig/various.pm
index 965af92..c5cae19 100644
--- a/lib/Xconfig/various.pm
+++ b/lib/Xconfig/various.pm
@@ -151,10 +151,22 @@ sub config {
}
if (exists $various->{EXA}) {
- if ($various->{EXA}) {
- $card->{Options}{AccelMethod} = 'EXA';
- } else {
- delete $card->{Options}{AccelMethod};
+ if ($card->{Driver} eq 'intel') {
+ # the intel driver is able to automatically pick UXA/EXA
+ # when xorg.conf has no accel method defined, but XAA
+ # has to be explicitly selected, that's why the logic
+ # is reversed compared to the other drivers
+ if ($various->{EXA}) {
+ delete $card->{Options}{AccelMethod};
+ } else {
+ $card->{Options}{AccelMethod} = 'XAA';
+ }
+ } else {
+ if ($various->{EXA}) {
+ $card->{Options}{AccelMethod} = 'EXA';
+ } else {
+ delete $card->{Options}{AccelMethod};
+ }
}
}