Blacklist 1440x900x32 from VBE preferred mode handling until a better

solution is available (LP: #701111).

diff --git a/debian/changelog b/debian/changelog
index ace563d46bd69bd47a6ec4c30eecabad669d22ff..f2c09b8f62551dffe182fba0b54f7f768048283c 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ grub2 (2.00-10) UNRELEASED; urgency=low
       setup the GRUB core image must be signed but it has no provision for
       verifying module signatures).
     - Read /etc/default/grub.d/*.cfg after /etc/default/grub (LP: #901600).
+    - Blacklist 1440x900x32 from VBE preferred mode handling until a better
+      solution is available (LP: #701111).
 
  -- Colin Watson <cjwatson@debian.org>  Wed, 02 Jan 2013 08:58:20 +0000
 

diff --git a/debian/patches/blacklist_1440x900x32.patch b/debian/patches/blacklist_1440x900x32.patch
new file mode 100644 (file)
index 0000000..40c9d41
--- /dev/null
+++ b/debian/patches/blacklist_1440x900x32.patch
@@ -0,0 +1,26 @@
+Description: Blacklist 1440x900x32 from VBE preferred mode handling
+Author: Colin Watson <cjwatson@ubuntu.com>
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/701111
+Forwarded: no
+Last-Update: 2013-01-03
+
+Index: b/grub-core/video/i386/pc/vbe.c
+===================================================================
+--- a/grub-core/video/i386/pc/vbe.c
++++ b/grub-core/video/i386/pc/vbe.c
+@@ -1055,6 +1055,15 @@
+             || vbe_mode_info.y_resolution > height)
+           /* Resolution exceeds that of preferred mode.  */
+           continue;
++
++        /* Blacklist 1440x900x32 from preferred mode handling until a
++           better solution is available.  This mode causes problems on
++           many Thinkpads.  See:
++             https://bugs.launchpad.net/ubuntu/+source/grub2/+bug/701111  */
++        if (vbe_mode_info.x_resolution == 1440 &&
++            vbe_mode_info.y_resolution == 900 &&
++            vbe_mode_info.bits_per_pixel == 32)
++          continue;
+       }
+       else
+       {

diff --git a/debian/patches/series b/debian/patches/series
index 30b48032039eb47b04ef94abe7b7e27703a60b1a..10158eda042c23e4170fbd3bd4987f36c9810b0d 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -32,3 +32,4 @@ initrd_addr_min.patch
 gnulib_gets.patch
 no_insmod_on_sb.patch
 default_grub_d.patch
+blacklist_1440x900x32.patch

diff --git a/grub-core/video/i386/pc/vbe.c b/grub-core/video/i386/pc/vbe.c
index 81e5a8e94618c99870166870d25895ee75bf94a4..23021c31bd4f8eb708fc4d4e5d09c15feb48072c 100644 (file)
--- a/grub-core/video/i386/pc/vbe.c
+++ b/grub-core/video/i386/pc/vbe.c
@@ -1055,6 +1055,15 @@ grub_video_vbe_setup (unsigned int width, unsigned int height,
              || vbe_mode_info.y_resolution > height)
            /* Resolution exceeds that of preferred mode.  */
            continue;
+
+         /* Blacklist 1440x900x32 from preferred mode handling until a
+            better solution is available.  This mode causes problems on
+            many Thinkpads.  See:
+              https://bugs.launchpad.net/ubuntu/+source/grub2/+bug/701111  */
+         if (vbe_mode_info.x_resolution == 1440 &&
+             vbe_mode_info.y_resolution == 900 &&
+             vbe_mode_info.bits_per_pixel == 32)
+           continue;
        }
       else
        {