diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2008-03-05 17:12:43 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2008-03-05 17:12:43 +0000 |
| commit | 6c9c74919b7b8c6bbcaca8f64b47406d5e8e3704 (patch) | |
| tree | 50b5114d491549f1df69ba9ae19cc5dd0b62e001 /perl-install/install | |
| parent | 53bbe2b9392de49e1b3cf93a94e68482051dbb7b (diff) | |
| download | drakx-6c9c74919b7b8c6bbcaca8f64b47406d5e8e3704.tar drakx-6c9c74919b7b8c6bbcaca8f64b47406d5e8e3704.tar.gz drakx-6c9c74919b7b8c6bbcaca8f64b47406d5e8e3704.tar.bz2 drakx-6c9c74919b7b8c6bbcaca8f64b47406d5e8e3704.tar.xz drakx-6c9c74919b7b8c6bbcaca8f64b47406d5e8e3704.zip | |
- do not load i810fb, rely on vesa xorg drive instead (it may help #37772)
Diffstat (limited to 'perl-install/install')
| -rw-r--r-- | perl-install/install/NEWS | 1 | ||||
| -rw-r--r-- | perl-install/install/any.pm | 16 | ||||
| -rw-r--r-- | perl-install/install/install2.pm | 2 |
3 files changed, 1 insertions, 18 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index 281808989..c6c80b566 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,6 +1,7 @@ - fix resizing/formatting ntfs, and create "Windows" entry in bootloader (broken because of ntfs-3g switch in previous release) - install kernel586 on Transmeta Crusoe TM5800 (#37866) +- do not load i810fb, rely on vesa xorg drive instead (it may help #37772) Version 10.8 - 4 March 2008 diff --git a/perl-install/install/any.pm b/perl-install/install/any.pm index 7cf2de647..da61cc957 100644 --- a/perl-install/install/any.pm +++ b/perl-install/install/any.pm @@ -43,22 +43,6 @@ sub is_network_install { member($o->{method}, qw(ftp http nfs)); } - -sub start_i810fb() { - my ($vga) = cat_('/proc/cmdline') =~ /vga=(\S+)/; - return if !$vga || listlength(cat_('/proc/fb')); - - my %vga_to_xres = (0x311 => '640', 0x314 => '800', 0x317 => '1024'); - my $xres = $vga_to_xres{$vga} || '800'; - - log::l("trying to load i810fb module with xres <$xres> (vga was <$vga>)"); - eval { modules::load('intel_agp') }; - eval { - 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 }); - }; -} - sub spawnShell() { return if $::local_install || $::testing || dont_run_directly_stage2(); diff --git a/perl-install/install/install2.pm b/perl-install/install/install2.pm index 281116c70..c18fb03cf 100644 --- a/perl-install/install/install2.pm +++ b/perl-install/install/install2.pm @@ -525,8 +525,6 @@ sub main { # keep the result otherwise monitor-edid does not return good results afterwards eval { any::monitor_full_edid() }; - install::any::start_i810fb(); - $o->{allowFB} = listlength(cat_("/proc/fb")); if (!$::testing) { |