From: Jean Guyader <jean.guyader@eu.citrix.com>
Date: Tue, 1 Dec 2009 17:54:00 +0000 (+0000)
Subject: XC-441: Don't check amount of memory in vbe.
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=da7857ad0a19ac5fe7eff43f919d32c3a6521da6;p=xenclient%2Fxen-pq.git

XC-441: Don't check amount of memory in vbe.
---

diff --git a/master/hack-vbe-dont-check-mem b/master/hack-vbe-dont-check-mem
new file mode 100644
index 0000000..bae14e3
--- /dev/null
+++ b/master/hack-vbe-dont-check-mem
@@ -0,0 +1,16 @@
+diff --git a/tools/firmware/vgabios/vbe.c b/tools/firmware/vgabios/vbe.c
+index a0f3288..26582d0 100644
+--- a/tools/firmware/vgabios/vbe.c
++++ b/tools/firmware/vgabios/vbe.c
+@@ -847,8 +847,9 @@ Bit16u *AX;Bit16u ES;Bit16u DI;
+         do
+         {
+                 if ((cur_info->info.XResolution <= dispi_get_max_xres()) &&
+-                    (cur_info->info.BitsPerPixel <= dispi_get_max_bpp()) &&
+-                    (cur_info->info.XResolution * cur_info->info.XResolution * cur_info->info.BitsPerPixel <= vbe_info_block.TotalMemory << 19 )) {
++                    (cur_info->info.BitsPerPixel <= dispi_get_max_bpp())) {
++                    /* FIXME remove memory check because it's done in 16bits
++                    ** and the resolution is unusable */
+ #ifdef DEBUG
+                   printf("VBE found mode %x => %x\n", cur_info->mode,cur_mode);
+ #endif
diff --git a/master/series b/master/series
index c4d03ad..4ced81c 100644
--- a/master/series
+++ b/master/series
@@ -27,3 +27,4 @@ b-m-arb-sync-with-native-linux
 iommu-replace-panic-with-printk
 hack-vbe-always-on
 filter-igfx-io
+hack-vbe-dont-check-mem