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

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