summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2001-06-11 16:45:42 +0000
committerFrancois Pons <fpons@mandriva.com>2001-06-11 16:45:42 +0000
commit595bf584615a30051c137fa026b490bb312f6e21 (patch)
treef0de0a3145b6b4fa99d7f92f5a8b97190c137402
parent4e83b17935d2501761688c66d10cd41968e2311f (diff)
downloaddrakx-backup-do-not-use-595bf584615a30051c137fa026b490bb312f6e21.tar
drakx-backup-do-not-use-595bf584615a30051c137fa026b490bb312f6e21.tar.gz
drakx-backup-do-not-use-595bf584615a30051c137fa026b490bb312f6e21.tar.bz2
drakx-backup-do-not-use-595bf584615a30051c137fa026b490bb312f6e21.tar.xz
drakx-backup-do-not-use-595bf584615a30051c137fa026b490bb312f6e21.zip
really fix the Matrox G200 PCI card acceleration using XF3, by disabling DMA on
/etc/X11/glx.conf
-rw-r--r--perl-install/Xconfigurator.pm6
1 files changed, 6 insertions, 0 deletions
diff --git a/perl-install/Xconfigurator.pm b/perl-install/Xconfigurator.pm
index 64abd991d..226aca3ba 100644
--- a/perl-install/Xconfigurator.pm
+++ b/perl-install/Xconfigurator.pm
@@ -394,6 +394,12 @@ NOTE THIS IS EXPERIMENTAL SUPPORT AND MAY FREEZE YOUR COMPUTER.", $xf3_ver)) . "
-x "$prefix$card->{prog}" or $install && $install->($card->{use_xf4} ? 'XFree86-server' : "XFree86-$card->{server}", @l);
-x "$prefix$card->{prog}" or die "server $card->{server} is not available (should be in $prefix$card->{prog})";
+ #- check for Matrox G200 PCI cards, disable AGP in such cases, causes black screen else.
+ if ($card->{identifier} =~ /Matrox.* G[24][05]0/ && $card->{identifier} !~ /AGP/) {
+ log::l("disabling AGP mode for Matrox card, as it seems to be a PCI card");
+ log::l("this is only used for XFree 3.3.6, see /etc/X11/glx.conf");
+ substInFile { s/^\s*#?\s*mga_dma\s*=\s*\d+\s*/mga_dma = 0/ } "$prefix/etc/X11/glx.conf";
+ }
#- make sure everything is correct at this point, packages have really been installed
#- and driver and GLX extension is present.
if ($card->{NVIDIA_glx} && !$card->{DRI_glx} && (-e "$prefix/usr/X11R6/lib/modules/drivers/nvidia_drv.o" &&