summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2008-03-20 16:32:12 +0000
committerPascal Rigaux <pixel@mandriva.com>2008-03-20 16:32:12 +0000
commitf0a0411d3ce26abf8be8d02d2232d418c3361087 (patch)
treeea68684710abfecb493d88e9b0c74f2075a814d7
parenta5db63fb1f034435d7508ddedc42b1db9d1d8b25 (diff)
downloaddrakx-kbd-mouse-x11-f0a0411d3ce26abf8be8d02d2232d418c3361087.tar
drakx-kbd-mouse-x11-f0a0411d3ce26abf8be8d02d2232d418c3361087.tar.gz
drakx-kbd-mouse-x11-f0a0411d3ce26abf8be8d02d2232d418c3361087.tar.bz2
drakx-kbd-mouse-x11-f0a0411d3ce26abf8be8d02d2232d418c3361087.tar.xz
drakx-kbd-mouse-x11-f0a0411d3ce26abf8be8d02d2232d418c3361087.zip
- XFdrake:
o add option "Force display mode of DVI" on driver "nvidia" (#30066)
-rw-r--r--NEWS2
-rw-r--r--lib/Xconfig/various.pm20
2 files changed, 21 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 22857c1..5b19293 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,5 @@
+- XFdrake:
+ o add option "Force display mode of DVI" on driver "nvidia" (#30066)
- XFdrake library:
o ensure set_default_background() doesn't fail (#39065)
(ie default to 1024x768 if 0x0 is given)
diff --git a/lib/Xconfig/various.pm b/lib/Xconfig/various.pm
index c4bf9fe..e54ef8e 100644
--- a/lib/Xconfig/various.pm
+++ b/lib/Xconfig/various.pm
@@ -50,7 +50,8 @@ sub default {
isLaptop => $isLaptop,
xdm => 1,
Composite => !($card->{Driver} eq 'fglrx' || $card->{Driver} eq 'nvidia' && $card->{DriverVersion} eq '71xx'),
- if_($card->{Driver} eq 'nvidia', RenderAccel => $card->{DriverVersion} eq '97xx', Clone => 0),
+ if_($card->{Driver} eq 'nvidia', RenderAccel => $card->{DriverVersion} eq '97xx',
+ Clone => 0, ForceModeDVI => 0),
if_($card->{Driver} eq 'savage', HWCursor => 1),
if_($card->{Driver} eq 'intel' && $isLaptop, Clone => 0),
if_($card->{Driver} eq 'ati' && $isLaptop, Clone => 1, BIOSHotkeys => 0),
@@ -79,6 +80,8 @@ sub various {
BIOSHotkeys => 1),
if_($card->{Options}{AccelMethod},
EXA => $card->{Options}{AccelMethod} eq 'EXA'),
+ if_($card->{Options}{ModeValidation},
+ ForceModeDVI => 1),
if_($card->{Driver} eq 'nvidia',
RenderAccel => !$card->{Options}{RenderAccel},
),
@@ -158,6 +161,18 @@ sub config {
}
}
+ if (exists $various->{ForceModeDVI}) {
+ if ($card->{Driver} eq 'nvidia') {
+ if ($various->{ForceModeDVI}) {
+ $card->{Options}{ExactModeTimingsDVI} = undef;
+ $card->{Options}{ModeValidation} = 'NoWidthAlignmentCheck, NoDFPNativeResolutionCheck';
+ } else {
+ delete $card->{Options}{ExactModeTimingsDVI};
+ delete $card->{Options}{ModeValidation};
+ }
+ }
+ }
+
if (exists $various->{Clone}) {
if ($card->{Driver} eq 'nvidia') {
if ($various->{Clone}) {
@@ -219,6 +234,9 @@ sub choose {
N("Enable duplicate display on the external monitor") :
N("Enable duplicate display on the second display"),
type => 'bool', val => \$various->{Clone} } : (),
+ exists $various->{ForceModeDVI} ?
+ { text => N("Force display mode of DVI"),
+ type => 'bool', val => \$various->{ForceModeDVI} } : (),
exists $various->{BIOSHotkeys} ?
{ text => N("Enable BIOS hotkey for external monitor switching"),
type => 'bool', val => \$various->{BIOSHotkeys} } : (),