summaryrefslogtreecommitdiffstats
path: root/lib/Xconfig
diff options
context:
space:
mode:
Diffstat (limited to 'lib/Xconfig')
-rw-r--r--lib/Xconfig/card.pm17
-rw-r--r--lib/Xconfig/xfree.pm3
2 files changed, 3 insertions, 17 deletions
diff --git a/lib/Xconfig/card.pm b/lib/Xconfig/card.pm
index b87dce8..d4b5b6d 100644
--- a/lib/Xconfig/card.pm
+++ b/lib/Xconfig/card.pm
@@ -28,7 +28,7 @@ my %VideoRams = (
65536 => N_("64 MB or more"),
);
-my @xfree4_Drivers = ((arch() =~ /^sparc/ ? qw(sunbw2 suncg14 suncg3 suncg6 sunffb sunleo suntcx) :
+my @xfree4_Drivers = ((
qw(apm ark ast chips cirrus i128 i740 intel mga
neomagic newport nouveau nv openchrome psb qxl
rendition s3 s3virge savage siliconmotion sis sisusb
@@ -59,12 +59,6 @@ sub to_raw_X {
my @cards = ($card, @{$card->{cards} || []});
- foreach (@cards) {
- if (arch() =~ /ppc/ && member($_->{Driver}, qw(r128 radeon))) {
- $_->{UseFBDev} = 1;
- }
- }
-
$raw_X->set_devices(@cards);
$raw_X->get_ServerLayout->{Xinerama} = { commented => !$card->{Xinerama}, Option => 1 }
@@ -119,12 +113,6 @@ sub probe() {
if (@cards >= 2 && $cards[0]{card_name} eq $cards[1]{card_name} && $cards[0]{card_name} eq 'Intel 830 - 965') {
shift @cards;
}
- #- take a default on sparc if nothing has been found.
- if (arch() =~ /^sparc/ && !@cards) {
- log::l("Using probe with /proc/fb as nothing has been found!");
- my $s = cat_("/proc/fb");
- @cards = { server => $s =~ /Mach64/ ? "Mach64" : $s =~ /Permedia2/ ? "3DLabs" : "Sun24" };
- }
#- disabling MULTI_HEAD when not available
foreach (@cards) {
@@ -138,8 +126,7 @@ sub probe() {
#- in case of only one cards, remove all BusID reference, this will avoid
#- need of change of it if the card is moved.
- #- on many PPC machines, card is on-board, BusID is important, leave?
- if (@cards == 1 && !$cards[0]{MULTI_HEAD} && arch() !~ /ppc/) {
+ if (@cards == 1 && !$cards[0]{MULTI_HEAD}) {
delete $cards[0]{BusID};
}
diff --git a/lib/Xconfig/xfree.pm b/lib/Xconfig/xfree.pm
index 08221e7..c235084 100644
--- a/lib/Xconfig/xfree.pm
+++ b/lib/Xconfig/xfree.pm
@@ -841,7 +841,7 @@ $default_header .= <<'END';
EndSection
END
-our $default_ModeLine = arch() =~ /ppc/ ? <<'END_PPC' : <<'END';
+our $default_ModeLine = <<'END';
# Apple iMac modes
ModeLine "1024x768" 78.525 1024 1049 1145 1312 768 769 772 800 +hsync +vsync
ModeLine "800x600" 62.357 800 821 901 1040 600 601 604 632 +hsync +vsync
@@ -862,7 +862,6 @@ our $default_ModeLine = arch() =~ /ppc/ ? <<'END_PPC' : <<'END';
ModeLine "1280x1024" 135 1280 1288 1392 1664 1024 1027 1030 1064
# Another variation
ModeLine "1280x1024" 134.989 1280 1317 1429 1688 1024 1025 1028 1066 +hsync +vsync
-END_PPC
# TV fullscreen mode or DVD fullscreen output.
# 768x576 @ 79 Hz, 50 kHz hsync
ModeLine "768x576" 50.00 768 832 846 1000 576 590 595 630