Attachment 588659 Details for Bug 826279 – Possible fix

[patch] Possible fix

video.diff (text/plain), 2.38 KB, created by Vladimir Serbinenko on 2012-06-02 12:58:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Vladimir Serbinenko

Created: 2012-06-02 12:58:07 UTC

Size: 2.38 KB

patch

obsolete

>=== modified file 'grub-core/video/efi_gop.c'
>--- grub-core/video/efi_gop.c	2012-05-26 11:33:34 +0000
>+++ grub-core/video/efi_gop.c	2012-05-31 19:27:24 +0000
>@@ -368,7 +368,7 @@ grub_video_gop_setup (unsigned int width
>     {
>       err = 1;
>       grub_gop_get_preferred_mode (&preferred_width, &preferred_height);
>-      if (err)
>+      if (err || width >= 4096 || height >= 4096)
> 	{
> 	  preferred_width = 800;
> 	  preferred_height = 600;
>
>=== 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-06-01 20:07:39 +0000
>@@ -581,7 +581,6 @@ grub_vbe_get_preferred_mode (unsigned in
>   /* 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,14 +589,18 @@ grub_vbe_get_preferred_mode (unsigned in
>       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)
>+	      == GRUB_ERR_NONE && *width < 4096 && *height < 4096)
> 	return GRUB_ERR_NONE;
> 
>       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
>+      && flat_panel_info->horizontal_size < 4096
>+      && flat_panel_info->vertical_size < 4096)
>     {
>       *width = flat_panel_info->horizontal_size;
>       *height = flat_panel_info->vertical_size;
>
>=== modified file 'grub-core/video/video.c'
>--- grub-core/video/video.c	2012-03-06 13:11:10 +0000
>+++ grub-core/video/video.c	2012-05-31 18:54:03 +0000
>@@ -415,7 +415,8 @@ grub_video_edid_preferred_mode (struct g
> 		| (((unsigned int)
> 		    (edid_info->detailed_timings[0].vertical_hi & 0xf0))
> 		   << 4);
>-      return GRUB_ERR_NONE;
>+      if (*width && *height)
>+	return GRUB_ERR_NONE;
>     }
> 
>   return grub_error (GRUB_ERR_BAD_DEVICE, "no preferred mode available");
>

Actions: View | Diff

Attachments on bug 826279: 587544 | 587554 | 587555 | 588659