Blame SOURCES/0010-Disable-GRUB-video-support-for-IBM-power-machines.patch

8631a2
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
8631a2
From: Paulo Flabiano Smorigo <pfsmorigo@br.ibm.com>
8631a2
Date: Tue, 11 Jun 2013 15:14:05 -0300
8631a2
Subject: [PATCH] Disable GRUB video support for IBM power machines
8631a2
8631a2
Should fix the problem in bugzilla:
8631a2
https://bugzilla.redhat.com/show_bug.cgi?id=973205
8631a2
---
8631a2
 grub-core/kern/ieee1275/cmain.c  | 5 ++++-
8631a2
 grub-core/video/ieee1275.c       | 9 ++++++---
8631a2
 include/grub/ieee1275/ieee1275.h | 2 ++
8631a2
 3 files changed, 12 insertions(+), 4 deletions(-)
8631a2
8631a2
diff --git a/grub-core/kern/ieee1275/cmain.c b/grub-core/kern/ieee1275/cmain.c
8631a2
index 3e12e6b24e1..3e14f539368 100644
8631a2
--- a/grub-core/kern/ieee1275/cmain.c
8631a2
+++ b/grub-core/kern/ieee1275/cmain.c
8631a2
@@ -90,7 +90,10 @@ grub_ieee1275_find_options (void)
8631a2
   }
8631a2
 
8631a2
   if (rc >= 0 && grub_strncmp (tmp, "IBM", 3) == 0)
8631a2
-    grub_ieee1275_set_flag (GRUB_IEEE1275_FLAG_NO_TREE_SCANNING_FOR_DISKS);
8631a2
+    {
8631a2
+      grub_ieee1275_set_flag (GRUB_IEEE1275_FLAG_NO_TREE_SCANNING_FOR_DISKS);
8631a2
+      grub_ieee1275_set_flag (GRUB_IEEE1275_FLAG_DISABLE_VIDEO_SUPPORT);
8631a2
+    }
8631a2
 
8631a2
   /* Old Macs have no key repeat, newer ones have fully working one.
8631a2
      The ones inbetween when repeated key generates an escaoe sequence
8631a2
diff --git a/grub-core/video/ieee1275.c b/grub-core/video/ieee1275.c
8631a2
index 17a3dbbb575..b8e4b3feb32 100644
8631a2
--- a/grub-core/video/ieee1275.c
8631a2
+++ b/grub-core/video/ieee1275.c
8631a2
@@ -352,9 +352,12 @@ static struct grub_video_adapter grub_video_ieee1275_adapter =
8631a2
 
8631a2
 GRUB_MOD_INIT(ieee1275_fb)
8631a2
 {
8631a2
-  find_display ();
8631a2
-  if (display)
8631a2
-    grub_video_register (&grub_video_ieee1275_adapter);
8631a2
+  if (! grub_ieee1275_test_flag (GRUB_IEEE1275_FLAG_DISABLE_VIDEO_SUPPORT))
8631a2
+    {
8631a2
+      find_display ();
8631a2
+      if (display)
8631a2
+        grub_video_register (&grub_video_ieee1275_adapter);
8631a2
+    }
8631a2
 }
8631a2
 
8631a2
 GRUB_MOD_FINI(ieee1275_fb)
8631a2
diff --git a/include/grub/ieee1275/ieee1275.h b/include/grub/ieee1275/ieee1275.h
8631a2
index 2310f33dbc2..ca08bd96681 100644
8631a2
--- a/include/grub/ieee1275/ieee1275.h
8631a2
+++ b/include/grub/ieee1275/ieee1275.h
8631a2
@@ -146,6 +146,8 @@ enum grub_ieee1275_flag
8631a2
   GRUB_IEEE1275_FLAG_BROKEN_REPEAT,
8631a2
 
8631a2
   GRUB_IEEE1275_FLAG_CURSORONOFF_ANSI_BROKEN,
8631a2
+
8631a2
+  GRUB_IEEE1275_FLAG_DISABLE_VIDEO_SUPPORT
8631a2
 };
8631a2
 
8631a2
 extern int EXPORT_FUNC(grub_ieee1275_test_flag) (enum grub_ieee1275_flag flag);