From 9111bc27d0c1988dedef66070416424fa9464fb2 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Tue, 31 Jul 2007 09:34:10 +0000
Subject: - drop support for installing/configuring 915resolution   (no more
 needed since x11-driver-video-intel 2.0)

---
 lib/Xconfig/card.pm    |  3 ---
 lib/Xconfig/main.pm    |  6 +-----
 lib/Xconfig/various.pm | 27 ---------------------------
 3 files changed, 1 insertion(+), 35 deletions(-)

(limited to 'lib')

diff --git a/lib/Xconfig/card.pm b/lib/Xconfig/card.pm
index aa7dab1..1db9307 100644
--- a/lib/Xconfig/card.pm
+++ b/lib/Xconfig/card.pm
@@ -59,9 +59,6 @@ sub to_raw_X {
 	if (arch() =~ /ppc/ && ($_->{Driver} eq 'r128' || $_->{Driver} eq 'radeon')) {
 	    $_->{UseFBDev} = 1;
 	}
-	if ($_->{Driver} eq 'intel') {
-	    $_->{Options}{May_Need_ForceBIOS} = '1';
-	}
         if (member($_->{Driver}, qw(intel ati))) {
 	    $_->{Options}{XaaNoOffscreenPixmaps} = '1';
         }
diff --git a/lib/Xconfig/main.pm b/lib/Xconfig/main.pm
index 6a4c8cf..a33ad56 100644
--- a/lib/Xconfig/main.pm
+++ b/lib/Xconfig/main.pm
@@ -35,9 +35,6 @@ sub configure_resolution {
 	card => Xconfig::card::from_raw_X($raw_X),
 	monitors => [ $raw_X->get_monitors ],
     };
-    if (my $rc = Xconfig::various::handle_May_Need_ForceBIOS($in, $raw_X)) {
-	return $rc;
-    }
 
     $X->{resolutions} = Xconfig::resolution_and_depth::configure($in, $raw_X, $X->{card}, $X->{monitors}) or return;
     if ($raw_X->is_modified) {
@@ -188,8 +185,7 @@ sub configure_everything_or_configure_chooser {
 	$raw_X = Xconfig::default::configure($in->do_pkgs, $o_keyboard, $o_mouse);
 	$rc = configure_everything($in, $raw_X, $in->do_pkgs, $auto, $options);
     } elsif (!$auto) {
-	$rc = Xconfig::various::handle_May_Need_ForceBIOS($in, $raw_X);
-	$rc ||= configure_chooser($in, $raw_X, $in->do_pkgs, $options);
+	$rc = configure_chooser($in, $raw_X, $in->do_pkgs, $options);
     }
     $rc && $raw_X, $rc;
 }
diff --git a/lib/Xconfig/various.pm b/lib/Xconfig/various.pm
index 081005c..2bef5c9 100644
--- a/lib/Xconfig/various.pm
+++ b/lib/Xconfig/various.pm
@@ -330,31 +330,4 @@ sub setupFB {
     bootloader::action($bootloader, 'when_config_changed');
 }
 
-sub handle_May_Need_ForceBIOS {
-    my ($in, $raw_X) = @_;
-
-    Xconfig::resolution_and_depth::is_915resolution_configured and return;
-
-    any { $_->{Options}{May_Need_ForceBIOS} } $raw_X->get_devices or return;
-
-    my $log = cat_('/var/log/Xorg.0.log');
-    $log =~ /Option "May_Need_ForceBIOS" is not used/ or return;
-
-
-    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;
-
-    $in->ask_yesorno('', formatAlaTeX(N("The display resolution being used may not be correct. 
-
-If your desktop appears to stretch beyond the edges of the display, 
-installing %s may help fix the problem. Install it now?", '915resolution')), 1) or return; 
-
-    $in->do_pkgs->ensure_binary_is_installed('915resolution', '915resolution', 1) or return;
-
-    Xconfig::resolution_and_depth::set_915resolution($resolution);
-
-    'need_restart';
-}
-
 1;
-- 
cgit v1.2.1