Attachment 588166 Details for Bug 827003 – Flat panel dump, possible fix

[patch] Flat panel dump, possible fix

tst.diff (text/plain), 2.35 KB, created by Vladimir Serbinenko on 2012-05-31 18:33:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Vladimir Serbinenko

Created: 2012-05-31 18:33:02 UTC

Size: 2.35 KB

patch

obsolete

>=== modified file 'grub-core/video/i386/pc/vbe.c'
>--- grub-core/video/i386/pc/vbe.c	2012-02-27 21:31:51 +0000
>+++ grub-core/video/i386/pc/vbe.c	2012-05-31 18:29:29 +0000
>@@ -581,7 +581,6 @@
>   /* Use low memory scratch area as temporary storage for VESA BIOS calls.  */
>   flat_panel_info = (struct grub_vbe_flat_panel_info *)
>     (GRUB_MEMORY_MACHINE_SCRATCH_ADDR + sizeof (struct grub_video_edid_info));
>-  grub_memset (flat_panel_info, 0, sizeof (*flat_panel_info));
> 
>   if (controller_info.version >= 0x200
>       && (grub_vbe_bios_get_ddc_capabilities (&ddc_level) & 0xff)
>@@ -590,20 +589,32 @@
>       if (grub_video_vbe_get_edid (&edid_info) == GRUB_ERR_NONE
> 	  && grub_video_edid_checksum (&edid_info) == GRUB_ERR_NONE
> 	  && grub_video_edid_preferred_mode (&edid_info, width, height)
>-	      == GRUB_ERR_NONE)
>-	return GRUB_ERR_NONE;
>+	      == GRUB_ERR_NONE
>+	  && *width && *height)
>+	{
>+	  grub_printf ("EDID success: %d x %d\n", *width, *height);
>+	  return GRUB_ERR_NONE;
>+	}
> 
>+      grub_printf ("EDID failure\n");
>       grub_errno = GRUB_ERR_NONE;
>     }
> 
>+  grub_memset (flat_panel_info, 0, sizeof (*flat_panel_info));
>   status = grub_vbe_bios_get_flat_panel_info (flat_panel_info);
>-  if (status == GRUB_VBE_STATUS_OK)
>+  if (status == GRUB_VBE_STATUS_OK
>+      && flat_panel_info->horizontal_size && flat_panel_info->vertical_size)
>     {
>+      int i;
>+      for (i = 0; i < (int) sizeof (*flat_panel_info); i++)
>+	grub_printf ("%02x ", ((grub_uint8_t *) flat_panel_info)[i]);
>+      grub_printf ("\n");
>       *width = flat_panel_info->horizontal_size;
>       *height = flat_panel_info->vertical_size;
>       return GRUB_ERR_NONE;
>     }
> 
>+  grub_printf ("FP failure\n");
>   return grub_error (GRUB_ERR_UNKNOWN_DEVICE, "cannot get preferred mode");
> }
> 
>@@ -1186,6 +1197,9 @@
> static void
> grub_video_vbe_print_adapter_specific_info (void)
> {
>+  unsigned int w, h;
>+  grub_err_t e;
>+
>   grub_printf_ (N_("  VBE info:   version: %d.%d  OEM software rev: %d.%d\n"),
> 		controller_info.version >> 8,
> 		controller_info.version & 0xFF,
>@@ -1195,6 +1209,8 @@
>   /* The total_memory field is in 64 KiB units.  */
>   grub_printf_ (N_("              total memory: %d KiB\n"),
> 		(controller_info.total_memory << 16) / 1024);
>+  e = grub_vbe_get_preferred_mode (&w, &h);
>+  grub_printf ("e=%d, w=%d, h=%d\n", e, w, h);
> }
> 
> static struct grub_video_adapter grub_video_vbe_adapter =
>

Actions: View | Diff

Attachments on bug 827003: 588057 | 588058 | 588096 | 588129 | 588149 | 588166 | 588179 | 588180