fixup default fglrx config to be included in Device Section. thanks pixel

1 files changed, 52 insertions, 51 deletions

diff --git a/perl-install/Xconfig/card.pm b/perl-install/Xconfig/card.pm
index f7e5b7c6d..3a5f9cd9b 100644
--- a/perl-install/Xconfig/card.pm
+++ b/perl-install/Xconfig/card.pm
@@ -98,6 +98,12 @@ sub from_raw_X {
 sub to_raw_X {
     my ($card, $raw_X) = @_;
 
+    #- Specific ATI fglrx driver default options
+    if ($card->{Driver} eq 'fglrx') {
+	# $default_ATI_fglrx_config need to be move in proprietary ?
+	$card->{raw_LINES} ||= default_ATI_fglrx_config();
+    }
+
     $raw_X->set_devices($card, @{$card->{cards} || []});
 
     $raw_X->{xfree4}->get_ServerLayout->{Xinerama} = { commented => !$card->{Xinerama}, Option => 1 }
@@ -117,14 +123,10 @@ sub to_raw_X {
     $raw_X->{xfree4}->add_Section('DRI', { Mode => { val => '0666' } }) if $card->{use_DRI_GLX};
 
     $raw_X->{xfree4}->remove_load_module('v4l') if $card->{use_DRI_GLX} && $card->{Driver} eq 'r128';
-
-    #- Specific ATI fglrx driver default options
-    if ($card->{Driver} eq 'fglrx') {
-	# $default_ATI_fglrx_config need to be move in proprietary ?
-	$card->{raw_LINES} ||= $default_ATI_fglrx_config;
-    }
 }
 
+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' };
@@ -615,63 +617,62 @@ sub readCardsDB {
 
 our $default_ATI_fglrx_config = <<'END';
 # === disable PnP Monitor  ===
-    #Option                              "NoDDC"
+#Option                              "NoDDC"
 # === disable/enable XAA/DRI ===
-    Option "no_accel"                   "no"
-    Option "no_dri"                     "no"
+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" 
+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"
+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"
+Option "Capabilities"               "0x00000000"
 # === Video Overlay for the Xv extension ===
-    Option "VideoOverlay"               "on"
+Option "VideoOverlay"               "on"
 # === OpenGL Overlay ===
 # Note: When OpenGL Overlay is enabled, Video Overlay
 #       will be disabled automatically
-    Option "OpenGLOverlay"              "off"
-    Option "CenterMode"                 "off"
+Option "OpenGLOverlay"              "off"
+Option "CenterMode"                 "off"
 # === QBS Support ===
-    Option "Stereo"                     "off"
-    Option "StereoSyncEnable"           "1"
+Option "Stereo"                     "off"
+Option "StereoSyncEnable"           "1"
 # === Misc Options ===
-    Option "UseFastTLS"                 "0"
-    Option "BlockSignalsOnLock"         "on"
-# Note : DON'T ENABLE UseInternalAGPGART
-    Option "UseInternalAGPGART"         "no"
-    Option "ForceGenericCPU"            "no"
+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"
+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;