summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--NEWS2
-rw-r--r--lib/Xconfig/monitor.pm3
2 files changed, 4 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index ca7923e..e380c6c 100644
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,8 @@
- add support for Asturian keyboard
- do not try to probe monitor information via X server on laptops (it
doesn't work with recent X servers)
+- fallback to X server run-time autodetection on laptops instead of
+ 1024x768 when the monitor could not be probed (Mageia #1059)
Version 0.95 - 23 April 2011
diff --git a/lib/Xconfig/monitor.pm b/lib/Xconfig/monitor.pm
index 0fc2c31..857ac01 100644
--- a/lib/Xconfig/monitor.pm
+++ b/lib/Xconfig/monitor.pm
@@ -19,11 +19,12 @@ sub good_default_monitor() {
sub default_monitor {
my ($card_Driver) = @_;
- if (detect_devices::is_virtualbox() || ($card_Driver eq 'siliconmotion' && arch() =~ /mips/)) {
+ if (detect_devices::is_virtualbox() || detect_devices::isLaptop() || ($card_Driver eq 'siliconmotion' && arch() =~ /mips/)) {
# HACK: since there is no way to get the EDID on gdium, the resolution is passed to the kernel
# so we can rely on it
# in vbox, we return Plug'n'Play because the vbox integration addons
# will take care of everything for us
+ # On laptops the X server should usually be able to autodetect everything.
{ VendorName => "Plug'n Play" };
} else {
good_default_monitor() =~ /(.*)\|(.*)/ or internal_error("bad good_default_monitor");