diff options
| author | Francois Pons <fpons@mandriva.com> | 2001-07-17 16:43:48 +0000 |
|---|---|---|
| committer | Francois Pons <fpons@mandriva.com> | 2001-07-17 16:43:48 +0000 |
| commit | b446027498f31bd825502ff98dab714398d9a4ec (patch) | |
| tree | 251071b8ecdf21c3967e3bcc1ff6e59166d50cb8 | |
| parent | 3adb35275ecf8786f5f57d42036758b0de85ec7d (diff) | |
| download | drakx-b446027498f31bd825502ff98dab714398d9a4ec.tar drakx-b446027498f31bd825502ff98dab714398d9a4ec.tar.gz drakx-b446027498f31bd825502ff98dab714398d9a4ec.tar.bz2 drakx-b446027498f31bd825502ff98dab714398d9a4ec.tar.xz drakx-b446027498f31bd825502ff98dab714398d9a4ec.zip | |
cleaned and added S3 Inc in the list to disable test for these card.
| -rw-r--r-- | perl-install/Xconfigurator.pm | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/perl-install/Xconfigurator.pm b/perl-install/Xconfigurator.pm index cbe24f5d9..12b8fcdde 100644 --- a/perl-install/Xconfigurator.pm +++ b/perl-install/Xconfigurator.pm @@ -154,7 +154,7 @@ sub cardConfigurationAuto() { my $card = { identifier => ($c[$i]{description} . (@c > 1 && " $i")) }; $card->{type} = $1 if /Card:(.*)/; $card->{server} = $1 if /Server:(.*)/; - $card->{flags}{needVideoRam} = /86c368|S3/; + $card->{flags}{needVideoRam} = /86c368|S3 Inc/; $card->{busid} = "PCI:$c[$i]{pci_bus}:$c[$i]{pci_device}:$c[$i]{pci_function}"; push @{$card->{lines}}, @{$lines{$card->{identifier}} || []}; push @cards, $card; @@ -545,8 +545,7 @@ sub testFinalConfig { $skiptest || $o->{card}{server} =~ 'FBDev|Sun' and return 1; #- avoid testing with these. #- needed for bad cards not restoring cleanly framebuffer - my $bad_card = $o->{card}{identifier} =~ /i740|ViRGE/; - $bad_card ||= $o->{card}{identifier} =~ /Rage Mobility (?:P\/M|L) / || $o->{card}{identifier} =~ /3D Rage LT/; + my $bad_card = $o->{card}{identifier} =~ /i740|ViRGE|S3 Inc|Rage Mobility (?:P\/M|L) |3D Rage LT/; $bad_card ||= $o->{card}{use_xf4}; #- TODO obsoleted to check, when using fbdev of XFree 4! log::l("the graphic card does not like X in framebuffer") if $bad_card; |