summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--NEWS2
-rw-r--r--lib/Xconfig/monitor.pm3
2 files changed, 3 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index 567ea5e..4286a3e 100644
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,8 @@
(mga#9934)
- never fallback to assuming a 1024x768 monitor if probing failed,
instead select an automatic "Plug'n Play" monitor (mga#9272)
+- select the preferred timing in case of multiple detailed timings
+ in EDID (mga#9934)
Version 0.107 - 22 April 2013
diff --git a/lib/Xconfig/monitor.pm b/lib/Xconfig/monitor.pm
index c21e5c2..f136e0a 100644
--- a/lib/Xconfig/monitor.pm
+++ b/lib/Xconfig/monitor.pm
@@ -243,11 +243,10 @@ sub use_EDID {
{ val => $_->{ModeLine}, pre_comment => $_->{ModeLine_comment} . "\n" };
}
- if (@different_timings == 1 && $_->{horizontal_active} >= 1024) {
+ if ((@different_timings == 1 || $_->{preferred}) && $_->{horizontal_active} >= 1024) {
#- we don't use detailed_timing when it is 640x480 or 800x600,
#- since 14" CRTs often give this even when they handle 1024x768 correctly (and desktop is no good in poor resolutions)
- #- should we care about {has_preferred_timing} ?
$monitor->{preferred_resolution} = { X => $_->{horizontal_active}, Y => $_->{vertical_active} };
}
}