summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2007-04-30 13:06:31 +0000
committerPascal Rigaux <pixel@mandriva.com>2007-04-30 13:06:31 +0000
commit457271873ea5fd0424870a2080bf37f8e5f67132 (patch)
treebdc59292ea294b3faef7744689c3cbf63b25a2b9
parent3763b4031ed266dc2f236ee39e5011a79a1d7394 (diff)
downloaddrakx-kbd-mouse-x11-457271873ea5fd0424870a2080bf37f8e5f67132.tar
drakx-kbd-mouse-x11-457271873ea5fd0424870a2080bf37f8e5f67132.tar.gz
drakx-kbd-mouse-x11-457271873ea5fd0424870a2080bf37f8e5f67132.tar.bz2
drakx-kbd-mouse-x11-457271873ea5fd0424870a2080bf37f8e5f67132.tar.xz
drakx-kbd-mouse-x11-457271873ea5fd0424870a2080bf37f8e5f67132.zip
- handle new intel driver (don't propose 915resolution when using new driver)
-rw-r--r--NEWS1
-rw-r--r--lib/Xconfig/various.pm2
2 files changed, 2 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index c4bf7b1..dbe192c 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,6 @@
- don't use 1280x1024 prefered resolution
(using prefered resolution only when adding explicit gtf modelines)
+- handle new intel driver
- workaround buggy fglrx driver: make dm restart xserver (#29550)
Version 0.15 - 3 April 2007, by Pascal "Pixel" Rigaux
diff --git a/lib/Xconfig/various.pm b/lib/Xconfig/various.pm
index dc74fce..356b48f 100644
--- a/lib/Xconfig/various.pm
+++ b/lib/Xconfig/various.pm
@@ -341,7 +341,7 @@ sub handle_May_Need_ForceBIOS {
$log =~ /Option "May_Need_ForceBIOS" is not used/ or return;
- my @builtin_modes = $log =~ /\*Built-in mode "(\d+x\d+)"/g;
+ my @builtin_modes = $log =~ /\*Built-in mode "(\d+x\d+)"/g or return;
my $resolution = $raw_X->get_resolution;
!member("$resolution->{X}x$resolution->{Y}", @builtin_modes) or return;