dcavalca / rpms / grub2

Forked from rpms/grub2 3 years ago
Clone

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

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