2010-01-20 Robert Millan <rmh.grub@aybabtu.com>

	* loader/i386/linux.c (grub_cmd_linux): If `vga=' was used, write down
	that VESA is supported.
	(grub_linux_boot): Use generic framebuffer unless VESA is known to be
	supported.

diff --git a/ChangeLog b/ChangeLog
index c6b4d7baf0bc21895a469101a097257291b99f6c..f96b99f77c1a843434c1dd48e10dea9e0a410de0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-01-20  Robert Millan  <rmh.grub@aybabtu.com>
+
+       * loader/i386/linux.c (grub_cmd_linux): If `vga=' was used, write down
+       that VESA is supported.
+       (grub_linux_boot): Use generic framebuffer unless VESA is known to be
+       supported.
+
 2010-01-20  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * conf/common.rmk (font/font.c_DEPENDENCIES): Condition on FONT_SOURCE.

diff --git a/loader/i386/linux.c b/loader/i386/linux.c
index 5d9edbe7d89cb1fd9e6a0af4a018eddc20998a4a..831d8b25a619cfbcd9578e3879f8c933e3d76db1 100644 (file)
--- a/loader/i386/linux.c
+++ b/loader/i386/linux.c
@@ -536,7 +536,11 @@ grub_linux_boot (void)
     }
 
   if (! grub_linux_setup_video (params))
-    params->have_vga = GRUB_VIDEO_LINUX_TYPE_VESA;
+    {
+      /* Use generic framebuffer unless VESA is known to be supported.  */
+      if (params->have_vga != GRUB_VIDEO_LINUX_TYPE_VESA)
+       params->have_vga = GRUB_VIDEO_LINUX_TYPE_SIMPLE;
+    }
   else
     {
       params->have_vga = GRUB_VIDEO_LINUX_TYPE_TEXT;
@@ -794,6 +798,10 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
                break;
              }
 
+           /* We can't detect VESA, but user is implicitly telling us that it
+              is built-in because `vga=' parameter was used.  */
+           params->have_vga = GRUB_VIDEO_LINUX_TYPE_VESA;
+
            linux_mode
              = &linux_vesafb_modes[vid_mode - GRUB_LINUX_VID_MODE_VESA_START];