Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6

[sfrench/cifs-2.6.git] / arch / x86 / boot / video.c

diff --git a/arch/x86/boot/video.c b/arch/x86/boot/video.c
index 696d08f3843ccbc6a14d9d01bca817554175d933..83598b23093aa31398db2d1c9a5f89eb30733357 100644 (file)
--- a/arch/x86/boot/video.c
+++ b/arch/x86/boot/video.c
@@ -9,8 +9,6 @@
  * ----------------------------------------------------------------------- */
 
 /*
- * arch/i386/boot/video.c
- *
  * Select video mode
  */
 
@@ -18,21 +16,6 @@
 #include "video.h"
 #include "vesa.h"
 
-/*
- * Mode list variables
- */
-static struct card_info cards[];    /* List of cards to probe for */
-
-/*
- * Common variables
- */
-int adapter;                   /* 0=CGA/MDA/HGC, 1=EGA, 2=VGA+ */
-u16 video_segment;
-int force_x, force_y;  /* Don't query the BIOS for cols/rows */
-
-int do_restore = 0;    /* Screen contents changed during mode flip */
-int graphic_mode;      /* Graphic mode with linear frame buffer */
-
 static void store_cursor_position(void)
 {
        u16 curpos;
@@ -107,147 +90,6 @@ static void store_mode_params(void)
        boot_params.screen_info.orig_video_lines = y;
 }
 
-/* Probe the video drivers and have them generate their mode lists. */
-static void probe_cards(int unsafe)
-{
-       struct card_info *card;
-       static u8 probed[2];
-
-       if (probed[unsafe])
-               return;
-
-       probed[unsafe] = 1;
-
-       for (card = video_cards; card < video_cards_end; card++) {
-               if (card->unsafe == unsafe) {
-                       if (card->probe)
-                               card->nmodes = card->probe();
-                       else
-                               card->nmodes = 0;
-               }
-       }
-}
-
-/* Test if a mode is defined */
-int mode_defined(u16 mode)
-{
-       struct card_info *card;
-       struct mode_info *mi;
-       int i;
-
-       for (card = video_cards; card < video_cards_end; card++) {
-               mi = card->modes;
-               for (i = 0; i < card->nmodes; i++, mi++) {
-                       if (mi->mode == mode)
-                               return 1;
-               }
-       }
-
-       return 0;
-}
-
-/* Set mode (without recalc) */
-static int raw_set_mode(u16 mode, u16 *real_mode)
-{
-       int nmode, i;
-       struct card_info *card;
-       struct mode_info *mi;
-
-       /* Drop the recalc bit if set */
-       mode &= ~VIDEO_RECALC;
-
-       /* Scan for mode based on fixed ID, position, or resolution */
-       nmode = 0;
-       for (card = video_cards; card < video_cards_end; card++) {
-               mi = card->modes;
-               for (i = 0; i < card->nmodes; i++, mi++) {
-                       int visible = mi->x || mi->y;
-
-                       if ((mode == nmode && visible) ||
-                           mode == mi->mode ||
-                           mode == (mi->y << 8)+mi->x) {
-                               *real_mode = mi->mode;
-                               return card->set_mode(mi);
-                       }
-
-                       if (visible)
-                               nmode++;
-               }
-       }
-
-       /* Nothing found?  Is it an "exceptional" (unprobed) mode? */
-       for (card = video_cards; card < video_cards_end; card++) {
-               if (mode >= card->xmode_first &&
-                   mode < card->xmode_first+card->xmode_n) {
-                       struct mode_info mix;
-                       *real_mode = mix.mode = mode;
-                       mix.x = mix.y = 0;
-                       return card->set_mode(&mix);
-               }
-       }
-
-       /* Otherwise, failure... */
-       return -1;
-}
-
-/*
- * Recalculate the vertical video cutoff (hack!)
- */
-static void vga_recalc_vertical(void)
-{
-       unsigned int font_size, rows;
-       u16 crtc;
-       u8 pt, ov;
-
-       set_fs(0);
-       font_size = rdfs8(0x485); /* BIOS: font size (pixels) */
-       rows = force_y ? force_y : rdfs8(0x484)+1; /* Text rows */
-
-       rows *= font_size;      /* Visible scan lines */
-       rows--;                 /* ... minus one */
-
-       crtc = vga_crtc();
-
-       pt = in_idx(crtc, 0x11);
-       pt &= ~0x80;            /* Unlock CR0-7 */
-       out_idx(pt, crtc, 0x11);
-
-       out_idx((u8)rows, crtc, 0x12); /* Lower height register */
-
-       ov = in_idx(crtc, 0x07); /* Overflow register */
-       ov &= 0xbd;
-       ov |= (rows >> (8-1)) & 0x02;
-       ov |= (rows >> (9-6)) & 0x40;
-       out_idx(ov, crtc, 0x07);
-}
-
-/* Set mode (with recalc if specified) */
-static int set_mode(u16 mode)
-{
-       int rv;
-       u16 real_mode;
-
-       /* Very special mode numbers... */
-       if (mode == VIDEO_CURRENT_MODE)
-               return 0;       /* Nothing to do... */
-       else if (mode == NORMAL_VGA)
-               mode = VIDEO_80x25;
-       else if (mode == EXTENDED_VGA)
-               mode = VIDEO_8POINT;
-
-       rv = raw_set_mode(mode, &real_mode);
-       if (rv)
-               return rv;
-
-       if (mode & VIDEO_RECALC)
-               vga_recalc_vertical();
-
-       /* Save the canonical mode number for the kernel, not
-          an alias, size specification or menu position */
-       boot_params.hdr.vid_mode = real_mode;
-       return 0;
-}
-
 static unsigned int get_entry(void)
 {
        char entry_buf[4];
@@ -486,6 +328,7 @@ void set_video(void)
                printf("Undefined video mode number: %x\n", mode);
                mode = ASK_VGA;
        }
+       boot_params.hdr.vid_mode = mode;
        vesa_store_edid();
        store_mode_params();