summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2007-05-18 10:08:51 +0000
committerPascal Rigaux <pixel@mandriva.com>2007-05-18 10:08:51 +0000
commitdfdf0de4c63f8182a2cb8985e3258c3144f84bf2 (patch)
tree85b6b1bc343f59049a3b176fb77771eb5daaa157
parent9b70f6f33998fdd454be2a1a22d5cafe261eb177 (diff)
downloaddrakx-kbd-mouse-x11-dfdf0de4c63f8182a2cb8985e3258c3144f84bf2.tar
drakx-kbd-mouse-x11-dfdf0de4c63f8182a2cb8985e3258c3144f84bf2.tar.gz
drakx-kbd-mouse-x11-dfdf0de4c63f8182a2cb8985e3258c3144f84bf2.tar.bz2
drakx-kbd-mouse-x11-dfdf0de4c63f8182a2cb8985e3258c3144f84bf2.tar.xz
drakx-kbd-mouse-x11-dfdf0de4c63f8182a2cb8985e3258c3144f84bf2.zip
- remove all fglrx options, hopefully default is good enough
(and at least MonitorLayout option is depreacated as reported on cooker by Colin Close)
-rw-r--r--NEWS3
-rw-r--r--lib/Xconfig/card.pm67
2 files changed, 3 insertions, 67 deletions
diff --git a/NEWS b/NEWS
index 99c03ce..7164238 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+- remove all fglrx options, hopefully default is good enough
+ (and at least MonitorLayout option is depreacated as reported on cooker)
+
Version 0.17 - 9 May 2007, by Pascal "Pixel" Rigaux
- fix using proprietary driver (remove debug code) (thanks to Michael Altizer)
diff --git a/lib/Xconfig/card.pm b/lib/Xconfig/card.pm
index 5ac034a..aa7dab1 100644
--- a/lib/Xconfig/card.pm
+++ b/lib/Xconfig/card.pm
@@ -56,11 +56,6 @@ sub to_raw_X {
my @cards = ($card, @{$card->{cards} || []});
foreach (@cards) {
- #- Specific ATI fglrx driver default options
- if ($_->{Driver} eq 'fglrx') {
- # $default_ATI_fglrx_config need to be move in proprietary ?
- $_->{raw_LINES} ||= default_ATI_fglrx_config();
- }
if (arch() =~ /ppc/ && ($_->{Driver} eq 'r128' || $_->{Driver} eq 'radeon')) {
$_->{UseFBDev} = 1;
}
@@ -98,8 +93,6 @@ sub to_raw_X {
$raw_X->remove_load_module('v4l') if $card->{use_DRI_GLX} && $card->{Driver} eq 'r128';
}
-sub default_ATI_fglrx_config() { our $default_ATI_fglrx_config }
-
sub probe() {
#-for Pixel tests
#- my @c = { driver => 'Card:Matrox Millennium G400 DualHead', description => 'Matrox|Millennium G400 Dual HeadCard' };
@@ -500,65 +493,5 @@ sub readCardsDB {
\%cards;
}
-our $default_ATI_fglrx_config = <<'END';
-# === disable PnP Monitor ===
-#Option "NoDDC"
-# === disable/enable XAA/DRI ===
-Option "no_accel" "no"
-Option "no_dri" "no"
-# === FireGL DDX driver module specific settings ===
-# === Screen Management ===
-Option "DesktopSetup" "0x00000000"
-Option "MonitorLayout" "AUTO, AUTO"
-Option "IgnoreEDID" "off"
-Option "HSync2" "unspecified"
-Option "VRefresh2" "unspecified"
-Option "ScreenOverlap" "0"
-# === TV-out Management ===
-Option "NoTV" "yes"
-Option "TVStandard" "NTSC-M"
-Option "TVHSizeAdj" "0"
-Option "TVVSizeAdj" "0"
-Option "TVHPosAdj" "0"
-Option "TVVPosAdj" "0"
-Option "TVHStartAdj" "0"
-Option "TVColorAdj" "0"
-Option "GammaCorrectionI" "0x00000000"
-Option "GammaCorrectionII" "0x00000000"
-# === OpenGL specific profiles/settings ===
-Option "Capabilities" "0x00000000"
-# === Video Overlay for the Xv extension ===
-Option "VideoOverlay" "on"
-# === OpenGL Overlay ===
-# Note: When OpenGL Overlay is enabled, Video Overlay
-# will be disabled automatically
-Option "OpenGLOverlay" "off"
-Option "CenterMode" "off"
-# === QBS Support ===
-Option "Stereo" "off"
-Option "StereoSyncEnable" "1"
-# === Misc Options ===
-Option "UseFastTLS" "0"
-Option "BlockSignalsOnLock" "on"
-Option "UseInternalAGPGART" "no"
-Option "ForceGenericCPU" "no"
-# === FSAA ===
-Option "FSAAScale" "1"
-Option "FSAADisableGamma" "no"
-Option "FSAACustomizeMSPos" "no"
-Option "FSAAMSPosX0" "0.000000"
-Option "FSAAMSPosY0" "0.000000"
-Option "FSAAMSPosX1" "0.000000"
-Option "FSAAMSPosY1" "0.000000"
-Option "FSAAMSPosX2" "0.000000"
-Option "FSAAMSPosY2" "0.000000"
-Option "FSAAMSPosX3" "0.000000"
-Option "FSAAMSPosY3" "0.000000"
-Option "FSAAMSPosX4" "0.000000"
-Option "FSAAMSPosY4" "0.000000"
-Option "FSAAMSPosX5" "0.000000"
-Option "FSAAMSPosY5" "0.000000"
-END
-
1;