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