summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2005-04-08 09:50:44 +0000
committerPascal Rigaux <pixel@mandriva.com>2005-04-08 09:50:44 +0000
commit2c8fb8745cad97b33e98c4593bf540c02ecde6bc (patch)
treec5c856c33c461b64799f03bbd8d0094a2e3b7465 /perl-install
parent915f6a6af602a00f6776baf1999259b0c3649d05 (diff)
downloaddrakx-2c8fb8745cad97b33e98c4593bf540c02ecde6bc.tar
drakx-2c8fb8745cad97b33e98c4593bf540c02ecde6bc.tar.gz
drakx-2c8fb8745cad97b33e98c4593bf540c02ecde6bc.tar.bz2
drakx-2c8fb8745cad97b33e98c4593bf540c02ecde6bc.tar.xz
drakx-2c8fb8745cad97b33e98c4593bf540c02ecde6bc.zip
do the edid probe before launching X server (the way it was already done for i810fb)
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/install2.pm3
1 files changed, 2 insertions, 1 deletions
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index e7fe6363a..7a0356c06 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -324,6 +324,8 @@ sub exitInstall {
}
sub start_i810fb() {
+ # keep the result otherwise monitor-edid does not return good results afterwards
+ eval { any::monitor_full_edid() };
my ($vga) = cat_('/proc/cmdline') =~ /vga=(\S+)/;
return if !$vga || listlength(cat_('/proc/fb'));
@@ -334,7 +336,6 @@ sub start_i810fb() {
log::l("trying to load i810fb module with xres <$xres> (vga was <$vga>)");
eval { modules::load('intel-agp') };
eval {
- any::monitor_full_edid(); # keep the result otherwise monitor-edid does not return good results afterwards
my $opt = "xres=$xres hsync1=32 hsync2=48 vsync1=50 vsync2=70 vram=2 bpp=16 accel=1 mtrr=1"; #- this sucking i810fb does not accept floating point numbers in hsync!
modules::load_with_options([ 'i810fb' ], { i810fb => $opt });
};