[grub/f16] Fall back to old efi GOP detection behavior. Resolves: rhbz#741781

[Peter Jones]

commit 437d512fe11ea2a6172c8d1ac95f5ff07a4866ea
Author: Peter Jones <pjones at redhat.com>
Date:   Tue Sep 27 17:04:58 2011 -0400

    Fall back to old efi GOP detection behavior.
    Resolves: rhbz#741781

 ...ll-back-to-old-efi-GOP-detection-behavior.patch |   46 ++++++++++++++++++++
 grub.spec                                          |    7 +++-
 2 files changed, 52 insertions(+), 1 deletions(-)
---
diff --git a/0001-Fall-back-to-old-efi-GOP-detection-behavior.patch b/0001-Fall-back-to-old-efi-GOP-detection-behavior.patch
new file mode 100644
index 0000000..f377b49
--- /dev/null
+++ b/0001-Fall-back-to-old-efi-GOP-detection-behavior.patch
@@ -0,0 +1,46 @@
+From 2696bda9f0bd3811b7d51930c5a619dcb0d64d7b Mon Sep 17 00:00:00 2001
+From: Peter Jones <pjones at redhat.com>
+Date: Tue, 27 Sep 2011 16:42:40 -0400
+Subject: [PATCH] Fall back to old efi GOP detection behavior.
+
+It appears that on many machines, the GOP driver is not connected to PCI_IO.
+The fix to make some macs work better didn't take this into account, so it
+broke those machines.  This patch falls back to the older behavior which worked
+on those machines.
+
+---
+ efi/efigraph.c |    3 +++
+ efi/efiuga.c   |    3 +++
+ 2 files changed, 6 insertions(+), 0 deletions(-)
+
+diff --git a/efi/efigraph.c b/efi/efigraph.c
+index c285d39..fc88123 100644
+--- a/efi/efigraph.c
++++ b/efi/efigraph.c
+@@ -1413,6 +1413,9 @@ enable(struct graphics_backend *backend)
+ 
+ 	grub_free(handles);
+ 
++	if (!eg->output_intf)
++	    eg->output_intf = grub_efi_locate_protocol(&graphics_output_guid, NULL);
++
+         if (!eg->output_intf)
+             goto fail;
+ 
+diff --git a/efi/efiuga.c b/efi/efiuga.c
+index e035c55..b27500b 100644
+--- a/efi/efiuga.c
++++ b/efi/efiuga.c
+@@ -912,6 +912,9 @@ enable(struct graphics_backend *backend)
+ 
+ 	grub_free(handles);
+ 
++	if (!uga->draw_intf)
++	    uga->draw_intf = grub_efi_locate_protocol(&draw_guid, NULL);
++
+         if (!uga->draw_intf) {
+             grub_free(uga);
+             return 0;
+-- 
+1.7.6
+
diff --git a/grub.spec b/grub.spec
index 94672e8..9b65c27 100644
--- a/grub.spec
+++ b/grub.spec
@@ -1,6 +1,6 @@
 Name: grub
 Version: 0.97
-Release: 77%{?dist}
+Release: 78%{?dist}
 Epoch: 1
 Summary: Grand Unified Boot Loader.
 Group: System Environment/Base
@@ -25,6 +25,7 @@ Source0: ftp://alpha.gnu.org/gnu/%{name}/%{name}-%{version}.tar.gz
 # This is from
 # http://git.kernel.org/?p=boot/grub-fedora/grub-fedora.git;a=summary
 Patch0: grub-fedora-16.patch
+Patch1: 0001-Fall-back-to-old-efi-GOP-detection-behavior.patch
 
 %description
 GRUB (Grand Unified Boot Loader) is an experimental boot loader
@@ -105,6 +106,10 @@ fi
 %{_datadir}/grub
 
 %changelog
+* Tue Sep 27 2011 Peter Jones <pjones at redhat.com> - 0.97-78
+- Fall back to old efi GOP detection behavior.
+  Resolves: rhbz#741781
+
 * Thu Aug 25 2011 Peter Jones <pjones at redhat.com> - 0.97-77
 - Update to kernel.org fedora-16 branch
   - Add findiso command