From: Colin Watson <cjwatson@ubuntu.com>
Date: Mon, 13 Jan 2014 12:13:11 +0000 (+0000)
Subject: Blacklist 1440x900x32 from VBE preferred mode handling
X-Git-Tag: archive/raspbian/2.12-8+rpi1^2~132
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=007ffce2fb760f4b4840f5871c85b67aa896ee74;p=grub2.git

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 a0bb9af..c5831bb 100644
--- 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
 	{