dcavalca / rpms / grub2

Forked from rpms/grub2 3 years ago
Clone

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

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