371309
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
371309
From: Peter Jones <pjones@redhat.com>
371309
Date: Mon, 10 Sep 2018 13:01:24 -0400
371309
Subject: [PATCH] EFI: more debug output on GOP and UGA probing.
371309
371309
Signed-off-by: Peter Jones <pjones@redhat.com>
371309
---
371309
 grub-core/video/efi_gop.c | 8 +++++++-
371309
 grub-core/video/efi_uga.c | 4 ++--
371309
 2 files changed, 9 insertions(+), 3 deletions(-)
371309
371309
diff --git a/grub-core/video/efi_gop.c b/grub-core/video/efi_gop.c
371309
index c9e40e8d4e9..be446f8d291 100644
371309
--- a/grub-core/video/efi_gop.c
371309
+++ b/grub-core/video/efi_gop.c
371309
@@ -71,7 +71,10 @@ check_protocol (void)
371309
   handles = grub_efi_locate_handle (GRUB_EFI_BY_PROTOCOL,
371309
 				    &graphics_output_guid, NULL, &num_handles);
371309
   if (!handles || num_handles == 0)
371309
-    return 0;
371309
+    {
371309
+      grub_dprintf ("video", "GOP: no handles\n");
371309
+      return 0;
371309
+    }
371309
 
371309
   for (i = 0; i < num_handles; i++)
371309
     {
371309
@@ -81,6 +84,7 @@ check_protocol (void)
371309
       grub_video_gop_iterate (check_protocol_hook, &have_usable_mode);
371309
       if (have_usable_mode)
371309
 	{
371309
+	  grub_dprintf ("video", "GOP: found usable mode\n");
371309
 	  grub_free (handles);
371309
 	  return 1;
371309
 	}
371309
@@ -89,6 +93,8 @@ check_protocol (void)
371309
   gop = 0;
371309
   gop_handle = 0;
371309
 
371309
+  grub_dprintf ("video", "GOP: no usable mode\n");
371309
+
371309
   return 0;
371309
 }
371309
 
371309
diff --git a/grub-core/video/efi_uga.c b/grub-core/video/efi_uga.c
371309
index 97a607c01a5..e74d6c23500 100644
371309
--- a/grub-core/video/efi_uga.c
371309
+++ b/grub-core/video/efi_uga.c
371309
@@ -110,7 +110,7 @@ find_card (grub_pci_device_t dev, grub_pci_id_t pciid, void *data)
371309
     {
371309
       int i;
371309
 
371309
-      grub_dprintf ("fb", "Display controller: %d:%d.%d\nDevice id: %x\n",
371309
+      grub_dprintf ("video", "Display controller: %d:%d.%d\nDevice id: %x\n",
371309
 		    grub_pci_get_bus (dev), grub_pci_get_device (dev),
371309
 		    grub_pci_get_function (dev), pciid);
371309
       addr += 8;
371309
@@ -140,7 +140,7 @@ find_card (grub_pci_device_t dev, grub_pci_id_t pciid, void *data)
371309
 	  base64 <<= 32;
371309
 	  base64 |= (old_bar1 & GRUB_PCI_ADDR_MEM_MASK);
371309
 
371309
-	  grub_dprintf ("fb", "%s(%d): 0x%" PRIxGRUB_UINT64_T "\n",
371309
+	  grub_dprintf ("video", "%s(%d): 0x%" PRIxGRUB_UINT64_T "\n",
371309
 			((old_bar1 & GRUB_PCI_ADDR_MEM_PREFETCH) ?
371309
 			"VMEM" : "MMIO"), type == GRUB_PCI_ADDR_MEM_TYPE_64 ? i - 1 : i,
371309
 			base64);