[grub/f17] Really properly fix Apple framebuffers

[Matthew Garrett]

commit 214015be83836e114384346a6796c2905c5834db
Author: Matthew Garrett <mjg at redhat.com>
Date:   Thu Apr 26 09:59:48 2012 -0400

    Really properly fix Apple framebuffers

 0007-fix-uefi-stride.patch |   27 +++++++++++++++++++++++++++
 grub.spec                  |    4 +++-
 2 files changed, 30 insertions(+), 1 deletions(-)
---
diff --git a/0007-fix-uefi-stride.patch b/0007-fix-uefi-stride.patch
new file mode 100644
index 0000000..b4c726d
--- /dev/null
+++ b/0007-fix-uefi-stride.patch
@@ -0,0 +1,27 @@
+From 309d42a6d0627e776d5d1c8d73e6c181c997062e Mon Sep 17 00:00:00 2001
+From: Matthew Garrett <mjg at redhat.com>
+Date: Thu, 26 Apr 2012 09:58:02 -0400
+Subject: [PATCH] Really fix getting the correct stride
+
+I am, apparently, not to be trusted.
+---
+ efi/efigraph.c |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/efi/efigraph.c b/efi/efigraph.c
+index 6905e07..9fbfdfd 100644
+--- a/efi/efigraph.c
++++ b/efi/efigraph.c
+@@ -226,7 +226,8 @@ set_kernel_params(struct graphics_backend *backend,
+     grub_efi_graphics_output_mode_information_t *gop_info = NULL;
+     grub_efi_uintn_t size;
+ 
+-    gop_intf = grub_efi_locate_protocol (&graphics_output_guid, NULL);
++    gop_intf = eg->output_intf;
++
+     if (gop_intf == NULL)
+         return;
+ 
+-- 
+1.7.10
+
diff --git a/grub.spec b/grub.spec
index 0863335..771d7af 100644
--- a/grub.spec
+++ b/grub.spec
@@ -30,6 +30,7 @@ Patch2: 0003-Move_network-disable-earlier.patch
 Patch3: 0004-Make-sure-align-is-initialised.patch
 Patch4: 0005-Fix-Apple-CD-fixup.patch
 Patch5: 0006-Avoid-broken-uefi-fs.patch
+Patch6: 0007-fix-uefi-stride.patch
 
 %description
 GRUB (Grand Unified Boot Loader) is an experimental boot loader
@@ -124,9 +125,10 @@ fi
 /sbin/grub-crypt
 
 %changelog
-* Wed Apr 25 2012 Matthew Garrett <mjg at redhat.com> - 0.97-93
+* Thu Apr 26 2012 Matthew Garrett <mjg at redhat.com> - 0.97-93
 - Fix CD booting on Apples
 - Work around Apple firmware bug that hangs in uefi filesystem reads
+- Really properly fix Apple framebuffers
 
 * Thu Apr 19 2012 Matthew Garrett <mjg at redhat.com> - 0.97-92
 - Build with -Os