Blacklist 1440x900x32 from VBE preferred mode handling

Bug-Ubuntu: https://bugs.launchpad.net/bugs/701111
Forwarded: no
Last-Update: 2013-11-14

Patch-Name: blacklist-1440x900x32.patch

Gbp-Pq: Name blacklist-1440x900x32.patch

diff --git a/grub-core/video/i386/pc/vbe.c b/grub-core/video/i386/pc/vbe.c
index a0bb9af0980ca3d2241496a75c038794536acf4b..c5831bbeee14aeafe1b82fc5415b639cfeea971f 100644 (file)
--- a/grub-core/video/i386/pc/vbe.c
+++ b/grub-core/video/i386/pc/vbe.c
@@ -1054,6 +1054,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
        {