From 1d926607c66e8d18e81eaded9ca83140f2be35b8 Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones@redhat.com>
Date: Thu, 16 Jun 2011 16:11:40 -0400
Subject: [PATCH] Handle uninitialized GOP driver gracefully.

---
 gnu-efi-3.0e-handle-uninitialized-gop.patch | 57 +++++++++++++++++++++
 gnu-efi.spec                                |  9 +++-
 2 files changed, 65 insertions(+), 1 deletion(-)
 create mode 100644 gnu-efi-3.0e-handle-uninitialized-gop.patch

diff --git a/gnu-efi-3.0e-handle-uninitialized-gop.patch b/gnu-efi-3.0e-handle-uninitialized-gop.patch
new file mode 100644
index 0000000..3a0db88
--- /dev/null
+++ b/gnu-efi-3.0e-handle-uninitialized-gop.patch
@@ -0,0 +1,57 @@
+From c261b8de0504fd37af99c61cdda248f312124034 Mon Sep 17 00:00:00 2001
+From: Peter Jones <pjones@redhat.com>
+Date: Thu, 16 Jun 2011 16:10:27 -0400
+Subject: [PATCH] Handle un-initialized GOP.
+
+---
+ apps/modelist.c |   27 +++++++++++++++++++++++++++
+ 1 files changed, 27 insertions(+), 0 deletions(-)
+
+diff --git a/apps/modelist.c b/apps/modelist.c
+index c4a4b1a..8d816d1 100644
+--- a/apps/modelist.c
++++ b/apps/modelist.c
+@@ -3,6 +3,26 @@
+ 
+ extern EFI_GUID GraphicsOutputProtocol;
+ 
++static int memcmp(const void *s1, const void *s2, UINTN n)
++{
++	const unsigned char *c1 = s1, *c2 = s2;
++	int d = 0;
++
++	if (!s1 && !s2)
++		return 0;
++	if (s1 && !s2)
++		return 1;
++	if (!s1 && s2)
++		return -1;
++
++	while (n--) {
++		d = (int)*c1++ - (int)*c2++;
++		if (d)
++			break;
++	}
++	return d;
++}
++
+ static void
+ print_modes(EFI_GRAPHICS_OUTPUT_PROTOCOL *gop)
+ {
+@@ -17,6 +37,13 @@ print_modes(EFI_GRAPHICS_OUTPUT_PROTOCOL *gop)
+ 		UINTN SizeOfInfo;
+ 		rc = uefi_call_wrapper(gop->QueryMode, 4, gop, i, &SizeOfInfo,
+ 					&info);
++		if (EFI_ERROR(rc) && rc == EFI_NOT_STARTED) {
++			rc = uefi_call_wrapper(gop->SetMode, 2, gop,
++				gop->Mode->Mode);
++			rc = uefi_call_wrapper(gop->QueryMode, 4, gop, i,
++				&SizeOfInfo, &info);
++		}
++
+ 		if (EFI_ERROR(rc)) {
+ 			CHAR16 Buffer[64];
+ 			StatusToString(Buffer, rc);
+-- 
+1.7.4.4
+
diff --git a/gnu-efi.spec b/gnu-efi.spec
index f12a7c8..9a3695f 100644
--- a/gnu-efi.spec
+++ b/gnu-efi.spec
@@ -1,7 +1,7 @@
 Summary: Development Libraries and headers for EFI
 Name: gnu-efi
 Version: 3.0e
-Release: 13%{?dist}
+Release: 14%{?dist}
 Group: Development/System
 License: GPLv2+
 URL: ftp://ftp.hpl.hp.com/pub/linux-ia64
@@ -13,6 +13,10 @@ Patch3: gnu-efi-3.0e-add-uefi-2.x-boot-services.patch
 Patch4: gnu-efi-3.0e-add-pciio.patch
 Patch5: gnu-efi-3.0e-route80h.patch
 Patch6: gnu-efi-3.0e-modelist.patch
+Patch7: gnu-efi-3.0e-route80h-add-cougarpoint.patch
+Patch8: gnu-efi-3.0e-machine-types.patch
+Patch9: gnu-efi-3.0e-unwrap.patch
+Patch10: gnu-efi-3.0e-handle-uninitialized-gop.patch
 # "git am" doesn't like ms-dos formatted text-files.
 #Patch7: gnu-efi-3.0e-add-pciio-2.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -64,6 +68,9 @@ rm -rf %{buildroot}
 %attr(0644,root,root) /boot/efi/EFI/redhat/*.efi
 
 %changelog
+* Thu Jun 16 2011 Peter Jones <pjones@redhat.com> - 3.0e-14
+- Handle uninitialized GOP driver gracefully.
+
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.0e-13
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild